fix tests

Author: Razeeman

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

@@ -196,7 +196,6 @@ class RecordActionsDuplicateTest : BaseUiTest() {
         clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name))
         clickOnViewWithText(coreR.string.change_record_comment_field)
         typeTextIntoView(changeRecordR.id.etChangeRecordCommentField, comment)
-        closeSoftKeyboard()
         clickOnViewWithText(coreR.string.change_record_comment_field)
 
         // Duplicate

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

@@ -35,6 +35,7 @@ import com.example.util.simpletimetracker.utils.checkViewDoesNotExist
 import com.example.util.simpletimetracker.utils.checkViewIsDisplayed
 import com.example.util.simpletimetracker.utils.checkViewIsNotDisplayed
 import com.example.util.simpletimetracker.utils.clickOnCurrentDate
+import com.example.util.simpletimetracker.utils.clickOnCurrentSelectedDate
 import com.example.util.simpletimetracker.utils.clickOnPrevDate
 import com.example.util.simpletimetracker.utils.clickOnRecyclerItem
 import com.example.util.simpletimetracker.utils.clickOnView
@@ -1320,7 +1321,7 @@ class SettingsTest : BaseUiTest() {
 
         // Check detailed statistics
         clickOnView(allOf(withText(name), isCompletelyDisplayed()))
-        tryAction { clickOnCurrentDate() }
+        clickOnCurrentSelectedDate()
         clickOnViewWithText(coreR.string.range_day)
         checkStatisticsDetailRecords(0)
         clickOnCurrentDate(-1)

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

@@ -17,6 +17,7 @@ import com.example.util.simpletimetracker.utils.NavUtils
 import com.example.util.simpletimetracker.utils.checkViewDoesNotExist
 import com.example.util.simpletimetracker.utils.checkViewIsDisplayed
 import com.example.util.simpletimetracker.utils.clickOnCurrentDate
+import com.example.util.simpletimetracker.utils.clickOnCurrentSelectedDate
 import com.example.util.simpletimetracker.utils.clickOnNextDate
 import com.example.util.simpletimetracker.utils.clickOnView
 import com.example.util.simpletimetracker.utils.clickOnViewWithText
@@ -104,7 +105,7 @@ class StatisticsDetailTest : BaseUiTest() {
         tryAction { clickOnView(allOf(withText(name), isCompletelyDisplayed())) }
 
         // Check one day
-        clickOnCurrentDate()
+        clickOnCurrentSelectedDate()
         clickOnViewWithText(coreR.string.range_custom)
         NavUtils.setCustomRange(
             yearStarted = calendarToday.get(Calendar.YEAR),
@@ -614,7 +615,7 @@ class StatisticsDetailTest : BaseUiTest() {
         checkPreview(color, icon, name)
 
         // Switch range
-        clickOnCurrentDate()
+        clickOnCurrentSelectedDate()
         clickOnViewWithText(coreR.string.range_week)
 
         // Daily calendar
@@ -988,7 +989,7 @@ class StatisticsDetailTest : BaseUiTest() {
         checkPreview(color, icon, name)
 
         // Switch range
-        clickOnCurrentDate()
+        clickOnCurrentSelectedDate()
         clickOnView(withPluralText(coreR.plurals.range_last, 7, 7))
         clickOnViewWithText(coreR.string.duration_dialog_save)
 
@@ -1165,7 +1166,7 @@ class StatisticsDetailTest : BaseUiTest() {
         NavUtils.openStatisticsScreen()
         tryAction { clickOnView(allOf(withText(coreR.string.untracked_time_name), isCompletelyDisplayed())) }
 
-        clickOnCurrentDate(-1)
+        tryAction { clickOnCurrentDate(-1) }
         checkCard(coreR.string.statistics_detail_total_duration, "24$hourString 0$minuteString")
         checkRecordsCard(1)
         checkCard(coreR.string.statistics_detail_average_record, "24$hourString 0$minuteString")
@@ -1290,7 +1291,7 @@ class StatisticsDetailTest : BaseUiTest() {
         // Check on one record
         NavUtils.openStatisticsScreen()
         tryAction { clickOnView(allOf(withText(name1), isCompletelyDisplayed())) }
-        clickOnCurrentDate()
+        clickOnCurrentSelectedDate()
         clickOnViewWithText(coreR.string.range_overall)
         checkViewDoesNotExist(
             allOf(withTag(StatisticsDetailBlock.ChartSplitByActivity), isCompletelyDisplayed()),

app/src/androidTest/java/com/example/util/simpletimetracker/utils/ViewActions.kt

@@ -243,11 +243,11 @@ fun scrollToBottom(): ViewAction = object : ViewAction {
 }
 
 fun tryAction(action: () -> Unit) {
-    repeat(5) {
+    repeat(3) {
         try {
             action()
             return
-        } catch (e: Throwable) {
+        } catch (_: Throwable) {
             Thread.sleep(1000)
         }
     }
@@ -261,7 +261,7 @@ fun tryActionWithFallback(
     try {
         action()
         return
-    } catch (e: Throwable) {
+    } catch (_: Throwable) {
         onError.invoke()
     }
     action()

app/src/androidTest/java/com/example/util/simpletimetracker/utils/ViewInteractions.kt

@@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package com.example.util.simpletimetracker.utils
 
 import android.view.View
@@ -42,15 +44,19 @@ fun typeTextIntoView(id: Int, text: String): ViewInteraction =
 fun clickOnViewWithId(id: Int): ViewInteraction =
     onView(withId(id)).perform(click())
 
-fun clickOnPrevDate(): ViewInteraction =
+fun clickOnPrevDate() {
     unconstrainedClickOnView(dateSelectorMatcher(-1))
+    Thread.sleep(200) // Wait for scroll.
+}
 
-fun clickOnNextDate(): ViewInteraction =
+fun clickOnNextDate() {
     unconstrainedClickOnView(dateSelectorMatcher(1))
+    Thread.sleep(200) // Wait for scroll.
+}
 
 fun clickOnCurrentDate(position: Int = 0) {
     unconstrainedClickOnView(dateSelectorMatcher(position))
-    Thread.sleep(200)
+    Thread.sleep(200) // Wait for scroll.
 }
 
 fun clickOnCurrentSelectedDate() {