update unit tests

feature/top10
Razmig Sarkissian 7 years ago
parent 4f8369dfce
commit 6d42aca137
  1. 18
      app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt
  2. 6
      app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt

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

@ -33,7 +33,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
val filter = QueryCondition.DAY_OF_WEEK() val filter = QueryCondition.DAY_OF_WEEK()
cal.time = s1.startDate 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 filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE
val filterElement = FilterCondition(arrayListOf(filterElementRow)) val filterElement = FilterCondition(arrayListOf(filterElementRow))
filter.updateValueMap(filterElement) filter.updateValueMap(filterElement)
@ -61,7 +61,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
val filter = QueryCondition.MONTH() val filter = QueryCondition.MONTH()
cal.time = s1.startDate 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 filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE
val filterElement = FilterCondition(arrayListOf(filterElementRow)) val filterElement = FilterCondition(arrayListOf(filterElementRow))
filter.updateValueMap(filterElement) filter.updateValueMap(filterElement)
@ -89,7 +89,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
val filter = QueryCondition.YEAR() val filter = QueryCondition.YEAR()
cal.time = s1.startDate 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 filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE
val filterElement = FilterCondition(arrayListOf(filterElementRow)) val filterElement = FilterCondition(arrayListOf(filterElementRow))
filter.updateValueMap(filterElement) filter.updateValueMap(filterElement)

Loading…
Cancel
Save