fix tests

Razeeman · Aug 11, 2024 · 8e60042 · 8e60042
1 parent b7ebb4f
commit 8e60042
Show file tree

Hide file tree

Showing 18 changed files with 72 additions and 13 deletions.
diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml
@@ -37,7 +37,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        api-level: [21, 28, 29]
+        api-level: [21, 23, 29, 32, 34]
 
     steps:
       - name: Check out code

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/AddCategoryTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/AddCategoryTest.kt
@@ -149,6 +149,7 @@ class AddCategoryTest : BaseUiTest() {
 
         // Check types saved
         longClickOnView(withText(name))
+        Thread.sleep(1000)
         clickOnViewWithText(coreR.string.change_category_types_hint)
         checkViewIsDisplayed(withText(coreR.string.something_selected))
         checkViewIsDisplayed(withId(baseR.id.viewDividerItem))

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt
@@ -176,6 +176,7 @@ class AddRecordTypeTest : BaseUiTest() {
     @Test
     fun addRecordTypeEmpty() {
         tryAction { clickOnViewWithText(coreR.string.running_records_add_type) }
+        closeSoftKeyboard()
 
         // Goal time is disabled
         clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsAdjustTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsAdjustTest.kt
@@ -23,6 +23,7 @@ import com.example.util.simpletimetracker.utils.clickOnView
 import com.example.util.simpletimetracker.utils.clickOnViewWithText
 import com.example.util.simpletimetracker.utils.getMillis
 import com.example.util.simpletimetracker.utils.longClickOnView
+import com.example.util.simpletimetracker.utils.nestedScrollTo
 import com.example.util.simpletimetracker.utils.scrollRecyclerToView
 import dagger.hilt.android.testing.HiltAndroidTest
 import kotlinx.coroutines.runBlocking
@@ -91,6 +92,7 @@ class RecordActionsAdjustTest : BaseUiTest() {
         adjust(isStart = true, buttonText = "-30")
         adjust(isStart = false, buttonText = "+30")
         adjust(isStart = false, buttonText = "+30")
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust))
         clickOnViewWithText(coreR.string.change_record_adjust)
@@ -176,6 +178,7 @@ class RecordActionsAdjustTest : BaseUiTest() {
         adjust(isStart = false, buttonText = "+1")
         clickOnViewWithText(coreR.string.change_record_type_field)
         clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name2))
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust))
         clickOnViewWithText(coreR.string.change_record_adjust)
@@ -240,6 +243,7 @@ class RecordActionsAdjustTest : BaseUiTest() {
             allOf(isDescendantOfA(withId(baseR.id.viewRunningRecordItem)), withText(name2), isCompletelyDisplayed()),
         )
         clickOnViewWithText("-5")
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust))
         clickOnViewWithText(coreR.string.change_record_adjust)
@@ -292,6 +296,7 @@ class RecordActionsAdjustTest : BaseUiTest() {
         adjust(isStart = true, buttonText = "-30")
         adjust(isStart = false, buttonText = "+30")
         adjust(isStart = false, buttonText = "+30")
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust))
         clickOnViewWithText(coreR.string.change_record_adjust)
@@ -391,6 +396,7 @@ class RecordActionsAdjustTest : BaseUiTest() {
         }
 
         // Deselect
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
 
         scrollToView(name5)

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsContinueTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsContinueTest.kt
@@ -17,6 +17,7 @@ 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.longClickOnView
+import com.example.util.simpletimetracker.utils.nestedScrollTo
 import com.example.util.simpletimetracker.utils.recyclerItemCount
 import com.example.util.simpletimetracker.utils.scrollRecyclerToView
 import com.example.util.simpletimetracker.utils.tryAction
@@ -72,6 +73,7 @@ class RecordActionsContinueTest : BaseUiTest() {
 
         // Continue
         clickOnViewWithText(fullName)
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
         clickOnViewWithText(coreR.string.change_record_continue)
@@ -120,17 +122,20 @@ class RecordActionsContinueTest : BaseUiTest() {
         clickOnViewWithText(coreR.string.untracked_time_name)
 
         // Continue untracked doesn't work
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
         clickOnViewWithText(coreR.string.change_record_continue)
         clickOnViewWithId(com.google.android.material.R.id.snackbar_text)
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
 
         // Select activity
         clickOnViewWithText(coreR.string.change_record_type_field)
         clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name))
 
         // Continue
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
         clickOnViewWithText(coreR.string.change_record_continue)
@@ -178,17 +183,20 @@ class RecordActionsContinueTest : BaseUiTest() {
         clickOnViewWithId(recordsR.id.btnRecordAdd)
 
         // Continue untracked doesn't work
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
         clickOnViewWithText(coreR.string.change_record_continue)
         clickOnViewWithId(com.google.android.material.R.id.snackbar_text)
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
 
         // Select activity
         clickOnViewWithText(coreR.string.change_record_type_field)
         clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name))
 
         // Continue
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
         clickOnViewWithText(coreR.string.change_record_continue)
@@ -241,6 +249,7 @@ class RecordActionsContinueTest : BaseUiTest() {
         // Try continue record
         NavUtils.openRecordsScreen()
         clickOnView(allOf(withText(name), isCompletelyDisplayed()))
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
         clickOnViewWithText(coreR.string.change_record_continue)
@@ -261,6 +270,7 @@ class RecordActionsContinueTest : BaseUiTest() {
         adjust("+30")
         adjust("+30")
         adjust("+5")
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
         clickOnViewWithText(coreR.string.change_record_continue)
@@ -288,6 +298,7 @@ class RecordActionsContinueTest : BaseUiTest() {
         }
 
         // Try continue record
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         checkViewDoesNotExist(withText(coreR.string.change_record_continue))
     }
@@ -305,6 +316,7 @@ class RecordActionsContinueTest : BaseUiTest() {
         clickOnViewWithId(recordsR.id.btnRecordAdd)
         clickOnViewWithText(coreR.string.change_record_type_field)
         clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name))
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
         clickOnViewWithText(coreR.string.change_record_continue)
