From e67e5e452dbcffe170322d039c0a3da6ca3c85d3 Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 15 Apr 2019 12:42:39 +0200 Subject: [PATCH] Fixing test build --- .../PerfsInstrumentedUnitTest.kt | 6 +-- .../unitTests/StatsInstrumentedUnitTest.kt | 51 +++++++------------ 2 files changed, 21 insertions(+), 36 deletions(-) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/performanceTests/PerfsInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/performanceTests/PerfsInstrumentedUnitTest.kt index fe5aff41..8cfd42ac 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/performanceTests/PerfsInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/performanceTests/PerfsInstrumentedUnitTest.kt @@ -3,11 +3,11 @@ package net.pokeranalytics.android.performanceTests import android.content.Context import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 -import net.pokeranalytics.android.components.RealmInstrumentedUnitTest import net.pokeranalytics.android.calculus.Calculator import net.pokeranalytics.android.calculus.ComputableGroup import net.pokeranalytics.android.calculus.ComputedResults import net.pokeranalytics.android.calculus.Stat +import net.pokeranalytics.android.components.RealmInstrumentedUnitTest import net.pokeranalytics.android.model.realm.ComputableResult import net.pokeranalytics.android.model.realm.Session import net.pokeranalytics.android.model.realm.SessionSet @@ -54,12 +54,12 @@ class PerfsInstrumentedUnitTest : RealmInstrumentedUnitTest() { Timber.d("sets: ${sets.size}") val stats: List = listOf(Stat.NETRESULT, Stat.AVERAGE) - val group = ComputableGroup("test", computableResults, sets, stats) + val group = ComputableGroup("test", listOf(), stats) val options = Calculator.Options() options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION) - val results: ComputedResults = Calculator.compute(group, options) + val results: ComputedResults = Calculator.compute(realm, group, options) Timber.d("*** ended in ${System.currentTimeMillis() - start} milliseconds") val sum = results.computedStat(Stat.NETRESULT) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt index 347d0576..f7dac0f4 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt @@ -120,14 +120,13 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { println(">>>>>> rated net = ${it.ratedNet} ") } - val sets = realm.where(SessionSet::class.java).findAll() val stats: List = listOf(Stat.NETRESULT, Stat.AVERAGE) - val group = ComputableGroup("test", computableResults, sets, stats) + val group = ComputableGroup("test", listOf(), stats) val options = Calculator.Options() options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION) - val results: ComputedResults = Calculator.compute(group, options) + val results: ComputedResults = Calculator.compute(realm, group, options) val delta = 0.01 val sum = results.computedStat(Stat.NETRESULT) @@ -263,15 +262,13 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { } - val computableResults = realm.where(ComputableResult::class.java).findAll() - val sets = realm.where(SessionSet::class.java).findAll() val stats: List = listOf(Stat.NETRESULT, Stat.AVERAGE) - val group = ComputableGroup("test", computableResults, sets, stats) + val group = ComputableGroup("test", listOf(), stats) val options = Calculator.Options() options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION) - val results: ComputedResults = Calculator.compute(group, options) + val results: ComputedResults = Calculator.compute(realm, group, options) val delta = 0.01 val duration = results.computedStat(Stat.DURATION) @@ -332,15 +329,13 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { realm.commitTransaction() - val computableResults = realm.where(ComputableResult::class.java).findAll() - val sets = realm.where(SessionSet::class.java).findAll() val stats: List = listOf(Stat.NETRESULT, Stat.AVERAGE) - val group = ComputableGroup("test", computableResults, sets, stats) + val group = ComputableGroup("test", listOf(), stats) val options = Calculator.Options() options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION) - val results: ComputedResults = Calculator.compute(group, options) + val results: ComputedResults = Calculator.compute(realm, group, options) val delta = 0.01 val duration = results.computedStat(Stat.DURATION) @@ -417,15 +412,13 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { realm.commitTransaction() - val computableResults = realm.where(ComputableResult::class.java).findAll() - val sets = realm.where(SessionSet::class.java).findAll() val stats: List = listOf(Stat.NETRESULT, Stat.AVERAGE) - val group = ComputableGroup("test", computableResults, sets, stats) + val group = ComputableGroup("test", listOf(), stats) val options = Calculator.Options() options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION) - val results: ComputedResults = Calculator.compute(group, options) + val results: ComputedResults = Calculator.compute(realm, group, options) val delta = 0.01 val duration = results.computedStat(Stat.DURATION) @@ -439,12 +432,10 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { s1.deleteFromRealm() } - val computableResults2 = realm.where(ComputableResult::class.java).findAll() - val sets2 = realm.where(SessionSet::class.java).findAll() val stats2: List = listOf(Stat.NETRESULT, Stat.AVERAGE) - val group2 = ComputableGroup("test", computableResults2, sets2, stats2) + val group2 = ComputableGroup("test", listOf(), stats2) - val results2: ComputedResults = Calculator.compute(group2, options) + val results2: ComputedResults = Calculator.compute(realm, group2, options) val duration2 = results2.computedStat(Stat.DURATION) if (duration2 != null) { @@ -566,15 +557,13 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { s1.endDate = null } - val computableResults = realm.where(ComputableResult::class.java).findAll() - val sets = realm.where(SessionSet::class.java).findAll() val stats: List = listOf(Stat.NETRESULT, Stat.AVERAGE) - val group = ComputableGroup("test", computableResults, sets, stats) + val group = ComputableGroup("test", listOf(), stats) val options = Calculator.Options() // options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION) - val results: ComputedResults = Calculator.compute(group, options) + val results: ComputedResults = Calculator.compute(realm, group, options) val delta = 0.01 val duration = results.computedStat(Stat.DURATION) @@ -623,9 +612,9 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { val computableResults = realm.where(ComputableResult::class.java).findAll() val sets = realm.where(SessionSet::class.java).findAll() val stats: List = listOf(Stat.NETRESULT) - val group = ComputableGroup("test", computableResults, sets, stats) + val group = ComputableGroup("test", listOf(), stats) val options = Calculator.Options() - val results: ComputedResults = Calculator.compute(group, options) + val results: ComputedResults = Calculator.compute(realm, group, options) val netResult = results.computedStat(Stat.NETRESULT) Assert.assertEquals(250.0, netResult?.value) @@ -658,12 +647,10 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { } - val computableResults = realm.where(ComputableResult::class.java).findAll() - val sets = realm.where(SessionSet::class.java).findAll() val stats: List = listOf(Stat.NETRESULT) - val group = ComputableGroup("test", computableResults, sets, stats) + val group = ComputableGroup("test", listOf(), stats) val options = Calculator.Options() - val results: ComputedResults = Calculator.compute(group, options) + val results: ComputedResults = Calculator.compute(realm, group, options) val netResult = results.computedStat(Stat.NETRESULT) Assert.assertEquals(250.0, netResult?.value) @@ -679,10 +666,8 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { } } - val updatedComputableResults = realm.where(ComputableResult::class.java).findAll() - val updatedSets = realm.where(SessionSet::class.java).findAll() - val updatedGroup = ComputableGroup("test", updatedComputableResults, updatedSets, stats) - val updatedResults: ComputedResults = Calculator.compute(updatedGroup, options) + val updatedGroup = ComputableGroup("test", listOf(), stats) + val updatedResults: ComputedResults = Calculator.compute(realm, updatedGroup, options) val updatedNetResult = updatedResults.computedStat(Stat.NETRESULT) Assert.assertEquals(650.0, updatedNetResult?.value)