From d42ca4f84b590eea46e009598621cf4c9b23baa3 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Fri, 26 Apr 2019 13:18:49 +0200 Subject: [PATCH] rename updateValueMap --- .../filter/BlindFilterInstrumentedTest.kt | 8 +++--- .../filter/DateFilterInstrumentedUnitTest.kt | 14 +++++----- .../SessionFilterInstrumentedUnitTest.kt | 28 +++++++++---------- .../android/model/filter/QueryCondition.kt | 23 ++++++++------- .../android/model/realm/Filter.kt | 2 +- .../android/model/realm/FilterCondition.kt | 2 +- 6 files changed, 38 insertions(+), 39 deletions(-) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt index 94ff6f5f..93cbaac2 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt @@ -49,7 +49,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() { blind.filterSectionRow = FilterSectionRow.BLIND val filterElement = FilterCondition(filterElementRows = arrayListOf(blind)) - filter.updateValueMap(filterElement) + filter.updateValueBy(filterElement) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -100,7 +100,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() { blind2.filterSectionRow = FilterSectionRow.BLIND val filterElements = FilterCondition(filterElementRows = arrayListOf(blind1, blind2)) - filter.updateValueMap(filterElements) + filter.updateValueBy(filterElements) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -148,7 +148,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() { blind.filterSectionRow = FilterSectionRow.BLIND val filterElement = FilterCondition(filterElementRows = arrayListOf(blind)) - filter.updateValueMap(filterElement) + filter.updateValueBy(filterElement) println("<<<< ${filter.listOfValues}") val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -200,7 +200,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() { blind2.filterSectionRow = FilterSectionRow.BLIND val filterElement = FilterCondition(filterElementRows = arrayListOf(blind1, blind2)) - filter.updateValueMap(filterElement) + filter.updateValueBy(filterElement) val sessions = Filter.queryOn(realm, arrayListOf(filter)) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt index 6f273150..79ab6ab6 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt @@ -35,7 +35,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterElementRow = QueryCondition.AnyDayOfWeek().apply { listOfValues = arrayListOf(cal.get(Calendar.DAY_OF_WEEK)) } filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE val filterElement = FilterCondition(arrayListOf(filterElementRow)) - filter.updateValueMap(filterElement) + filter.updateValueBy(filterElement) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -64,7 +64,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE val filterElement = FilterCondition(arrayListOf(filterElementRow)) - filter.updateValueMap(filterElement) + filter.updateValueBy(filterElement) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -92,7 +92,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterElementRow = QueryCondition.AnyYear().apply { listOfValues = arrayListOf(cal.get(Calendar.YEAR)) } filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE val filterElement = FilterCondition(arrayListOf(filterElementRow)) - filter.updateValueMap(filterElement) + filter.updateValueBy(filterElement) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -385,7 +385,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.StartedFromDate() val filterElementRow = QueryCondition.StartedFromDate().apply { singleValue = s2.startDate!!} filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE - filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -413,7 +413,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.StartedToDate() val filterElementRow = QueryCondition.StartedToDate().apply { singleValue = s1.startDate!! } filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE - filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -442,7 +442,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.EndedFromDate() val filterElementRow = QueryCondition.EndedFromDate().apply { singleValue = s2.endDate() } filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE - filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -471,7 +471,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.EndedToDate() val filterElementRow = QueryCondition.EndedToDate().apply { singleValue = s1.endDate() } filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE - filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt index 0ffff7a1..96a74496 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt @@ -110,7 +110,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.AnyBankroll() val filterElementRow = QueryCondition.AnyBankroll().apply { setObject(b1) } filterElementRow.filterSectionRow = FilterSectionRow.BANKROLL - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -144,7 +144,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterElementRow2 = QueryCondition.AnyBankroll().apply { setObject(b2) } filterElementRow2.filterSectionRow = FilterSectionRow.BANKROLL - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -225,7 +225,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.AnyLocation() val filterElementRow = QueryCondition.AnyLocation().apply { setObject(l1) } filterElementRow.filterSectionRow = FilterSectionRow.LOCATION - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -260,7 +260,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterElementRow2 = QueryCondition.AnyLocation().apply { setObject(l3) } filterElementRow2.filterSectionRow = FilterSectionRow.LOCATION - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -287,7 +287,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterElementRow = QueryCondition.AnyTournamentName().apply { setObject(t1) } filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_NAME - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -320,7 +320,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_NAME val filterElementRow2 = QueryCondition.AnyTournamentName().apply { setObject(t2) } filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_NAME - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -358,7 +358,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow2.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE val filterElementRow3 = QueryCondition.AllTournamentFeature().apply { setObject(t4) } filterElementRow3.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -395,7 +395,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow3.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE val filterElementRow4 = QueryCondition.AnyTournamentFeature().apply { setObject(t4) } filterElementRow4.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3, filterElementRow4))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3, filterElementRow4))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -423,7 +423,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.AnyTournamentFeature() val filterElementRow = QueryCondition.AnyTournamentFeature().apply { setObject(t2) } filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -450,7 +450,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { filterElementRow.filterSectionRow = FilterSectionRow.TABLE_SIZE val filterElementRow2 = QueryCondition.AnyTableSize().apply { listOfValues = arrayListOf(4) } filterElementRow.filterSectionRow = FilterSectionRow.TABLE_SIZE - filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) + filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -475,7 +475,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.NetAmountWon() val filterElementRow = QueryCondition.more().apply { listOfValues = arrayListOf(204.0) } filterElementRow.filterSectionRow = FilterSectionRow.VALUE - filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filterElementRow)) @@ -500,7 +500,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filter = QueryCondition.NetAmountWon() val filterElementRow = QueryCondition.less().apply { listOfValues = arrayListOf(540.0) } filterElementRow.filterSectionRow = FilterSectionRow.VALUE - filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val sessions = Filter.queryOn(realm, arrayListOf(filter)) @@ -525,12 +525,12 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() { val filterMore = QueryCondition.NetAmountWon() val filterElementRow = QueryCondition.more().apply { listOfValues = arrayListOf(200.0) } filterElementRow.filterSectionRow = FilterSectionRow.VALUE - filterMore.updateValueMap(FilterCondition(arrayListOf(filterElementRow))) + filterMore.updateValueBy(FilterCondition(arrayListOf(filterElementRow))) val filterLess = QueryCondition.NetAmountWon() val filterElementRow2 = QueryCondition.less().apply { listOfValues = arrayListOf(400.0) } filterElementRow2.filterSectionRow = FilterSectionRow.VALUE - filterLess.updateValueMap(FilterCondition(arrayListOf(filterElementRow2))) + filterLess.updateValueBy(FilterCondition(arrayListOf(filterElementRow2))) val sessions = Filter.queryOn(realm, arrayListOf(filterMore, filterLess)) diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt index affa9310..ce2bde8b 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt @@ -143,8 +143,8 @@ sealed class QueryCondition : FilterElementRow { open var sign: Int = 1 override var listOfValues = arrayListOf(0.0) - override fun updateValueMap(filterCondition: FilterCondition) { - super.updateValueMap(filterCondition) + override fun updateValueBy(filterCondition: FilterCondition) { + super.updateValueBy(filterCondition) listOfValues = filterCondition.getValues() } override fun labelForValue(value: Double): String { @@ -154,9 +154,8 @@ sealed class QueryCondition : FilterElementRow { abstract class ListOfInt: ListOfValues() { override var listOfValues = arrayListOf(0) - override fun updateValueMap(filterCondition: FilterCondition) { - super.updateValueMap(filterCondition) - println("<<<< updateValueMap ${filterCondition.intValues}") + override fun updateValueBy(filterCondition: FilterCondition) { + super.updateValueBy(filterCondition) listOfValues = filterCondition.getValues() } override fun labelForValue(value: Int): String { @@ -167,8 +166,8 @@ sealed class QueryCondition : FilterElementRow { abstract class ListOfString: ListOfValues() { override var listOfValues = ArrayList() override fun labelForValue(value: String): String { return value } - override fun updateValueMap(filterCondition: FilterCondition) { - super.updateValueMap(filterCondition) + override fun updateValueBy(filterCondition: FilterCondition) { + super.updateValueBy(filterCondition) listOfValues = filterCondition.getValues() } } @@ -182,8 +181,8 @@ sealed class QueryCondition : FilterElementRow { get() { return listOfValues.firstOrNull() ?: Date() } set(value) { listOfValues.add(value) } - override fun updateValueMap(filterCondition: FilterCondition) { - super.updateValueMap(filterCondition) + override fun updateValueBy(filterCondition: FilterCondition) { + super.updateValueBy(filterCondition) singleValue = filterCondition.getValue() } } @@ -196,8 +195,8 @@ sealed class QueryCondition : FilterElementRow { get() { return listOfValues.firstOrNull() ?: 0 } set(value) { listOfValues.add(value) } - override fun updateValueMap(filterCondition: FilterCondition) { - super.updateValueMap(filterCondition) + override fun updateValueBy(filterCondition: FilterCondition) { + super.updateValueBy(filterCondition) singleValue = filterCondition.getValue() } } @@ -543,7 +542,7 @@ sealed class QueryCondition : FilterElementRow { } } - open fun updateValueMap(filterCondition: FilterCondition) { + open fun updateValueBy(filterCondition: FilterCondition) { filterCondition.operator?.let { this.operator = Operator.values()[it] } 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 d9c2c159..5c3e3bcc 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 @@ -113,7 +113,7 @@ open class Filter : RealmObject() { it.queryCondition.id == filterElementRow.id } if (filtered.isNotEmpty()) { - return filterElementRow.updateValueMap(filtered.first()) + return filterElementRow.updateValueBy(filtered.first()) } } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt index 4340ed63..d0ca264d 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt @@ -33,7 +33,7 @@ open class FilterCondition() : RealmObject() { val queryCondition : QueryCondition get() = QueryCondition.valueOf(this.filterName ?: throw PokerAnalyticsException.FilterElementUnknownName) .apply { - this.updateValueMap(this@FilterCondition) + this.updateValueBy(this@FilterCondition) } var doubleValues: RealmList? = null