Skip to content

Commit e6a17c4

Browse files
RazeemanRazeeman
committed
fix tests
1 parent 178515a commit e6a17c4

File tree

13 files changed

+144
-60
lines changed

13 files changed

+144
-60
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ class ActivityFilterTest : BaseUiTest() {
5858
testUtils.addActivity(typeName2)
5959
testUtils.addCategory(categoryName1)
6060
testUtils.addCategory(categoryName2)
61+
Thread.sleep(1000)
6162

6263
tryAction { clickOnViewWithText(coreR.string.running_records_add_filter) }
6364
closeSoftKeyboard()
@@ -269,7 +270,7 @@ class ActivityFilterTest : BaseUiTest() {
269270
checkViewIsDisplayed(withText(newName))
270271
checkViewIsDisplayed(withCardColor(lastColor))
271272
longClickOnView(withText(newName))
272-
clickOnViewWithText(coreR.string.activity_hint)
273+
clickOnViewWithText(coreR.string.category_hint)
273274
onView(withText(categoryName1)).check(isCompletelyBelow(withId(changeActivityFilterR.id.viewDividerItem)))
274275
onView(withText(categoryName2)).check(isCompletelyAbove(withId(changeActivityFilterR.id.viewDividerItem)))
275276
}

‎app/src/androidTest/java/com/example/util/simpletimetracker/ArchiveTest.kt‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,17 @@ class ArchiveTest : BaseUiTest() {
7171
NavUtils.openStatisticsScreen()
7272
longClickOnViewWithIdOnPager(statisticsR.id.btnStatisticsContainerOptions)
7373
tryAction { checkTypeVisible(name1) }
74+
checkTypeNotVisible(name2)
75+
clickOnViewWithText(R.string.settings_archive)
7476
checkTypeVisible(name2)
7577
pressBack()
7678

7779
// Still shown in stat detail filter
7880
clickOnView(allOf(withText(name1), isCompletelyDisplayed()))
7981
longClickOnViewWithId(statisticsDetailR.id.btnStatisticsDetailOptions)
8082
tryAction { checkTypeVisible(name1) }
83+
checkTypeNotVisible(name2)
84+
clickOnViewWithText(R.string.settings_archive)
8185
checkTypeVisible(name2)
8286
pressBack()
8387
pressBack()
@@ -192,7 +196,12 @@ class ArchiveTest : BaseUiTest() {
192196
NavUtils.openStatisticsScreen()
193197
clickOnView(allOf(withText(name1), isCompletelyDisplayed()))
194198
longClickOnViewWithId(statisticsDetailR.id.btnStatisticsDetailOptions)
195-
clickOnViewWithText(coreR.string.records_filter_select_tags)
199+
clickOnViewWithText(coreR.string.record_tag_hint)
200+
checkTagVisible(tag1)
201+
checkTagNotVisible(tag2)
202+
checkTagVisible(tag3)
203+
checkTagNotVisible(tag4)
204+
clickOnViewWithText(R.string.settings_archive)
196205
checkTagVisible(tag1)
197206
checkTagVisible(tag2)
198207
checkTagVisible(tag3)

‎app/src/androidTest/java/com/example/util/simpletimetracker/DataEditTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ class DataEditTest : BaseUiTest() {
657657
checkViewIsDisplayed(allOf(withId(R.id.viewRecordTypeItem), hasDescendant(withText(name1))))
658658
checkViewIsDisplayed(allOf(withId(R.id.viewRecordTypeItem), hasDescendant(withText(name2))))
659659
NavUtils.openRecordsScreen()
660-
checkViewIsDisplayed(withText(R.string.no_records_exist))
660+
checkViewIsDisplayed(withSubstring(getString(R.string.no_records_exist)))
661661
}
662662

663663
@Test
@@ -702,7 +702,7 @@ class DataEditTest : BaseUiTest() {
702702
),
703703
)
704704
NavUtils.openRecordsScreen()
705-
checkViewIsDisplayed(withText(R.string.no_records_exist))
705+
checkViewIsDisplayed(withSubstring(getString(R.string.no_records_exist)))
706706
}
707707

708708
@Test

‎app/src/androidTest/java/com/example/util/simpletimetracker/DeleteRecordTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class DeleteRecordTest : BaseUiTest() {
4949
// Check message
5050
checkViewIsDisplayed(
5151
allOf(
52-
withText(getString(coreR.string.record_removed, name)),
52+
withText(getString(coreR.string.record_removed, "($name)")),
5353
withId(com.google.android.material.R.id.snackbar_text),
5454
),
5555
)
@@ -93,7 +93,7 @@ class DeleteRecordTest : BaseUiTest() {
9393
// Check message
9494
checkViewIsDisplayed(
9595
allOf(
96-
withText(getString(coreR.string.record_removed, name)),
96+
withText(getString(coreR.string.record_removed, "($name)")),
9797
withId(com.google.android.material.R.id.snackbar_text),
9898
),
9999
)

‎app/src/androidTest/java/com/example/util/simpletimetracker/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Running tests with marathon:
2+
./gradlew :app:marathonPlayDebugAndroidTest

‎app/src/androidTest/java/com/example/util/simpletimetracker/RecordTypeDefaultDurationTest.kt‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.example.util.simpletimetracker
22

33
import androidx.test.espresso.Espresso.closeSoftKeyboard
4+
import androidx.test.espresso.Espresso.onView
5+
import androidx.test.espresso.action.ViewActions.click
46
import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
57
import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
68
import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -9,9 +11,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
911
import com.example.util.simpletimetracker.utils.BaseUiTest
1012
import com.example.util.simpletimetracker.utils.NavUtils
1113
import com.example.util.simpletimetracker.utils.checkViewIsDisplayed
14+
import com.example.util.simpletimetracker.utils.clickOnView
1215
import com.example.util.simpletimetracker.utils.clickOnViewWithId
1316
import com.example.util.simpletimetracker.utils.clickOnViewWithText
1417
import com.example.util.simpletimetracker.utils.longClickOnView
18+
import com.example.util.simpletimetracker.utils.nestedScrollTo
1519
import com.example.util.simpletimetracker.utils.typeTextIntoView
1620
import dagger.hilt.android.testing.HiltAndroidTest
1721
import org.hamcrest.CoreMatchers.allOf
@@ -34,7 +38,8 @@ class RecordTypeDefaultDurationTest : BaseUiTest() {
3438
clickOnViewWithText(R.string.running_records_add_type)
3539
typeTextIntoView(changeRecordTypeR.id.etChangeRecordTypeName, type1)
3640
closeSoftKeyboard()
37-
clickOnViewWithText(coreR.string.change_record_type_additional_hint)
41+
onView(withText(coreR.string.change_record_type_additional_hint))
42+
.perform(nestedScrollTo(), click())
3843
checkViewIsDisplayed(
3944
allOf(
4045
withId(changeRecordTypeR.id.tvChangeRecordTypeAdditionalDefaultDurationSelectorValue),
@@ -45,7 +50,8 @@ class RecordTypeDefaultDurationTest : BaseUiTest() {
4550

4651
// Change
4752
longClickOnView(withText(type1))
48-
clickOnViewWithText(coreR.string.change_record_type_additional_hint)
53+
onView(withText(coreR.string.change_record_type_additional_hint))
54+
.perform(nestedScrollTo(), click())
4955
clickOnViewWithId(changeRecordTypeR.id.tvChangeRecordTypeAdditionalDefaultDurationSelectorValue)
5056
clickOnViewWithId(dialogsR.id.tvNumberKeyboard1)
5157
clickOnViewWithId(dialogsR.id.tvNumberKeyboard0)
@@ -56,7 +62,8 @@ class RecordTypeDefaultDurationTest : BaseUiTest() {
5662

5763
// Disable
5864
longClickOnView(withText(type1))
59-
clickOnViewWithText(coreR.string.change_record_type_additional_hint)
65+
onView(withText(coreR.string.change_record_type_additional_hint))
66+
.perform(nestedScrollTo(), click())
6067
clickOnViewWithText("1$minuteString")
6168
clickOnViewWithId(dialogsR.id.btnNumberKeyboardDelete)
6269
clickOnViewWithId(dialogsR.id.btnNumberKeyboardDelete)
@@ -72,7 +79,8 @@ class RecordTypeDefaultDurationTest : BaseUiTest() {
7279

7380
// Check
7481
longClickOnView(withText(type1))
75-
clickOnViewWithText(coreR.string.change_record_type_additional_hint)
82+
onView(withText(coreR.string.change_record_type_additional_hint))
83+
.perform(nestedScrollTo(), click())
7684
checkViewIsDisplayed(
7785
allOf(
7886
withId(changeRecordTypeR.id.tvChangeRecordTypeAdditionalDefaultDurationSelectorValue),

‎app/src/androidTest/java/com/example/util/simpletimetracker/RecordsAllTest.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,9 @@ class RecordsAllTest : BaseUiTest() {
187187
clickOnViewWithId(changeRecordR.id.btnChangeRecordDelete)
188188

189189
// Check message
190-
val message = InstrumentationRegistry.getInstrumentation().targetContext
191-
.resources.getString(coreR.string.record_removed, name)
192190
checkViewIsDisplayed(
193191
allOf(
194-
withText(message),
192+
withText(getString(coreR.string.record_removed, "($name)")),
195193
withId(com.google.android.material.R.id.snackbar_text),
196194
),
197195
)

‎app/src/androidTest/java/com/example/util/simpletimetracker/SettingsBackupTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ class SettingsBackupTest : BaseUiTest() {
242242
withCardColorInt(0xff345678.toInt()),
243243
),
244244
)
245-
onView(withText(R.string.activity_hint)).perform(nestedScrollTo())
246-
clickOnViewWithText(R.string.activity_hint)
245+
onView(withText(R.string.category_hint)).perform(nestedScrollTo())
246+
clickOnViewWithText(R.string.category_hint)
247247
onView(withText("category1")).check(isCompletelyAbove(withId(R.id.viewDividerItem)))
248248
onView(withText("category2")).check(isCompletelyAbove(withId(R.id.viewDividerItem)))
249249
onView(withText("category3")).check(isCompletelyBelow(withId(R.id.viewDividerItem)))

0 commit comments

Comments
 (0)