Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.

Commit 7e07da4

Browse files
author
Evgenii Kanivets
committed
#17[30m]. Fix unit tests.
1 parent 2050b8b commit 7e07da4

File tree

2 files changed

+47
-31
lines changed

2 files changed

+47
-31
lines changed

‎app/src/test/java/com/blogspot/e_kanivets/moneytracker/report/ExchangeRateProviderTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.support.annotation.Nullable;
55

66
import com.blogspot.e_kanivets.moneytracker.controller.ExchangeRateController;
7-
import com.blogspot.e_kanivets.moneytracker.model.ExchangeRate;
8-
import com.blogspot.e_kanivets.moneytracker.model.Record;
7+
import com.blogspot.e_kanivets.moneytracker.entity.ExchangeRate;
8+
import com.blogspot.e_kanivets.moneytracker.entity.Record;
99
import com.blogspot.e_kanivets.moneytracker.repo.base.IRepo;
1010
import com.blogspot.e_kanivets.moneytracker.report.base.IExchangeRateProvider;
1111

@@ -68,12 +68,12 @@ public void testGetRate() throws Exception {
6868
provider = new ExchangeRateProvider("USD", rateController);
6969

7070
assertEquals(new ExchangeRate(1, "UAH", "USD", 4),
71-
provider.getRate(new Record(0, 0, "", "", 0, 0, "UAH")));
71+
provider.getRate(new Record(1, 0, 0, "", 1, 0, 0, "UAH")));
7272

7373
assertEquals(new ExchangeRate(0, "AFN", "USD", 3),
74-
provider.getRate(new Record(0, 0, "", "", 0, 0, "AFN")));
74+
provider.getRate(new Record(1, 0, 0, "", 1, 0, 0, "AFN")));
7575

76-
assertNull(provider.getRate(new Record(0, 0, "", "", 0, 0, "SMTH")));
76+
assertNull(provider.getRate(new Record(1, 0, 0, "", 1, 0, 0, "SMTH")));
7777
}
7878