@@ -337,6 +349,7 @@ class RecordActionsContinueTest : BaseUiTest() {
         clickOnViewWithId(recordsR.id.btnRecordAdd)
         clickOnViewWithText(coreR.string.change_record_type_field)
         clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name2))
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
         clickOnViewWithText(coreR.string.change_record_continue)

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsDuplicateTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsDuplicateTest.kt
@@ -18,6 +18,7 @@ import com.example.util.simpletimetracker.utils.clickOnViewWithId
 import com.example.util.simpletimetracker.utils.clickOnViewWithText
 import com.example.util.simpletimetracker.utils.getMillis
 import com.example.util.simpletimetracker.utils.longClickOnView
+import com.example.util.simpletimetracker.utils.nestedScrollTo
 import com.example.util.simpletimetracker.utils.nthChildOf
 import com.example.util.simpletimetracker.utils.recyclerItemCount
 import com.example.util.simpletimetracker.utils.scrollRecyclerToView
@@ -57,6 +58,7 @@ class RecordActionsDuplicateTest : BaseUiTest() {
                 allOf(withId(baseR.id.viewRunningRecordItem), hasDescendant(withText(name)), isCompletelyDisplayed()),
             )
         }
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         checkViewDoesNotExist(withText(coreR.string.change_record_duplicate))
         pressBack()
@@ -67,6 +69,7 @@ class RecordActionsDuplicateTest : BaseUiTest() {
         clickOnView(
             allOf(withId(baseR.id.viewRecordItem), hasDescendant(withText(name)), isCompletelyDisplayed()),
         )
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate))
         checkViewIsDisplayed(withText(coreR.string.change_record_duplicate))
@@ -115,6 +118,7 @@ class RecordActionsDuplicateTest : BaseUiTest() {
 
         // Duplicate
         clickOnViewWithText(fullName)
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate))
         clickOnViewWithText(coreR.string.change_record_duplicate)
@@ -170,10 +174,12 @@ class RecordActionsDuplicateTest : BaseUiTest() {
         clickOnViewWithText(coreR.string.untracked_time_name)
 
         // Duplicate untracked doesn't work
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate))
         clickOnViewWithText(coreR.string.change_record_duplicate)
         clickOnViewWithId(com.google.android.material.R.id.snackbar_text)
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
 
         // Select activity
@@ -185,6 +191,7 @@ class RecordActionsDuplicateTest : BaseUiTest() {
         clickOnViewWithText(coreR.string.change_record_comment_field)
 
         // Duplicate
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate))
         clickOnViewWithText(coreR.string.change_record_duplicate)
@@ -232,6 +239,7 @@ class RecordActionsDuplicateTest : BaseUiTest() {
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate))
         clickOnViewWithText(coreR.string.change_record_duplicate)
         clickOnViewWithId(com.google.android.material.R.id.snackbar_text)
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
 
         // Select activity
@@ -243,6 +251,7 @@ class RecordActionsDuplicateTest : BaseUiTest() {
         clickOnViewWithText(coreR.string.change_record_comment_field)
 
         // Duplicate
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate))
         clickOnViewWithText(coreR.string.change_record_duplicate)

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsMergeTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsMergeTest.kt
@@ -1,5 +1,6 @@
 package com.example.util.simpletimetracker
 
+import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
@@ -14,6 +15,7 @@ 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.longClickOnView
+import com.example.util.simpletimetracker.utils.nestedScrollTo
 import com.example.util.simpletimetracker.utils.scrollRecyclerToView
 import com.example.util.simpletimetracker.utils.tryAction
 import dagger.hilt.android.testing.HiltAndroidTest
@@ -55,8 +57,10 @@ class RecordActionsMergeTest : BaseUiTest() {
                 allOf(withId(baseR.id.viewRunningRecordItem), hasDescendant(withText(name)), isCompletelyDisplayed()),
             )
         }
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         checkViewDoesNotExist(withText(coreR.string.change_record_merge))
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         pressBack()
 
@@ -65,23 +69,29 @@ class RecordActionsMergeTest : BaseUiTest() {
         clickOnView(
             allOf(withId(baseR.id.viewRecordItem), hasDescendant(withText(name)), isCompletelyDisplayed()),
         )
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         checkViewDoesNotExist(withText(coreR.string.change_record_merge))
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         pressBack()
 
         // New record - not shown
         clickOnViewWithId(recordsR.id.btnRecordAdd)
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         checkViewDoesNotExist(withText(coreR.string.change_record_merge))
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         pressBack()
 
         // Untracked and have prev record - shown
         clickOnView(allOf(withText(coreR.string.untracked_time_name), isCompletelyDisplayed()))
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_merge))
         checkViewIsDisplayed(withText(coreR.string.change_record_merge))
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         pressBack()
     }
@@ -135,6 +145,7 @@ class RecordActionsMergeTest : BaseUiTest() {
                 isCompletelyDisplayed(),
             ),
         )
+        onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
         clickOnViewWithText(coreR.string.change_record_actions_hint)
         scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_merge))
         clickOnViewWithText(coreR.string.change_record_merge)