From 5dfc99ba9ca9f91252cac4b0d6dca98042ac1a7e Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 29 Apr 2019 14:32:16 +0200 Subject: [PATCH] Fixing bankroll test --- .../unitTests/BankrollInstrumentedUnitTest.kt | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt index 2a492a8e..c97752b1 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt @@ -44,40 +44,46 @@ class BankrollInstrumentedUnitTest : SessionInstrumentedUnitTest() { this.createDefaultTransactionTypes(realm) val br1 = realm.createObject(Bankroll::class.java, "1") + br1.name = "br1" val br2 = realm.createObject(Bankroll::class.java, "2") + br2.name = "br2" br1.initialValue = 100.0 br2.initialValue = 1000.0 val t1 = realm.createObject(Transaction::class.java, UUID.randomUUID().toString()) t1.amount = 100.0 - t1.bankroll = br1 t1.type = TransactionType.getByValue(TransactionType.Value.BONUS, realm) + br1.transactions.add(t1) + val t2 = realm.createObject(Transaction::class.java, UUID.randomUUID().toString()) t2.amount = 500.0 - t2.bankroll = br2 t2.type = TransactionType.getByValue(TransactionType.Value.BONUS, realm) + br2.transactions.add(t2) val s1 = newSessionInstance(realm) s1.bankroll = br1 s1.result?.cashout = 200.0 + val s2 = newSessionInstance(realm) s2.bankroll = br2 s2.result?.cashout = 500.0 - val brSetup1 = BankrollReportSetup(br1) - val report1 = BankrollCalculator.computeReport(brSetup1) - Assert.assertEquals(400.0, report1.total, EPSILON) + } - val brSetup2 = BankrollReportSetup(br2) - val report2 = BankrollCalculator.computeReport(brSetup2) - Assert.assertEquals(2000.0, report2.total, EPSILON) + val br1 = realm.where(Bankroll::class.java).equalTo("name", "br1").findFirst() + val brSetup1 = BankrollReportSetup(br1) + val report1 = BankrollCalculator.computeReport(brSetup1) + Assert.assertEquals(400.0, report1.total, EPSILON) - val brSetupAll = BankrollReportSetup() - val reportAll = BankrollCalculator.computeReport(brSetupAll) - Assert.assertEquals(2400.0, reportAll.total, EPSILON) + val br2 = realm.where(Bankroll::class.java).equalTo("name", "br2").findFirst() + val brSetup2 = BankrollReportSetup(br2) + val report2 = BankrollCalculator.computeReport(brSetup2) + Assert.assertEquals(2000.0, report2.total, EPSILON) - } + val brSetupAll = BankrollReportSetup() + val reportAll = BankrollCalculator.computeReport(brSetupAll) + Assert.assertEquals(2400.0, reportAll.total, EPSILON) }