From 192782815c29370aa1035a207f90454c158e2cb8 Mon Sep 17 00:00:00 2001 From: razeeman Date: Sun, 20 Nov 2022 17:47:04 +0300 Subject: [PATCH] fix ui tests --- .../com/example/util/simpletimetracker/AddRecordTypeTest.kt | 2 ++ .../com/example/util/simpletimetracker/ChangeRecordTypeTest.kt | 2 ++ .../java/com/example/util/simpletimetracker/CustomColorTest.kt | 1 + .../java/com/example/util/simpletimetracker/IconTest.kt | 3 +++ .../java/com/example/util/simpletimetracker/utils/NavUtils.kt | 3 +++ .../src/main/res/layout/item_divider_layout.xml | 1 + 6 files changed, 12 insertions(+) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt index ebb467de..ee87f370 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt @@ -83,6 +83,7 @@ class AddRecordTypeTest : BaseUiTest() { checkViewIsDisplayed(allOf(withId(R.id.viewColorItemSelected), withParent(withCardColor(lastColor)))) // Open icon chooser + clickOnViewWithText(R.string.change_record_type_color_hint) clickOnViewWithText(R.string.change_record_type_icon_image_hint) checkViewIsNotDisplayed(withId(R.id.rvChangeRecordTypeColor)) checkViewIsDisplayed(withId(R.id.rvChangeRecordTypeIcon)) @@ -98,6 +99,7 @@ class AddRecordTypeTest : BaseUiTest() { checkPreviewUpdated(hasDescendant(withTag(lastIcon))) // Open category chooser + clickOnViewWithId(R.id.fieldChangeRecordTypeIcon) clickOnViewWithText(R.string.category_hint) checkViewIsNotDisplayed(withId(R.id.rvChangeRecordTypeIcon)) checkViewIsDisplayed(withId(R.id.rvChangeRecordTypeCategories)) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRecordTypeTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRecordTypeTest.kt index ecd9a323..91c8bdb4 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRecordTypeTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRecordTypeTest.kt @@ -66,6 +66,7 @@ class ChangeRecordTypeTest : BaseUiTest() { clickOnRecyclerItem(R.id.rvChangeRecordTypeColor, withCardColor(lastColor)) checkPreviewUpdated(withCardColor(lastColor)) checkViewIsDisplayed(allOf(withId(R.id.viewColorItemSelected), withParent(withCardColor(lastColor)))) + clickOnViewWithText(R.string.change_record_type_color_hint) clickOnViewWithText(R.string.change_record_type_icon_image_hint) onView(withId(R.id.rvChangeRecordTypeIcon)).perform(collapseToolbar()) @@ -130,6 +131,7 @@ class ChangeRecordTypeTest : BaseUiTest() { clickOnViewWithText(R.string.change_record_type_color_hint) scrollRecyclerToView(R.id.rvChangeRecordTypeColor, withCardColor(lastColor)) clickOnRecyclerItem(R.id.rvChangeRecordTypeColor, withCardColor(lastColor)) + clickOnViewWithText(R.string.change_record_type_color_hint) clickOnViewWithText(R.string.change_record_type_icon_image_hint) onView(withId(R.id.rvChangeRecordTypeIcon)).perform(collapseToolbar()) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/CustomColorTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/CustomColorTest.kt index e60e668c..ae2254cc 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/CustomColorTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/CustomColorTest.kt @@ -211,6 +211,7 @@ class CustomColorTest : BaseUiTest() { ) // Save record type + clickOnViewWithText(R.string.change_record_type_color_hint) typeTextIntoView(R.id.etChangeRecordTypeName, name) clickOnViewWithText(R.string.change_record_type_save) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/IconTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/IconTest.kt index cdce8a8a..24e431a4 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/IconTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/IconTest.kt @@ -13,6 +13,7 @@ import com.example.util.simpletimetracker.utils.NavUtils import com.example.util.simpletimetracker.utils.checkViewIsDisplayed import com.example.util.simpletimetracker.utils.clickOnRecyclerItem import com.example.util.simpletimetracker.utils.clickOnView +import com.example.util.simpletimetracker.utils.clickOnViewWithId import com.example.util.simpletimetracker.utils.clickOnViewWithText import com.example.util.simpletimetracker.utils.collapseToolbar import com.example.util.simpletimetracker.utils.longClickOnView @@ -56,6 +57,7 @@ class IconTest : BaseUiTest() { checkViewIsDisplayed(allOf(withId(R.id.previewChangeRecordType), hasDescendant(withText(firstEmoji)))) // Save + clickOnViewWithId(R.id.fieldChangeRecordTypeIcon) typeTextIntoView(R.id.etChangeRecordTypeName, firstName) clickOnViewWithText(R.string.change_record_type_save) @@ -151,6 +153,7 @@ class IconTest : BaseUiTest() { val firstImage = images.values.first() if (category == iconImageMapper.getAvailableCategories().last()) { + onView(withId(R.id.rvChangeRecordTypeIcon)).perform(collapseToolbar()) onView(withId(R.id.rvChangeRecordTypeIcon)).perform(swipeUp(50)) } diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt index bf978aef..9b789682 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt @@ -76,6 +76,7 @@ object NavUtils { clickOnViewWithText(R.string.change_record_type_color_hint) scrollRecyclerToView(R.id.rvChangeRecordTypeColor, withCardColor(color)) clickOnRecyclerItem(R.id.rvChangeRecordTypeColor, withCardColor(color)) + clickOnViewWithText(R.string.change_record_type_color_hint) } // Icon @@ -83,11 +84,13 @@ object NavUtils { clickOnViewWithText(R.string.change_record_type_icon_image_hint) scrollRecyclerToView(R.id.rvChangeRecordTypeIcon, hasDescendant(withTag(icon))) clickOnRecyclerItem(R.id.rvChangeRecordTypeIcon, withTag(icon)) + clickOnViewWithId(R.id.fieldChangeRecordTypeIcon) } else if (text != null) { clickOnViewWithText(R.string.change_record_type_icon_image_hint) onView(withId(R.id.rvChangeRecordTypeIcon)).perform(collapseToolbar()) scrollRecyclerToView(R.id.rvChangeRecordTypeIcon, hasDescendant(withText(text))) clickOnRecyclerItem(R.id.rvChangeRecordTypeIcon, withText(text)) + clickOnViewWithId(R.id.fieldChangeRecordTypeIcon) } // Categories diff --git a/features/feature_base_adapter/src/main/res/layout/item_divider_layout.xml b/features/feature_base_adapter/src/main/res/layout/item_divider_layout.xml index bb369591..66e49c41 100644 --- a/features/feature_base_adapter/src/main/res/layout/item_divider_layout.xml +++ b/features/feature_base_adapter/src/main/res/layout/item_divider_layout.xml @@ -1,4 +1,5 @@ \ No newline at end of file -- 2.51.2