7979
private static class TestRepo implements IRepo<ExchangeRate> {

‎app/src/test/java/com/blogspot/e_kanivets/moneytracker/report/ReportTest.java‎

Lines changed: 42 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package com.blogspot.e_kanivets.moneytracker.report;
22

3+
import android.support.annotation.NonNull;
34
import android.support.annotation.Nullable;
45

5-
import com.blogspot.e_kanivets.moneytracker.model.ExchangeRate;
6+
import com.blogspot.e_kanivets.moneytracker.entity.Account;
7+
import com.blogspot.e_kanivets.moneytracker.entity.Category;
8+
import com.blogspot.e_kanivets.moneytracker.entity.ExchangeRate;
9+
import com.blogspot.e_kanivets.moneytracker.entity.Record;
610
import com.blogspot.e_kanivets.moneytracker.model.Period;
7-
import com.blogspot.e_kanivets.moneytracker.model.Record;
811
import com.blogspot.e_kanivets.moneytracker.report.base.IExchangeRateProvider;
912
import com.blogspot.e_kanivets.moneytracker.report.base.IReport;
1013
import com.blogspot.e_kanivets.moneytracker.report.model.CategoryRecord;
@@ -132,11 +135,7 @@ public void testGetPeriod() throws Exception {
132135
public void testGetTotal() throws Exception {
133136
Period period = new Period(new Date(1), new Date());
134137

135-
List<Record> recordList = new ArrayList<>();
136-
recordList.add(new Record(0, Record.TYPE_INCOME, "1", "1", 10, 1, "USD"));
137-
recordList.add(new Record(1, Record.TYPE_EXPENSE, "2", "1", 2, 2, "UAH"));
138-
recordList.add(new Record(2, Record.TYPE_INCOME, "3", "1", 5, 1, "UAH"));
139-
recordList.add(new Record(3, Record.TYPE_EXPENSE, "4", "1", 10, 2, "USD"));
138+
List<Record> recordList = getRecordList();
140139

141140
IReport report = new Report(currency, period, recordList, rateProvider);
142141

@@ -148,11 +147,7 @@ public void testGetTotal() throws Exception {
148147
public void testGetTotalIncome() throws Exception {
149148
Period period = new Period(new Date(1), new Date());
150149

151-
List<Record> recordList = new ArrayList<>();
152-
recordList.add(new Record(0, Record.TYPE_INCOME, "1", "1", 10, 1, "USD"));
153-
recordList.add(new Record(1, Record.TYPE_EXPENSE, "2", "1", 2, 2, "UAH"));
154-
recordList.add(new Record(2, Record.TYPE_INCOME, "3", "1", 5, 1, "UAH"));
155-
recordList.add(new Record(3, Record.TYPE_EXPENSE, "4", "1", 10, 2, "USD"));
150+
List<Record> recordList = getRecordList();
156151

157152
IReport report = new Report(currency, period, recordList, rateProvider);
158153

@@ -164,11 +159,7 @@ public void testGetTotalIncome() throws Exception {
164159
public void testGetTotalExpense() throws Exception {
165160
Period period = new Period(new Date(1), new Date());
166161

167-
List<Record> recordList = new ArrayList<>();
168-
recordList.add(new Record(0, Record.TYPE_INCOME, "1", "1", 10, 1, "USD"));
169-
recordList.add(new Record(1, Record.TYPE_EXPENSE, "2", "1", 2, 2, "UAH"));
170-
recordList.add(new Record(2, Record.TYPE_INCOME, "3", "1", 5, 1, "UAH"));
171-
recordList.add(new Record(3, Record.TYPE_EXPENSE, "4", "1", 10, 2, "USD"));
162+
List<Record> recordList = getRecordList();
172163

173164
IReport report = new Report(currency, period, recordList, rateProvider);
174165

@@ -181,24 +172,29 @@ public void testGetSummary() throws Exception {
181172
Period period = new Period(new Date(1), new Date());
182173

183174
List<Record> recordList = new ArrayList<>();
184-
Record record1 = new Record(0, Record.TYPE_INCOME, "1", "1", 10, 1, "USD");
175+
176+
Category category = new Category(1, "category");
177+
Account account1 = new Account(1, "account1", 100, "UAH");
178+
Account account2 = new Account(2, "account2", 100, "USD");
179+
180+
Record record1 = new Record(1, 0, Record.TYPE_INCOME, "1", category, 10, account2, "USD");
185181
recordList.add(record1);
186-
Record record2 = new Record(1, Record.TYPE_EXPENSE, "1", "1", 2, 2, "UAH");
182+
Record record2 = new Record(2, 1, Record.TYPE_EXPENSE, "1", category, 2, account1, "UAH");
187183
recordList.add(record2);
188-
Record record3 = new Record(2, Record.TYPE_INCOME, "3", "1", 5, 1, "UAH");
184+
Record record3 = new Record(3, 2, Record.TYPE_INCOME, "3", category, 5, account1, "UAH");
189185
recordList.add(record3);
190-
Record record4 = new Record(3, Record.TYPE_EXPENSE, "4", "1", 10, 2, "USD");
186+
Record record4 = new Record(4, 3, Record.TYPE_EXPENSE, "4", category, 10, account2, "USD");
191187
recordList.add(record4);
192188

193189
IReport report = new Report(currency, period, recordList, rateProvider);
194190

195191
List<CategoryRecord> categoryRecordList = new ArrayList<>();
196192

197-
CategoryRecord categoryRecord = new CategoryRecord("1", currency, 10 * 4 - 2 + 5 - 10 * 4);
193+
CategoryRecord categoryRecord = new CategoryRecord("category", currency, 10 * 4 - 2 + 5 - 10 * 4);
198194

199195
SummaryRecord summaryRecord1 = new SummaryRecord("1", currency, 38);
200-
Record convertedRecord1 = new Record(record1);
201-
convertedRecord1.setPrice(40);
196+
Record convertedRecord1 = new Record(record1.getId(), record1.getTime(), record1.getType(),
197+
record1.getTitle(), record1.getCategory(), 40, record1.getAccount(), currency);
202198
summaryRecord1.add(convertedRecord1);
203199
summaryRecord1.add(record2);
204200
categoryRecord.add(summaryRecord1);
@@ -208,8 +204,8 @@ public void testGetSummary() throws Exception {
208204
categoryRecord.add(summaryRecord2);
209205

210206
SummaryRecord summaryRecord3 = new SummaryRecord("4", currency, -40);
211-
Record convertedRecord4 = new Record(record4);
212-
convertedRecord4.setPrice(40);
207+
Record convertedRecord4 = new Record(record4.getId(), record4.getTime(), record4.getType(),
208+
record4.getTitle(), record4.getCategory(), 40, record4.getAccount(), currency);
213209
summaryRecord3.add(convertedRecord4);
214210
categoryRecord.add(summaryRecord3);
215211

@@ -218,6 +214,26 @@ public void testGetSummary() throws Exception {
218214
assertEquals(categoryRecordList, report.getSummary());
219215
}
220216

217+
@NonNull
218+
private List<Record> getRecordList() {
219+
List<Record> recordList = new ArrayList<>();
220+
221+
Category category = new Category(1, "category");
222+
Account account1 = new Account(1, "account1", 100, "UAH");
223+
Account account2 = new Account(2, "account2", 100, "USD");
224+
225+
Record record1 = new Record(1, 0, Record.TYPE_INCOME, "1", category, 10, account2, "USD");
226+
recordList.add(record1);
227+
Record record2 = new Record(2, 1, Record.TYPE_EXPENSE, "1", category, 2, account1, "UAH");
228+
recordList.add(record2);
229+
Record record3 = new Record(3, 2, Record.TYPE_INCOME, "3", category, 5, account1, "UAH");
230+
recordList.add(record3);
231+
Record record4 = new Record(4, 3, Record.TYPE_EXPENSE, "4", category, 10, account2, "USD");
232+
recordList.add(record4);
233+
234+
return recordList;
235+
}
236+
221237
private static class TestProvider implements IExchangeRateProvider {
222238

223239
@Nullable

0 commit comments

Comments
 (0)