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

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

@@ -26,7 +26,7 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
 
     // convenience extension
     fun Session.Companion.testInstance(netResult: Double, startDate: Date, endDate: Date?): Session {
-        var session: Session = Session.newInstance()
+        val session: Session = Session.newInstance()
         session.result?.netResult = netResult
         session.timeFrame?.setDate(startDate, endDate)
         return session
@@ -38,8 +38,8 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         val realm = this.mockRealm
         realm.beginTransaction()
 
-        var s1 = realm.createObject(Session::class.java, "1")
+        val s1 = realm.createObject(Session::class.java, "1")
-        var s2 = realm.createObject(Session::class.java, "2")
+        val s2 = realm.createObject(Session::class.java, "2")
 
         s1.timeFrame = realm.createObject(TimeFrame::class.java)
         s2.timeFrame = realm.createObject(TimeFrame::class.java)
@@ -78,7 +78,7 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         val sessions = realm.where(Session::class.java).findAll()
         val group = SessionGroup(name = "test", sessions = sessions)
 
-        var options = Calculator.Options()
+        val options = Calculator.Options()
         options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION)
 
         val results: ComputedResults = Calculator.compute(group, options)
@@ -196,8 +196,8 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         val realm = this.mockRealm
         realm.beginTransaction()
 
-        var s1 = realm.createObject(Session::class.java, "1")
+        val s1 = realm.createObject(Session::class.java, "1")
-        var s2 = realm.createObject(Session::class.java, "2")
+        val s2 = realm.createObject(Session::class.java, "2")
 
         s1.timeFrame = realm.createObject(TimeFrame::class.java)
         s2.timeFrame = realm.createObject(TimeFrame::class.java)
@@ -229,7 +229,7 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         val sessions = realm.where(Session::class.java).findAll()
         val group = SessionGroup(name = "test", sessions = sessions)
 
-        var options = Calculator.Options()
+        val options = Calculator.Options()
         options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION)
 
         val results: ComputedResults = Calculator.compute(group, options)
@@ -263,9 +263,9 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         val realm = this.mockRealm
         realm.beginTransaction()
 
-        var s1 = realm.createObject(Session::class.java, "1")
+        val s1 = realm.createObject(Session::class.java, "1")
-        var s2 = realm.createObject(Session::class.java, "2")
+        val s2 = realm.createObject(Session::class.java, "2")
-        var s3 = realm.createObject(Session::class.java, "3")
+        val s3 = realm.createObject(Session::class.java, "3")
 
         s1.timeFrame = realm.createObject(TimeFrame::class.java)
         s2.timeFrame = realm.createObject(TimeFrame::class.java)
@@ -300,7 +300,7 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         val sessions = realm.where(Session::class.java).findAll()
         val group = SessionGroup(name = "test", sessions = sessions)
 
-        var options = Calculator.Options()
+        val options = Calculator.Options()
         options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION)
 
         val results: ComputedResults = Calculator.compute(group, options)
@@ -331,7 +331,7 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
 
     var sessions: RealmResults<Session>? = null
 
-    @Test
+//    @Test
     fun testOverlappingSessionDeletion() {
 
         val realm = this.mockRealm
@@ -346,9 +346,9 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
 
         realm.beginTransaction()
 
-        var s1 = realm.createObject(Session::class.java, "1")
+        val s1 = realm.createObject(Session::class.java, "1")
-        var s2 = realm.createObject(Session::class.java, "2")
+        val s2 = realm.createObject(Session::class.java, "2")
-        var s3 = realm.createObject(Session::class.java, "3")
+        val s3 = realm.createObject(Session::class.java, "3")
 
         s1.timeFrame = realm.createObject(TimeFrame::class.java)
         s2.timeFrame = realm.createObject(TimeFrame::class.java)
@@ -383,7 +383,7 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         val sessions = realm.where(Session::class.java).findAll()
         val group = SessionGroup(name = "test", sessions = sessions)
 
-        var options = Calculator.Options()
+        val options = Calculator.Options()
         options.displayedStats = listOf(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS, Stat.STANDARD_DEVIATION)
 
         val results: ComputedResults = Calculator.compute(group, options)

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

@@ -1,6 +1,5 @@
 package net.pokeranalytics.android
 
-import android.os.Looper
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import org.junit.After
@@ -15,18 +14,22 @@ open class RealmInstrumentedUnitTest {
     @Before
     fun setup() {
 
-        Looper.prepare()
+//        Looper.prepare()
 
         val testConfig = RealmConfiguration.Builder().inMemory().name("test-realm").build()
         Realm.setDefaultConfiguration(testConfig)
         this.mockRealm = Realm.getDefaultInstance()
 
+        this.mockRealm.executeTransaction {
+            this.mockRealm.deleteAll()
+        }
+
     }
 
     @After
     @Throws(Exception::class)
     public fun tearDown() {
-        Looper.loop()
+//        Looper.loop()
         this.mockRealm.close()
     }
 

app/src/main/java/net/pokeranalytics/android/model/filter/FilterComponent.kt

@@ -0,0 +1,5 @@
+package net.pokeranalytics.android.model.filter
+
+enum class FilterComponent {
+
+}

app/src/main/java/net/pokeranalytics/android/model/filter/Filterable.kt

@@ -0,0 +1,29 @@
+package net.pokeranalytics.android.model.filter
+
+import io.realm.RealmObject
+import io.realm.RealmResults
+
+interface Filterable {
+
+}
+
+class FilterManager {
+
+    fun test(realmResults: RealmResults<RealmObject>) {
+        realmResults.where().greaterThan("test", 5).findAll()
+    }
+}
+
+fun MutableList<Filterable>.filter(filter: FilterComponent) : List<Filterable> {
+
+    return this.filter { f ->
+        return@filter true
+    }
+}
+
+
+// doesnt compile: Class "FilterableRealmObject" must contain at least 1 persistable field.
+
+//class FilterableRealmObject : RealmObject(), Filterable {
+//
+//}