diff --git a/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt index 5afe3fd0..f81f2a2e 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt @@ -1,5 +1,6 @@ package net.pokeranalytics.android +import android.os.Looper import androidx.test.ext.junit.runners.AndroidJUnit4 import io.realm.RealmResults import net.pokeranalytics.android.calculus.Calculator @@ -167,26 +168,26 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() { Assert.fail("No netbbPer100Hands stat") } -// val stdHourly = results.computedStat(Stat.STANDARD_DEVIATION_HOURLY) -// if (stdHourly != null) { -// assertEquals(111.8, stdHourly.value, delta) -// } else { -// Assert.fail("No stdHourly stat") -// } -// -// val std = results.computedStat(Stat.STANDARD_DEVIATION) -// if (std != null) { -// assertEquals(200.0, std.value, delta) -// } else { -// Assert.fail("No std stat") -// } -// -// val std100 = results.computedStat(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS) -// if (std100 != null) { -// assertEquals(503.12, std100.value, delta) -// } else { -// Assert.fail("No std100 stat") -// } + val stdHourly = results.computedStat(Stat.STANDARD_DEVIATION_HOURLY) + if (stdHourly != null) { + assertEquals(141.42, stdHourly.value, delta) + } else { + Assert.fail("No stdHourly stat") + } + + val std = results.computedStat(Stat.STANDARD_DEVIATION) + if (std != null) { + assertEquals(282.84, std.value, delta) + } else { + Assert.fail("No std stat") + } + + val std100 = results.computedStat(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS) + if (std100 != null) { + assertEquals(707.1, std100.value, delta) + } else { + Assert.fail("No std100 stat") + } } @@ -335,16 +336,16 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() { fun testOverlappingSessionDeletion() { val realm = this.mockRealm -// this.sessions = realm.where(Session::class.java).findAll() // monitor session deletions - -// Looper.prepare() -// this.sessions?.addChangeListener { t, changeSet -> -// -// val deletedSessions = realm.where(Session::class.java).`in`("id", changeSet.deletions.toTypedArray()).findAll() -// deletedSessions.forEach { it.cleanup() } -// -// } -// Looper.loop() + this.sessions = realm.where(Session::class.java).findAll() // monitor session deletions + + Looper.prepare() + this.sessions?.addChangeListener { t, changeSet -> + + val deletedSessions = realm.where(Session::class.java).`in`("id", changeSet.deletions.toTypedArray()).findAll() + deletedSessions.forEach { it.cleanup() } + + } + Looper.loop() realm.beginTransaction() diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt index 40dae22f..b62e3e96 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt @@ -51,7 +51,7 @@ open class TimeFrame : RealmObject() { @Ignore var session: Session? = null - //get() = this.sessions?.first() ?: null + get() = this.sessions?.first() ?: null // Group @LinkingObjects("timeFrame")