add marathon for ui tests

Author: Razeeman

app/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.kotlin)
     alias(libs.plugins.ksp)
     alias(libs.plugins.hilt)
+    alias(libs.plugins.marathon)
 }
 
 applyAndroidLibrary()
@@ -139,4 +140,15 @@ dependencies {
     androidTestImplementation(libs.uitest.espressoContrib)
     androidTestImplementation(libs.uitest.dagger)
     androidTestImplementation(libs.uitest.room)
+    androidTestImplementation(libs.uitest.rules)
+}
+
+marathon {
+    name = "stt tests"
+    retryStrategy {
+        fixedQuota {
+            retryPerTestQuota = 3
+            totalAllowedRetryQuota = 100
+        }
+    }
 }

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

@@ -369,6 +369,7 @@ class ActivityFilterTest : BaseUiTest() {
             color = firstColor,
             names = listOf(categoryName1, categoryName2),
         )
+        Thread.sleep(1000)
 
         // Check filtering
         tryAction { checkFilter(filterByActivity1, viewsR.color.colorFiltered) }

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

@@ -179,6 +179,7 @@ class AddRecordTest : BaseUiTest() {
         // Set comment
         clickOnViewWithText(coreR.string.change_record_comment_field)
         typeTextIntoView(changeRecordR.id.etChangeRecordCommentField, comment)
+        Thread.sleep(1000) // For keyboard to open.
         closeSoftKeyboard()
         tryAction { checkPreviewUpdated(hasDescendant(withText(comment))) }
         clickOnViewWithText(coreR.string.change_record_comment_field)

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

@@ -159,6 +159,7 @@ class ChangeRunningRecordTest : BaseUiTest() {
         checkViewIsDisplayed(allOf(withId(changeRecordR.id.tvChangeRecordTimeStartedTime), withText(timeStarted.time)))
         clickOnViewWithText(coreR.string.change_record_comment_field)
         typeTextIntoView(changeRecordR.id.etChangeRecordCommentField, comment)
+        Thread.sleep(1000) // For keyboard to open.
         clickOnViewWithText(coreR.string.change_record_comment_field)
 
         // Preview is updated

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

@@ -263,6 +263,7 @@ class RecordActionsDuplicateTest : BaseUiTest() {
         clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name))
         clickOnViewWithText(coreR.string.change_record_comment_field)
         typeTextIntoView(changeRecordR.id.etChangeRecordCommentField, comment)
+        Thread.sleep(1000) // For keyboard top open.
         closeSoftKeyboard()
         clickOnViewWithText(coreR.string.change_record_comment_field)
 

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

@@ -1,13 +1,16 @@
 package com.example.util.simpletimetracker.utils
 
+import android.Manifest
 import android.content.Context
+import android.os.Build
 import androidx.annotation.ColorInt
 import androidx.emoji2.bundled.BundledEmojiCompatConfig
 import androidx.emoji2.text.EmojiCompat
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.GrantPermissionRule
 import com.example.util.simpletimetracker.core.R
 import com.example.util.simpletimetracker.core.interactor.LanguageInteractor
 import com.example.util.simpletimetracker.core.mapper.ColorMapper
@@ -16,9 +19,9 @@ import com.example.util.simpletimetracker.core.mapper.IconImageMapper
 import com.example.util.simpletimetracker.core.mapper.TimeMapper
 import com.example.util.simpletimetracker.core.utils.CountingIdlingResourceProvider
 import com.example.util.simpletimetracker.core.utils.TestUtils
-import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
-import com.example.util.simpletimetracker.domain.complexRule.repo.ComplexRuleRepo
 import com.example.util.simpletimetracker.domain.backup.repo.BackupRepo
+import com.example.util.simpletimetracker.domain.complexRule.repo.ComplexRuleRepo
+import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.recordType.repo.RecordTypeRepo
 import com.example.util.simpletimetracker.feature_records.view.RecordsContainerFragment
 import com.example.util.simpletimetracker.feature_settings.viewModel.delegate.SettingsFileWorkDelegate
@@ -73,6 +76,14 @@ open class BaseUiTest {
     val mRetryTestRule = RetryTestRule()
 
     @get:Rule(order = 2)
+    val permissionRule: GrantPermissionRule =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            GrantPermissionRule.grant(Manifest.permission.POST_NOTIFICATIONS)
+        } else {
+            GrantPermissionRule.grant()
+        }
+
+    @get:Rule(order = 3)
     val activityScenarioRule = ActivityScenarioRule(MainActivity::class.java)
 
     val firstColor: Int

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

@@ -243,6 +243,7 @@ object NavUtils {
 
         // Name
         typeTextIntoView(changeCategoryR.id.etChangeCategoryName, name)
+        Thread.sleep(1000) // For keyboard to open.
 
         // Color
         if (color != null) {

features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/interactor/ChangeRunningRecordViewDataInteractor.kt

@@ -3,6 +3,7 @@ package com.example.util.simpletimetracker.feature_change_running_record.interac
 import com.example.util.simpletimetracker.core.interactor.FilterGoalsByDayOfWeekInteractor
 import com.example.util.simpletimetracker.core.interactor.GetRunningRecordViewDataMediator
 import com.example.util.simpletimetracker.core.mapper.ChangeRecordDateTimeMapper
+import com.example.util.simpletimetracker.domain.extension.dropMillis
 import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor
@@ -64,7 +65,9 @@ class ChangeRunningRecordViewDataInteractor @Inject constructor(
                         ChangeRecordDateTimeMapper.Param.DateTime(record.timeStarted)
                     }
                     is ChangeRecordDateTimeFieldsState.State.Duration -> {
-                        ChangeRecordDateTimeMapper.Param.Duration(record.duration)
+                        ChangeRecordDateTimeMapper.Param.Duration(
+                            record.timeEnded - record.timeStarted.dropMillis(),
+                        )
                     }
                 },
                 field = ChangeRecordDateTimeMapper.Field.Start,

gradle/libs.versions.toml

@@ -3,6 +3,7 @@ gradle = "8.4.0"
 kotlin = "1.9.25"
 ktlint = "12.1.0"
 ksp = "1.9.25-1.0.20" # same as kotlin
+marathon = "0.10.3"
 
 coroutines = "1.6.4"
 timber = "4.7.1"
@@ -47,6 +48,7 @@ espresso = "3.5.0"
 mockito = "5.14.2"
 mockitoKotlin = "5.4.0"
 coroutinesTest = "1.7.1"
+rules = "1.5.0"
 
 [libraries]
 kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
@@ -120,6 +122,7 @@ uitest-espressoContrib = { group = "androidx.test.espresso", name = "espresso-co
 uitest-espressoIdling = { group = "androidx.test.espresso", name = "espresso-idling-resource", version.ref = "espresso" }
 uitest-dagger = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "dagger" }
 uitest-room = { group = "androidx.room", name = "room-testing", version.ref = "room" }
+uitest-rules = { group = "androidx.test", name = "rules", version.ref = "rules" }
 
 [plugins]
 gradleApplication = { id = "com.android.application", version.ref = "gradle" }
@@ -130,4 +133,5 @@ kotlinParcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref =
 javaLibrary = { id = "java-library" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }
-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+marathon = { id = "com.malinskiy.marathon", version.ref = "marathon" }