From e63f588325a8568cd5a4f3240d50f8ee19d1d3ab Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Mon, 8 Apr 2019 11:00:53 +0200 Subject: [PATCH] change queryOn method to reflect the modification of the related entity --- .../unitTests/filter/RealmFilterInstrumentedUnitTest.kt | 2 +- .../main/java/net/pokeranalytics/android/model/realm/Filter.kt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt index f46e7765..9b421570 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt @@ -50,7 +50,7 @@ class RealmFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val newRealm = this.mockRealm newRealm.where(Filter::class.java).equalTo("name", "testSaveLoadCashFilter").findFirst()?.let { foundFilter -> - val sessions = foundFilter.queryOn(Session) + val sessions = foundFilter.results() Assert.assertEquals(1, sessions.size) sessions[0]?.run { diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt index d4fbc6d8..8fb6ad60 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt @@ -11,7 +11,6 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.FilterElementRow import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow import org.jetbrains.annotations.TestOnly import java.util.* -import kotlin.reflect.KClass /** * A [Filter] is the top level representation of the filtering system @@ -131,7 +130,7 @@ open class Filter(entity:Filterable) : RealmObject() { return filterElementRow.contains(filtered) } - fun queryOn(entity: Filterable) : RealmResults<*> { + fun results(): RealmResults<*> { val filterableClass : FilterableClass = this.filterableClass ?: throw FilterMissingEntityException("this filter has no entity initialized") val realmEntity : Class < out RealmObject > = filterableClass.relatedEntity var realmQuery : RealmQuery = realm.where(realmEntity)