Merge branch 'master' of gitlab.com:stax-river/poker-analytics

app/src/androidTest/java/net/pokeranalytics/android/RealmInstrumentedUnitTest.kt

@@ -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()
-    }
-
-}

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.*
 

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()
+    }
+
+}
+ */

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

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 s1 = newSessionInstance(realm)
-		val s2 = RealmInstrumentedUnitTest.newSessionInstance(realm)
+		val s2 = newSessionInstance(realm)
 
 		val br1 = realm.createObject(Bankroll::class.java, "1")
 		val br2 = realm.createObject(Bankroll::class.java, "2")

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 s1 = newSessionInstance(realm)
-        val s2 = RealmInstrumentedUnitTest.newSessionInstance(realm)
+        val s2 = newSessionInstance(realm)
-        val s3 = RealmInstrumentedUnitTest.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 s1 = newSessionInstance(realm)
-        val s2 = RealmInstrumentedUnitTest.newSessionInstance(realm)
+        val s2 = newSessionInstance(realm)
-        val s3 = RealmInstrumentedUnitTest.newSessionInstance(realm)
+        val s3 = newSessionInstance(realm)
 
         val loc1 = realm.createObject(Location::class.java, "1")
         val loc2 = realm.createObject(Location::class.java, "2")

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 s1 = newSessionInstance(realm)
-		val s2 = RealmInstrumentedUnitTest.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 s1 = newSessionInstance(realm)
-		val s2 = RealmInstrumentedUnitTest.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 s1 = newSessionInstance(realm)
-		val s2 = RealmInstrumentedUnitTest.newSessionInstance(realm)
+		val s2 = newSessionInstance(realm)
-		val s3 = RealmInstrumentedUnitTest.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 s1 = newSessionInstance(realm)
-		val s2 = RealmInstrumentedUnitTest.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 s1 = newSessionInstance(realm)
-		val s2 = RealmInstrumentedUnitTest.newSessionInstance(realm)
+		val s2 = newSessionInstance(realm)
-		val s3 = RealmInstrumentedUnitTest.newSessionInstance(realm)
+		val s3 = newSessionInstance(realm)
 
 		realm.insert(s1)
 		realm.insert(s2)

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() {
 

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

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() {

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

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.*