add new tests

Author: Razeeman

app/src/androidTest/java/com/example/util/simpletimetracker/ActivityFilterTest.kt

@@ -641,6 +641,66 @@ class ActivityFilterTest : BaseUiTest() {
         checkViewIsDisplayed(withText(filter2))
     }
 
+    @Test
+    fun categoriesAsFilters() {
+        showActivityFilters()
+
+        val filter = "Filter"
+        val category1 = "Category1"
+        val category2 = "Category2"
+        val type1 = "Type1"
+        val type2 = "Type2"
+
+        val availableTypes = listOf(type1, type2)
+
+        // Add data
+        testUtils.addCategory(category1, color = firstColor)
+        testUtils.addCategory(category2, color = lastColor)
+        testUtils.addActivity(type1, categories = listOf(category1))
+        testUtils.addActivity(type2, categories = listOf(category2))
+        testUtils.addActivityFilter(filter)
+        Thread.sleep(1000)
+
+        // Check
+        tryAction { checkViewIsDisplayed(withText(filter)) }
+        checkViewDoesNotExist(withText(category1))
+        checkViewDoesNotExist(withText(category2))
+        checkTypes(displayed = listOf(type1, type2), available = availableTypes)
+
+        // Change setting
+        NavUtils.openSettingsScreen()
+        NavUtils.openSettingsDisplay()
+        scrollSettingsRecyclerToText(R.string.settings_show_categories_as_predefined_filters)
+        clickOnSettingsCheckboxBesideText(R.string.settings_show_categories_as_predefined_filters)
+
+        // Check again
+        NavUtils.openRunningRecordsScreen()
+        checkViewIsDisplayed(withText(filter))
+        checkViewIsDisplayed(withText(category1))
+        checkViewIsDisplayed(withText(category2))
+        checkViewIsDisplayed(withText(filter))
+        checkFilter(category1, viewsR.color.colorFiltered)
+        checkFilter(category2, viewsR.color.colorFiltered)
+        checkTypes(displayed = listOf(type1, type2), available = availableTypes)
+
+        // Check filtering
+        clickOnViewWithText(category1)
+        checkFilter(category1, firstColor)
+        checkFilter(category2, viewsR.color.colorFiltered)
+        checkTypes(displayed = listOf(type1), available = availableTypes)
+
+        clickOnViewWithText(category1)
+        clickOnViewWithText(category2)
+        checkFilter(category1, viewsR.color.colorFiltered)
+        checkFilter(category2, lastColor)
+        checkTypes(displayed = listOf(type2), available = availableTypes)
+
+        clickOnViewWithText(category1)
+        checkFilter(category1, firstColor)
+        checkFilter(category2, lastColor)
+        checkTypes(displayed = listOf(type1, type2), available = availableTypes)
+    }
+
     private fun checkFilter(
         name: String,
         color: Int,

app/src/androidTest/java/com/example/util/simpletimetracker/SettingsTest.kt

@@ -2408,34 +2408,44 @@ class SettingsTest : BaseUiTest() {
 
         // Filters not shown
         tryAction {
-            checkViewIsDisplayed(withText(coreR.string.running_records_add_type))
-            checkViewDoesNotExist(withText(coreR.string.running_records_add_filter))
+            checkViewIsDisplayed(withText(R.string.running_records_add_type))
+            checkViewDoesNotExist(withText(R.string.running_records_add_filter))
             checkViewDoesNotExist(withText(name))
         }
 
         // Check settings
         NavUtils.openSettingsScreen()
         NavUtils.openSettingsDisplay()
-        scrollSettingsRecyclerToText(coreR.string.settings_show_activity_filters)
-        checkCheckboxIsNotChecked(settingsCheckboxBesideText(coreR.string.settings_show_activity_filters))
-        checkViewDoesNotExist(withText(coreR.string.settings_allow_multiple_activity_filters))
+        scrollSettingsRecyclerToText(R.string.settings_show_activity_filters)
+        checkCheckboxIsNotChecked(settingsCheckboxBesideText(R.string.settings_show_activity_filters))
+        checkViewDoesNotExist(withText(R.string.settings_allow_multiple_activity_filters))
+        checkViewDoesNotExist(withText(R.string.settings_show_categories_as_predefined_filters))
 
         // Change setting
-        clickOnSettingsCheckboxBesideText(coreR.string.settings_show_activity_filters)
-        checkCheckboxIsChecked(settingsCheckboxBesideText(coreR.string.settings_show_activity_filters))
-        scrollSettingsRecyclerToText(coreR.string.settings_allow_multiple_activity_filters)
-        checkViewIsDisplayed(withText(coreR.string.settings_allow_multiple_activity_filters))
-        checkCheckboxIsChecked(settingsCheckboxBesideText(coreR.string.settings_allow_multiple_activity_filters))
+        clickOnSettingsCheckboxBesideText(R.string.settings_show_activity_filters)
+        checkCheckboxIsChecked(settingsCheckboxBesideText(R.string.settings_show_activity_filters))
+        scrollSettingsRecyclerToText(R.string.settings_allow_multiple_activity_filters)
+        checkViewIsDisplayed(withText(R.string.settings_allow_multiple_activity_filters))
+        checkCheckboxIsChecked(settingsCheckboxBesideText(R.string.settings_allow_multiple_activity_filters))
+        scrollSettingsRecyclerToText(R.string.settings_show_categories_as_predefined_filters)
+        checkViewIsDisplayed(withText(R.string.settings_show_categories_as_predefined_filters))
+        checkCheckboxIsNotChecked(settingsCheckboxBesideText(R.string.settings_show_categories_as_predefined_filters))
 
         // Check allow multiple
-        clickOnSettingsCheckboxBesideText(coreR.string.settings_allow_multiple_activity_filters)
-        checkCheckboxIsNotChecked(settingsCheckboxBesideText(coreR.string.settings_allow_multiple_activity_filters))
-        clickOnSettingsCheckboxBesideText(coreR.string.settings_allow_multiple_activity_filters)
-        checkCheckboxIsChecked(settingsCheckboxBesideText(coreR.string.settings_allow_multiple_activity_filters))
+        clickOnSettingsCheckboxBesideText(R.string.settings_allow_multiple_activity_filters)
+        checkCheckboxIsNotChecked(settingsCheckboxBesideText(R.string.settings_allow_multiple_activity_filters))
+        clickOnSettingsCheckboxBesideText(R.string.settings_allow_multiple_activity_filters)
+        checkCheckboxIsChecked(settingsCheckboxBesideText(R.string.settings_allow_multiple_activity_filters))
+
+        // Check categories as filters
+        clickOnSettingsCheckboxBesideText(R.string.settings_show_categories_as_predefined_filters)
+        checkCheckboxIsChecked(settingsCheckboxBesideText(R.string.settings_show_categories_as_predefined_filters))
+        clickOnSettingsCheckboxBesideText(R.string.settings_show_categories_as_predefined_filters)
+        checkCheckboxIsNotChecked(settingsCheckboxBesideText(R.string.settings_show_categories_as_predefined_filters))
 
         // Filters shown
         NavUtils.openRunningRecordsScreen()
-        checkViewIsDisplayed(withText(coreR.string.running_records_add_filter))
+        checkViewIsDisplayed(withText(R.string.running_records_add_filter))
         checkViewIsDisplayed(withText(name))
     }