add new tests

Author: Razeeman

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

@@ -1,5 +1,6 @@
 package com.example.util.simpletimetracker
 
+import androidx.test.espresso.Espresso.closeSoftKeyboard
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
@@ -18,6 +19,7 @@ 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.tryAction
+import com.example.util.simpletimetracker.utils.typeTextIntoView
 import dagger.hilt.android.testing.HiltAndroidTest
 import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.allOf
@@ -27,6 +29,7 @@ import java.util.Calendar
 import com.example.util.simpletimetracker.feature_change_record_tag.R as changeRecordTagR
 import com.example.util.simpletimetracker.feature_change_record_type.R as changeRecordTypeR
 import com.example.util.simpletimetracker.feature_complex_rules.R as complexRulesR
+import com.example.util.simpletimetracker.feature_dialogs.R as dialogsR
 
 @HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
@@ -574,6 +577,47 @@ class ComplexRulesTest : BaseUiTest() {
         checkRunningRecordWithTag(typeName, tagName)
     }
 
+    @Test
+    fun assignTagValueFromRule() {
+        val typeName = "typeName"
+        val tagName = "tagName"
+        val tagValueText = "12.3"
+
+        // Add data
+        runBlocking { prefsInteractor.setAllowMultitasking(false) }
+        testUtils.addActivity(typeName)
+        testUtils.addRecordTag(
+            tagName = tagName,
+            typeName = typeName,
+            hasTagValue = true,
+        )
+
+        // Create rule
+        NavUtils.openSettingsScreen()
+        NavUtils.openSettingsAdditional()
+        NavUtils.openComplexRules()
+        clickOnViewWithText(R.string.running_records_add_type)
+        clickOnViewWithText(R.string.change_complex_rule_choose_action)
+        clickOnViewWithText(R.string.change_complex_action_assign_tag)
+        clickOnViewWithText(tagName)
+        typeTextIntoView(R.id.etCommentItemField, tagValueText)
+        closeSoftKeyboard()
+        clickOnViewWithId(dialogsR.id.btnRecordTagSelectionSave)
+        clickOnViewWithId(dialogsR.id.btnTypesSelectionSave)
+        clickOnViewWithText(R.string.change_complex_starting_activity)
+        clickOnViewWithText(typeName)
+        clickOnViewWithText(R.string.change_activity_filter_save)
+
+        // Check rule
+        checkViewIsDisplayed(withSubstring(tagValueText))
+        pressBack()
+
+        // Check record started
+        NavUtils.openRunningRecordsScreen()
+        clickOnViewWithText(typeName)
+        checkRunningRecordWithTag(typeName, tagName, tagValueText)
+    }
+
     @Test
     fun archiveAndRemoveData() {
         val typeName1 = "typeName1"
@@ -689,11 +733,19 @@ class ComplexRulesTest : BaseUiTest() {
         checkViewDoesNotExist(allOf(withId(R.id.viewRunningRecordItem), hasDescendant(withText(name))))
     }
 
-    private fun checkRunningRecordWithTag(name: String, tagName: String) {
+    private fun checkRunningRecordWithTag(
+        name: String,
+        tagName: String,
+        tagValue: String? = null,
+    ) {
+        val tagName = buildString {
+            append("$name - $tagName")
+            tagValue?.let { value -> append(" ($value)") }
+        }
         checkViewIsDisplayed(
             allOf(
                 withId(R.id.viewRunningRecordItem),
-                hasDescendant(withText("$name - $tagName")),
+                hasDescendant(withText(tagName)),
             ),
         )
     }

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

@@ -6,6 +6,7 @@ import androidx.test.espresso.Espresso.onData
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyAbove
 import androidx.test.espresso.contrib.PickerActions.setDate
 import androidx.test.espresso.contrib.PickerActions.setTime
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
@@ -23,6 +24,7 @@ import com.example.util.simpletimetracker.core.extension.setWeekToFirstDay
 import com.example.util.simpletimetracker.core.interactor.LanguageInteractor
 import com.example.util.simpletimetracker.domain.activityFilter.model.ActivityFilter
 import com.example.util.simpletimetracker.domain.base.DurationFormat
+import com.example.util.simpletimetracker.domain.complexRule.model.ComplexRule
 import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
 import com.example.util.simpletimetracker.domain.extension.padDuration
 import com.example.util.simpletimetracker.domain.language.AppLanguage
@@ -1741,6 +1743,61 @@ class SettingsTest : BaseUiTest() {
         tryAction { clickOnView(allOf(isDescendantOfA(withId(baseR.id.viewRunningRecordItem)), withText(name))) }
     }
 
+    @Test
+    fun showRecordTagSelectionPreselectedTags() {
+        val typeName = "PreselectType"
+        val defaultTag = "DefaultTag"
+        val ruleTag = "RuleTag"
+        val ruleTagValue = 1.2
+        val generalTag = "GeneralTag"
+        val fullTagName = "$ruleTag (1.2)"
+        val fullName = "$typeName - $defaultTag, $fullTagName"
+
+        runBlocking { prefsInteractor.setShowRecordTagSelection(true) }
+        testUtils.addActivity(typeName)
+        testUtils.addRecordTag(
+            tagName = defaultTag,
+            typeName = typeName,
+            defaultTypes = listOf(typeName),
+        )
+        testUtils.addRecordTag(
+            tagName = generalTag,
+        )
+        testUtils.addRecordTag(
+            tagName = ruleTag,
+            typeName = typeName,
+            hasTagValue = true,
+        )
+        testUtils.addComplexRule(
+            action = ComplexRule.Action.AssignTag,
+            startingTypeNames = listOf(typeName),
+            assignTagNames = listOf(ruleTag),
+            assignTagValues = mapOf(ruleTag to ruleTagValue),
+        )
+
+        Thread.sleep(1000)
+
+        // Check preselected
+        tryAction { clickOnViewWithText(typeName) }
+        checkViewIsDisplayed(withText(coreR.string.something_selected))
+        checkViewIsDisplayed(withText(fullTagName))
+        onView(withText(defaultTag))
+            .check(isCompletelyAbove(withText(generalTag)))
+        onView(withText(fullTagName))
+            .check(isCompletelyAbove(withText(generalTag)))
+
+        // Save
+        clickOnViewWithText(coreR.string.duration_dialog_save)
+        tryAction {
+            checkViewIsDisplayed(
+                allOf(
+                    withId(baseR.id.viewRunningRecordItem),
+                    hasDescendant(withText(fullName)),
+                ),
+            )
+        }
+    }
+
     @Test
     fun recordTagSelectionClose() {
         val name = "TypeName"

core/src/main/java/com/example/util/simpletimetracker/core/utils/TestUtils.kt

@@ -325,22 +325,24 @@ class TestUtils @Inject constructor(
         action: ComplexRule.Action,
         actionDisallowOnlyPrevious: Boolean = false,
         assignTagNames: List<String> = emptyList(),
+        assignTagValues: Map<String, Double?> = emptyMap(),
         startingTypeNames: List<String> = emptyList(),
         currentTypeNames: List<String> = emptyList(),
         daysOfWeek: List<DayOfWeek> = emptyList(),
     ) = runBlocking {
         val availableTypes = recordTypeInteractor.getAll()
-        val assignTagIds = recordTagInteractor.getAll()
-            .filter { it.name in assignTagNames }
-            .map { it.id }
-            .toSet()
+        val tagsByName = recordTagInteractor.getAll().associateBy { it.name }
 
         val data = ComplexRule(
             disabled = false,
             action = action,
             actionDisallowOnlyPrevious = actionDisallowOnlyPrevious,
-            actionAssignTagValues = assignTagIds
-                .map { RecordBase.Tag(tagId = it, numericValue = null) },
+            actionAssignTagValues = assignTagNames.mapNotNull { name ->
+                RecordBase.Tag(
+                    tagId = tagsByName[name]?.id ?: return@mapNotNull null,
+                    numericValue = assignTagValues[name],
+                )
+            },
             conditionStartingTypeIds = getTypeIds(availableTypes, startingTypeNames),
             conditionCurrentTypeIds = getTypeIds(availableTypes, currentTypeNames),
             conditionDaysOfWeek = daysOfWeek.toSet(),