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

app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt

@@ -44,8 +44,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.BLIND()
 
         val blind = QueryCondition.BLIND().apply {
-            blind = s1.blinds!!
-            hasDefaultCurrency = false
+            stringValues = arrayListOf(s1.blinds!!)
         }
 
         blind.filterSectionRow = FilterSectionRow.BLIND
@@ -92,12 +91,10 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.BLIND()
 
         val blind1 = QueryCondition.BLIND().apply {
-            blind = s1.blinds!!
-            hasDefaultCurrency = true
+            stringValues = arrayListOf(s1.blinds!!)
         }
         val blind2 = QueryCondition.BLIND().apply {
-            blind = s2.blinds!!
-            hasDefaultCurrency = true
+            stringValues = arrayListOf(s2.blinds!!)
         }
 
         blind1.filterSectionRow = FilterSectionRow.BLIND
@@ -146,8 +143,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.BLIND()
 
         val blind = QueryCondition.BLIND().apply {
-            blind = s3.blinds!!
-            hasDefaultCurrency = false
+            stringValues = arrayListOf(s3.blinds!!)
         }
 
         blind.filterSectionRow = FilterSectionRow.BLIND
@@ -195,12 +191,10 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.BLIND()
 
         val blind1 = QueryCondition.BLIND().apply {
-            blind = s1.blinds!!
-            hasDefaultCurrency = false
+            stringValues = arrayListOf(s1.blinds!!)
         }
         val blind2 = QueryCondition.BLIND().apply {
-            blind = s2.blinds!!
-            hasDefaultCurrency = false
+            stringValues = arrayListOf(s2.blinds!!)
         }
 
         blind1.filterSectionRow = FilterSectionRow.BLIND

app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt

@@ -33,7 +33,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.DAY_OF_WEEK()
         cal.time = s1.startDate
 
-        val filterElementRow = QueryCondition.DAY_OF_WEEK().apply { intValue = cal.get(Calendar.DAY_OF_WEEK) }
+        val filterElementRow = QueryCondition.DAY_OF_WEEK().apply { intValues = arrayListOf(cal.get(Calendar.DAY_OF_WEEK)) }
         filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE
         val filterElement = FilterCondition(arrayListOf(filterElementRow))
         filter.updateValueMap(filterElement)
@@ -61,7 +61,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
 
         val filter = QueryCondition.MONTH()
         cal.time = s1.startDate
-        val filterElementRow = QueryCondition.MONTH().apply { intValue = cal.get(Calendar.MONTH) }
+        val filterElementRow = QueryCondition.MONTH().apply { intValues = arrayListOf(cal.get(Calendar.MONTH)) }
         filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE
         val filterElement = FilterCondition(arrayListOf(filterElementRow))
         filter.updateValueMap(filterElement)
@@ -89,7 +89,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
 
         val filter = QueryCondition.YEAR()
         cal.time = s1.startDate
-        val filterElementRow = QueryCondition.YEAR().apply { intValue = cal.get(Calendar.YEAR) }
+        val filterElementRow = QueryCondition.YEAR().apply { intValues = arrayListOf(cal.get(Calendar.YEAR)) }
         filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE
         val filterElement = FilterCondition(arrayListOf(filterElementRow))
         filter.updateValueMap(filterElement)