diff --git a/app/src/androidTest/java/net/pokeranalytics/android/RealmInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/RealmInstrumentedUnitTest.kt deleted file mode 100644 index b5be8a04..00000000 --- a/app/src/androidTest/java/net/pokeranalytics/android/RealmInstrumentedUnitTest.kt +++ /dev/null @@ -1,46 +0,0 @@ -package net.pokeranalytics.android - -import io.realm.Realm -import io.realm.RealmConfiguration -import net.pokeranalytics.android.model.realm.ComputableResult -import net.pokeranalytics.android.model.realm.Result -import net.pokeranalytics.android.model.realm.Session -import org.junit.After -import org.junit.Before -import java.util.* - - -open class RealmInstrumentedUnitTest { - - lateinit var mockRealm: Realm - - companion object { - - fun newSessionInstance(realm: Realm) : Session { - val session = realm.createObject(Session::class.java, UUID.randomUUID().toString()) - val computableResult = realm.createObject(ComputableResult::class.java) - computableResult.session = session - session.result = realm.createObject(Result::class.java) - return session - } - - } - - @Before - fun setup() { - - val testConfig = RealmConfiguration.Builder().inMemory().name("test-realm").build() - Realm.setDefaultConfiguration(testConfig) - this.mockRealm = Realm.getDefaultInstance() - this.mockRealm.beginTransaction() - this.mockRealm.deleteAll() - this.mockRealm.commitTransaction() - } - - @After - @Throws(Exception::class) - fun tearDown() { - this.mockRealm.close() - } - -} \ No newline at end of file diff --git a/app/src/androidTest/java/net/pokeranalytics/android/filter/BaseFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/components/BaseFilterInstrumentedUnitTest.kt similarity index 93% rename from app/src/androidTest/java/net/pokeranalytics/android/filter/BaseFilterInstrumentedUnitTest.kt rename to app/src/androidTest/java/net/pokeranalytics/android/components/BaseFilterInstrumentedUnitTest.kt index 3b80c3c2..a79e3d88 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/filter/BaseFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/components/BaseFilterInstrumentedUnitTest.kt @@ -1,7 +1,6 @@ -package net.pokeranalytics.android.filter +package net.pokeranalytics.android.components import io.realm.RealmList -import net.pokeranalytics.android.RealmInstrumentedUnitTest import net.pokeranalytics.android.model.realm.* import java.util.* diff --git a/app/src/androidTest/java/net/pokeranalytics/android/components/RealmInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/components/RealmInstrumentedUnitTest.kt new file mode 100644 index 00000000..e78adf39 --- /dev/null +++ b/app/src/androidTest/java/net/pokeranalytics/android/components/RealmInstrumentedUnitTest.kt @@ -0,0 +1,104 @@ +package net.pokeranalytics.android.components + +import io.realm.Realm +import io.realm.RealmConfiguration +import net.pokeranalytics.android.model.realm.ComputableResult +import net.pokeranalytics.android.model.realm.Result +import net.pokeranalytics.android.model.realm.Session +import org.junit.After +import org.junit.Before +import java.util.* + + +open class RealmInstrumentedUnitTest { + + lateinit var mockRealm: Realm + + companion object { + + fun newSessionInstance(realm: Realm) : Session { + val session = realm.createObject(Session::class.java, UUID.randomUUID().toString()) + val computableResult = realm.createObject(ComputableResult::class.java) + computableResult.session = session + session.result = realm.createObject(Result::class.java) + return session + } + + } + + @Before + fun setup() { + + val testConfig = RealmConfiguration.Builder().inMemory().name("test-realm").build() + Realm.setDefaultConfiguration(testConfig) + this.mockRealm = Realm.getDefaultInstance() + this.mockRealm.beginTransaction() + this.mockRealm.deleteAll() + this.mockRealm.commitTransaction() + } + + @After + @Throws(Exception::class) + fun tearDown() { + this.mockRealm.close() + } + +} + +/* + +package net.pokeranalytics.android.components + +import io.realm.Realm +import io.realm.RealmConfiguration +import net.pokeranalytics.android.model.realm.ComputableResult +import net.pokeranalytics.android.model.realm.Result +import net.pokeranalytics.android.model.realm.Session +import org.junit.AfterClass +import org.junit.Before +import java.util.* + +interface RealmTestDataSource { + val realmName : String +} + +open class RealmInstrumentedUnitTest { + + companion object : RealmTestDataSource { + lateinit var mockRealm: Realm + override val realmName: String + get() = "RealmInstrumentedUnitTest" + + init { + val testConfig = RealmConfiguration.Builder().inMemory().name(realmName).build() + Realm.setDefaultConfiguration(testConfig) + mockRealm = Realm.getDefaultInstance() + } + + fun newSessionInstance(realm: Realm) : Session { + val session = realm.createObject(Session::class.java, UUID.randomUUID().toString()) + val computableResult = realm.createObject(ComputableResult::class.java) + computableResult.session = session + session.result = realm.createObject(Result::class.java) + return session + } + + @AfterClass + @Throws(Exception::class) + fun tearDown() { + mockRealm.close() + } + + } + + var mockRealm: Realm = Companion.mockRealm + + @Before + fun setup() { + this.mockRealm.beginTransaction() + this.mockRealm.deleteAll() + this.mockRealm.commitTransaction() + } + +} + */ \ No newline at end of file diff --git a/app/src/androidTest/java/net/pokeranalytics/android/PerfsInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/performanceTests/PerfsInstrumentedUnitTest.kt similarity index 95% rename from app/src/androidTest/java/net/pokeranalytics/android/PerfsInstrumentedUnitTest.kt rename to app/src/androidTest/java/net/pokeranalytics/android/performanceTests/PerfsInstrumentedUnitTest.kt index fb4fcd3b..fe5aff41 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/PerfsInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/performanceTests/PerfsInstrumentedUnitTest.kt @@ -1,8 +1,9 @@ -package net.pokeranalytics.android +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 diff --git a/app/src/androidTest/java/net/pokeranalytics/android/BankrollInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt similarity index 91% rename from app/src/androidTest/java/net/pokeranalytics/android/BankrollInstrumentedUnitTest.kt rename to app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt index 5602da72..7fe1fb99 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/BankrollInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/BankrollInstrumentedUnitTest.kt @@ -1,6 +1,7 @@ -package net.pokeranalytics.android +package net.pokeranalytics.android.unitTests 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 @@ -30,8 +31,8 @@ class BankrollInstrumentedUnitTest : RealmInstrumentedUnitTest() { val realm = this.mockRealm realm.beginTransaction() - val s1 = RealmInstrumentedUnitTest.newSessionInstance(realm) - val s2 = RealmInstrumentedUnitTest.newSessionInstance(realm) + val s1 = newSessionInstance(realm) + val s2 = newSessionInstance(realm) val br1 = realm.createObject(Bankroll::class.java, "1") val br2 = realm.createObject(Bankroll::class.java, "2") diff --git a/app/src/androidTest/java/net/pokeranalytics/android/FavoriteSessionUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/FavoriteSessionUnitTest.kt similarity index 81% rename from app/src/androidTest/java/net/pokeranalytics/android/FavoriteSessionUnitTest.kt rename to app/src/androidTest/java/net/pokeranalytics/android/unitTests/FavoriteSessionUnitTest.kt index c181ec72..c8e5074c 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/FavoriteSessionUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/FavoriteSessionUnitTest.kt @@ -1,7 +1,8 @@ -package net.pokeranalytics.android +package net.pokeranalytics.android.unitTests import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry +import net.pokeranalytics.android.components.RealmInstrumentedUnitTest import net.pokeranalytics.android.model.realm.Location import net.pokeranalytics.android.model.realm.Session import net.pokeranalytics.android.model.utils.FavoriteSessionFinder @@ -20,9 +21,9 @@ class FavoriteSessionUnitTest : RealmInstrumentedUnitTest() { val realm = this.mockRealm realm.beginTransaction() - val s1 = RealmInstrumentedUnitTest.newSessionInstance(realm) - val s2 = RealmInstrumentedUnitTest.newSessionInstance(realm) - val s3 = RealmInstrumentedUnitTest.newSessionInstance(realm) + val s1 = newSessionInstance(realm) + val s2 = newSessionInstance(realm) + val s3 = newSessionInstance(realm) s1.cgBigBlind = 4.0 s2.cgBigBlind = 4.0 @@ -49,9 +50,9 @@ class FavoriteSessionUnitTest : RealmInstrumentedUnitTest() { val realm = this.mockRealm realm.beginTransaction() - val s1 = RealmInstrumentedUnitTest.newSessionInstance(realm) - val s2 = RealmInstrumentedUnitTest.newSessionInstance(realm) - val s3 = RealmInstrumentedUnitTest.newSessionInstance(realm) + val s1 = newSessionInstance(realm) + val s2 = newSessionInstance(realm) + val s3 = newSessionInstance(realm) val loc1 = realm.createObject(Location::class.java, "1") val loc2 = realm.createObject(Location::class.java, "2") diff --git a/app/src/androidTest/java/net/pokeranalytics/android/StatsInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt similarity index 95% rename from app/src/androidTest/java/net/pokeranalytics/android/StatsInstrumentedUnitTest.kt rename to app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt index 38692475..3c9c7b11 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/StatsInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt @@ -1,8 +1,9 @@ -package net.pokeranalytics.android +package net.pokeranalytics.android.unitTests import androidx.test.ext.junit.runners.AndroidJUnit4 import io.realm.RealmList import io.realm.RealmResults +import net.pokeranalytics.android.components.RealmInstrumentedUnitTest import net.pokeranalytics.android.calculus.Calculator import net.pokeranalytics.android.calculus.ComputableGroup import net.pokeranalytics.android.calculus.ComputedResults @@ -82,8 +83,8 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { val realm = this.mockRealm realm.beginTransaction() - val s1 = RealmInstrumentedUnitTest.newSessionInstance(realm) - val s2 = RealmInstrumentedUnitTest.newSessionInstance(realm) + val s1 = newSessionInstance(realm) + val s2 = newSessionInstance(realm) s1.result?.buyin = 100.0 // net result = -100 s2.result?.buyin = 200.0 @@ -240,8 +241,8 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { val realm = this.mockRealm realm.beginTransaction() - val s1 = RealmInstrumentedUnitTest.newSessionInstance(realm) - val s2 = RealmInstrumentedUnitTest.newSessionInstance(realm) + val s1 = newSessionInstance(realm) + val s2 = newSessionInstance(realm) realm.insert(s1) realm.insert(s2) @@ -305,9 +306,9 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { val realm = this.mockRealm realm.beginTransaction() - val s1 = RealmInstrumentedUnitTest.newSessionInstance(realm) - val s2 = RealmInstrumentedUnitTest.newSessionInstance(realm) - val s3 = RealmInstrumentedUnitTest.newSessionInstance(realm) + val s1 = newSessionInstance(realm) + val s2 = newSessionInstance(realm) + val s3 = newSessionInstance(realm) realm.insert(s1) realm.insert(s2) @@ -465,7 +466,7 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { val realm = this.mockRealm realm.beginTransaction() - val s1 = RealmInstrumentedUnitTest.newSessionInstance(realm) + val s1 = newSessionInstance(realm) realm.insert(s1) val sdf = SimpleDateFormat("dd/M/yyyy hh:mm") @@ -499,8 +500,8 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { val realm = this.mockRealm realm.beginTransaction() - val s1 = RealmInstrumentedUnitTest.newSessionInstance(realm) - val s2 = RealmInstrumentedUnitTest.newSessionInstance(realm) + val s1 = newSessionInstance(realm) + val s2 = newSessionInstance(realm) realm.insert(s1) realm.insert(s2) @@ -557,9 +558,9 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() { val realm = this.mockRealm realm.beginTransaction() - val s1 = RealmInstrumentedUnitTest.newSessionInstance(realm) - val s2 = RealmInstrumentedUnitTest.newSessionInstance(realm) - val s3 = RealmInstrumentedUnitTest.newSessionInstance(realm) + val s1 = newSessionInstance(realm) + val s2 = newSessionInstance(realm) + val s3 = newSessionInstance(realm) realm.insert(s1) realm.insert(s2) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/filter/BlindFilterInstrumentedTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt similarity index 97% rename from app/src/androidTest/java/net/pokeranalytics/android/filter/BlindFilterInstrumentedTest.kt rename to app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt index 91ec0cb2..76f7c100 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/filter/BlindFilterInstrumentedTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt @@ -1,5 +1,6 @@ -package net.pokeranalytics.android.filter +package net.pokeranalytics.android.unitTests.filter +import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest import net.pokeranalytics.android.model.filter.QueryType import net.pokeranalytics.android.model.realm.* import net.pokeranalytics.android.ui.view.rowrepresentable.FilterElementRow @@ -9,6 +10,7 @@ import org.junit.Test import java.util.* class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() { + @Test fun testSingleBlindNoCurrencyFilter() { diff --git a/app/src/androidTest/java/net/pokeranalytics/android/filter/DateFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt similarity index 98% rename from app/src/androidTest/java/net/pokeranalytics/android/filter/DateFilterInstrumentedUnitTest.kt rename to app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt index 3f506258..72cb5304 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/filter/DateFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt @@ -1,7 +1,7 @@ -package net.pokeranalytics.android.filter +package net.pokeranalytics.android.unitTests.filter import androidx.test.ext.junit.runners.AndroidJUnit4 -import io.realm.RealmList +import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest import net.pokeranalytics.android.model.filter.QueryType import net.pokeranalytics.android.model.realm.Filter import net.pokeranalytics.android.model.realm.FilterElement diff --git a/app/src/androidTest/java/net/pokeranalytics/android/filter/ExceptionFilterInstrumentedTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/ExceptionFilterInstrumentedTest.kt similarity index 83% rename from app/src/androidTest/java/net/pokeranalytics/android/filter/ExceptionFilterInstrumentedTest.kt rename to app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/ExceptionFilterInstrumentedTest.kt index b484a920..2dac694c 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/filter/ExceptionFilterInstrumentedTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/ExceptionFilterInstrumentedTest.kt @@ -1,17 +1,14 @@ -package net.pokeranalytics.android.filter +package net.pokeranalytics.android.unitTests.filter import androidx.test.ext.junit.runners.AndroidJUnit4 -import io.realm.RealmList +import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest import net.pokeranalytics.android.exceptions.FilterValueMapException import net.pokeranalytics.android.model.filter.QueryType import net.pokeranalytics.android.model.realm.Filter import net.pokeranalytics.android.model.realm.FilterElement import net.pokeranalytics.android.model.realm.Session -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterElementRow -import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow import org.junit.Test import org.junit.runner.RunWith -import java.util.* @RunWith(AndroidJUnit4::class) class ExceptionFilterInstrumentedTest: BaseFilterInstrumentedUnitTest() { diff --git a/app/src/androidTest/java/net/pokeranalytics/android/filter/RealmFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt similarity index 94% rename from app/src/androidTest/java/net/pokeranalytics/android/filter/RealmFilterInstrumentedUnitTest.kt rename to app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt index 107433a3..ac9cc2fe 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/filter/RealmFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt @@ -1,6 +1,7 @@ -package net.pokeranalytics.android.filter +package net.pokeranalytics.android.unitTests.filter import androidx.test.ext.junit.runners.AndroidJUnit4 +import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest import net.pokeranalytics.android.model.filter.QueryType import net.pokeranalytics.android.model.realm.Filter import net.pokeranalytics.android.model.realm.Session diff --git a/app/src/androidTest/java/net/pokeranalytics/android/filter/SessionFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt similarity index 99% rename from app/src/androidTest/java/net/pokeranalytics/android/filter/SessionFilterInstrumentedUnitTest.kt rename to app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt index 0c125b6c..66e119d1 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/filter/SessionFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt @@ -1,7 +1,8 @@ -package net.pokeranalytics.android.filter +package net.pokeranalytics.android.unitTests.filter import androidx.test.ext.junit.runners.AndroidJUnit4 import io.realm.RealmList +import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest import net.pokeranalytics.android.model.TableSize import net.pokeranalytics.android.model.filter.QueryType import net.pokeranalytics.android.model.realm.*