Skip to content

Commit e1f6090

Browse files
RazeemanRazeeman
committed
fix tests
1 parent b7ebb4f commit e1f6090

File tree

18 files changed

+72
-13
lines changed

18 files changed

+72
-13
lines changed

‎.github/workflows/github_actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
strategy:
3838
fail-fast: false
3939
matrix:
40-
api-level: [21, 28, 29]
40+
api-level: [21, 23, 29, 32, 34]
4141

4242
steps:
4343
- name: Check out code

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ class AddCategoryTest : BaseUiTest() {
149149

150150
// Check types saved
151151
longClickOnView(withText(name))
152+
Thread.sleep(1000)
152153
clickOnViewWithText(coreR.string.change_category_types_hint)
153154
checkViewIsDisplayed(withText(coreR.string.something_selected))
154155
checkViewIsDisplayed(withId(baseR.id.viewDividerItem))

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ class AddRecordTypeTest : BaseUiTest() {
176176
@Test
177177
fun addRecordTypeEmpty() {
178178
tryAction { clickOnViewWithText(coreR.string.running_records_add_type) }
179+
closeSoftKeyboard()
179180

180181
// Goal time is disabled
181182
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import com.example.util.simpletimetracker.utils.clickOnView
2323
import com.example.util.simpletimetracker.utils.clickOnViewWithText
2424
import com.example.util.simpletimetracker.utils.getMillis
2525
import com.example.util.simpletimetracker.utils.longClickOnView
26+
import com.example.util.simpletimetracker.utils.nestedScrollTo
2627
import com.example.util.simpletimetracker.utils.scrollRecyclerToView
2728
import dagger.hilt.android.testing.HiltAndroidTest
2829
import kotlinx.coroutines.runBlocking
@@ -91,6 +92,7 @@ class RecordActionsAdjustTest : BaseUiTest() {
9192
adjust(isStart = true, buttonText = "-30")
9293
adjust(isStart = false, buttonText = "+30")
9394
adjust(isStart = false, buttonText = "+30")
95+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
9496
clickOnViewWithText(coreR.string.change_record_actions_hint)
9597
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust))
9698
clickOnViewWithText(coreR.string.change_record_adjust)
@@ -176,6 +178,7 @@ class RecordActionsAdjustTest : BaseUiTest() {
176178
adjust(isStart = false, buttonText = "+1")
177179
clickOnViewWithText(coreR.string.change_record_type_field)
178180
clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name2))
181+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
179182
clickOnViewWithText(coreR.string.change_record_actions_hint)
180183
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust))
181184
clickOnViewWithText(coreR.string.change_record_adjust)
@@ -240,6 +243,7 @@ class RecordActionsAdjustTest : BaseUiTest() {
240243
allOf(isDescendantOfA(withId(baseR.id.viewRunningRecordItem)), withText(name2), isCompletelyDisplayed()),
241244
)
242245
clickOnViewWithText("-5")
246+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
243247
clickOnViewWithText(coreR.string.change_record_actions_hint)
244248
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust))
245249
clickOnViewWithText(coreR.string.change_record_adjust)
@@ -292,6 +296,7 @@ class RecordActionsAdjustTest : BaseUiTest() {
292296
adjust(isStart = true, buttonText = "-30")
293297
adjust(isStart = false, buttonText = "+30")
294298
adjust(isStart = false, buttonText = "+30")
299+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
295300
clickOnViewWithText(coreR.string.change_record_actions_hint)
296301
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust))
297302
clickOnViewWithText(coreR.string.change_record_adjust)
@@ -391,6 +396,7 @@ class RecordActionsAdjustTest : BaseUiTest() {
391396
}
392397

393398
// Deselect
399+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
394400
clickOnViewWithText(coreR.string.change_record_actions_hint)
395401

396402
scrollToView(name5)

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import com.example.util.simpletimetracker.utils.clickOnView
1717
import com.example.util.simpletimetracker.utils.clickOnViewWithId
1818
import com.example.util.simpletimetracker.utils.clickOnViewWithText
1919
import com.example.util.simpletimetracker.utils.longClickOnView
20+
import com.example.util.simpletimetracker.utils.nestedScrollTo
2021
import com.example.util.simpletimetracker.utils.recyclerItemCount
2122
import com.example.util.simpletimetracker.utils.scrollRecyclerToView
2223
import com.example.util.simpletimetracker.utils.tryAction
@@ -72,6 +73,7 @@ class RecordActionsContinueTest : BaseUiTest() {
7273

7374
// Continue
7475
clickOnViewWithText(fullName)
76+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
7577
clickOnViewWithText(coreR.string.change_record_actions_hint)
7678
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
7779
clickOnViewWithText(coreR.string.change_record_continue)
@@ -120,17 +122,20 @@ class RecordActionsContinueTest : BaseUiTest() {
120122
clickOnViewWithText(coreR.string.untracked_time_name)
121123

122124
// Continue untracked doesn't work
125+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
123126
clickOnViewWithText(coreR.string.change_record_actions_hint)
124127
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
125128
clickOnViewWithText(coreR.string.change_record_continue)
126129
clickOnViewWithId(com.google.android.material.R.id.snackbar_text)
130+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
127131
clickOnViewWithText(coreR.string.change_record_actions_hint)
128132

129133
// Select activity
130134
clickOnViewWithText(coreR.string.change_record_type_field)
131135
clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name))
132136

133137
// Continue
138+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
134139
clickOnViewWithText(coreR.string.change_record_actions_hint)
135140
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
136141
clickOnViewWithText(coreR.string.change_record_continue)
@@ -178,17 +183,20 @@ class RecordActionsContinueTest : BaseUiTest() {
178183
clickOnViewWithId(recordsR.id.btnRecordAdd)
179184

180185
// Continue untracked doesn't work
186+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
181187
clickOnViewWithText(coreR.string.change_record_actions_hint)
182188
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
183189
clickOnViewWithText(coreR.string.change_record_continue)
184190
clickOnViewWithId(com.google.android.material.R.id.snackbar_text)
191+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
185192
clickOnViewWithText(coreR.string.change_record_actions_hint)
186193

187194
// Select activity
188195
clickOnViewWithText(coreR.string.change_record_type_field)
189196
clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name))
190197

191198
// Continue
199+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
192200
clickOnViewWithText(coreR.string.change_record_actions_hint)
193201
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
194202
clickOnViewWithText(coreR.string.change_record_continue)
@@ -241,6 +249,7 @@ class RecordActionsContinueTest : BaseUiTest() {
241249
// Try continue record
242250
NavUtils.openRecordsScreen()
243251
clickOnView(allOf(withText(name), isCompletelyDisplayed()))
252+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
244253
clickOnViewWithText(coreR.string.change_record_actions_hint)
245254
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
246255
clickOnViewWithText(coreR.string.change_record_continue)
@@ -261,6 +270,7 @@ class RecordActionsContinueTest : BaseUiTest() {
261270
adjust("+30")
262271
adjust("+30")
263272
adjust("+5")
273+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
264274
clickOnViewWithText(coreR.string.change_record_actions_hint)
265275
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
266276
clickOnViewWithText(coreR.string.change_record_continue)
@@ -288,6 +298,7 @@ class RecordActionsContinueTest : BaseUiTest() {
288298
}
289299

290300
// Try continue record
301+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
291302
clickOnViewWithText(coreR.string.change_record_actions_hint)
292303
checkViewDoesNotExist(withText(coreR.string.change_record_continue))
293304
}
@@ -305,6 +316,7 @@ class RecordActionsContinueTest : BaseUiTest() {
305316
clickOnViewWithId(recordsR.id.btnRecordAdd)
306317
clickOnViewWithText(coreR.string.change_record_type_field)
307318
clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name))
319+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
308320
clickOnViewWithText(coreR.string.change_record_actions_hint)
309321
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
310322
clickOnViewWithText(coreR.string.change_record_continue)
@@ -337,6 +349,7 @@ class RecordActionsContinueTest : BaseUiTest() {
337349
clickOnViewWithId(recordsR.id.btnRecordAdd)
338350
clickOnViewWithText(coreR.string.change_record_type_field)
339351
clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name2))
352+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
340353
clickOnViewWithText(coreR.string.change_record_actions_hint)
341354
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
342355
clickOnViewWithText(coreR.string.change_record_continue)

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import com.example.util.simpletimetracker.utils.clickOnViewWithId
1818
import com.example.util.simpletimetracker.utils.clickOnViewWithText
1919
import com.example.util.simpletimetracker.utils.getMillis
2020
import com.example.util.simpletimetracker.utils.longClickOnView
21+
import com.example.util.simpletimetracker.utils.nestedScrollTo
2122
import com.example.util.simpletimetracker.utils.nthChildOf
2223
import com.example.util.simpletimetracker.utils.recyclerItemCount
2324
import com.example.util.simpletimetracker.utils.scrollRecyclerToView
@@ -57,6 +58,7 @@ class RecordActionsDuplicateTest : BaseUiTest() {
5758
allOf(withId(baseR.id.viewRunningRecordItem), hasDescendant(withText(name)), isCompletelyDisplayed()),
5859
)
5960
}
61+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
6062
clickOnViewWithText(coreR.string.change_record_actions_hint)
6163
checkViewDoesNotExist(withText(coreR.string.change_record_duplicate))
6264
pressBack()
@@ -67,6 +69,7 @@ class RecordActionsDuplicateTest : BaseUiTest() {
6769
clickOnView(
6870
allOf(withId(baseR.id.viewRecordItem), hasDescendant(withText(name)), isCompletelyDisplayed()),
6971
)
72+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
7073
clickOnViewWithText(coreR.string.change_record_actions_hint)
7174
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate))
7275
checkViewIsDisplayed(withText(coreR.string.change_record_duplicate))
@@ -115,6 +118,7 @@ class RecordActionsDuplicateTest : BaseUiTest() {
115118

116119
// Duplicate
117120
clickOnViewWithText(fullName)
121+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
118122
clickOnViewWithText(coreR.string.change_record_actions_hint)
119123
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate))
120124
clickOnViewWithText(coreR.string.change_record_duplicate)
@@ -170,10 +174,12 @@ class RecordActionsDuplicateTest : BaseUiTest() {
170174
clickOnViewWithText(coreR.string.untracked_time_name)
171175

172176
// Duplicate untracked doesn't work
177+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
173178
clickOnViewWithText(coreR.string.change_record_actions_hint)
174179
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate))
175180
clickOnViewWithText(coreR.string.change_record_duplicate)
176181
clickOnViewWithId(com.google.android.material.R.id.snackbar_text)
182+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
177183
clickOnViewWithText(coreR.string.change_record_actions_hint)
178184

179185
// Select activity
@@ -185,6 +191,7 @@ class RecordActionsDuplicateTest : BaseUiTest() {
185191
clickOnViewWithText(coreR.string.change_record_comment_field)
186192

187193
// Duplicate
194+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
188195
clickOnViewWithText(coreR.string.change_record_actions_hint)
189196
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate))
190197
clickOnViewWithText(coreR.string.change_record_duplicate)
@@ -232,6 +239,7 @@ class RecordActionsDuplicateTest : BaseUiTest() {
232239
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate))
233240
clickOnViewWithText(coreR.string.change_record_duplicate)
234241
clickOnViewWithId(com.google.android.material.R.id.snackbar_text)
242+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
235243
clickOnViewWithText(coreR.string.change_record_actions_hint)
236244

237245
// Select activity
@@ -243,6 +251,7 @@ class RecordActionsDuplicateTest : BaseUiTest() {
243251
clickOnViewWithText(coreR.string.change_record_comment_field)
244252

245253
// Duplicate
254+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
246255
clickOnViewWithText(coreR.string.change_record_actions_hint)
247256
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate))
248257
clickOnViewWithText(coreR.string.change_record_duplicate)

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

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

3+
import androidx.test.espresso.Espresso
4+
import androidx.test.espresso.Espresso.onView
35
import androidx.test.espresso.Espresso.pressBack
46
import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
57
import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
@@ -14,6 +16,7 @@ import com.example.util.simpletimetracker.utils.clickOnView
1416
import com.example.util.simpletimetracker.utils.clickOnViewWithId
1517
import com.example.util.simpletimetracker.utils.clickOnViewWithText
1618
import com.example.util.simpletimetracker.utils.longClickOnView
19+
import com.example.util.simpletimetracker.utils.nestedScrollTo
1720
import com.example.util.simpletimetracker.utils.scrollRecyclerToView
1821
import com.example.util.simpletimetracker.utils.tryAction
1922
import dagger.hilt.android.testing.HiltAndroidTest
@@ -55,8 +58,10 @@ class RecordActionsMergeTest : BaseUiTest() {
5558
allOf(withId(baseR.id.viewRunningRecordItem), hasDescendant(withText(name)), isCompletelyDisplayed()),
5659
)
5760
}
61+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
5862
clickOnViewWithText(coreR.string.change_record_actions_hint)
5963
checkViewDoesNotExist(withText(coreR.string.change_record_merge))
64+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
6065
clickOnViewWithText(coreR.string.change_record_actions_hint)
6166
pressBack()
6267

@@ -65,23 +70,29 @@ class RecordActionsMergeTest : BaseUiTest() {
6570
clickOnView(
6671
allOf(withId(baseR.id.viewRecordItem), hasDescendant(withText(name)), isCompletelyDisplayed()),
6772
)
73+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
6874
clickOnViewWithText(coreR.string.change_record_actions_hint)
6975
checkViewDoesNotExist(withText(coreR.string.change_record_merge))
76+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
7077
clickOnViewWithText(coreR.string.change_record_actions_hint)
7178
pressBack()
7279

7380
// New record - not shown
7481
clickOnViewWithId(recordsR.id.btnRecordAdd)
82+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
7583
clickOnViewWithText(coreR.string.change_record_actions_hint)
7684
checkViewDoesNotExist(withText(coreR.string.change_record_merge))
85+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
7786
clickOnViewWithText(coreR.string.change_record_actions_hint)
7887
pressBack()
7988

8089
// Untracked and have prev record - shown
8190
clickOnView(allOf(withText(coreR.string.untracked_time_name), isCompletelyDisplayed()))
91+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
8292
clickOnViewWithText(coreR.string.change_record_actions_hint)
8393
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_merge))
8494
checkViewIsDisplayed(withText(coreR.string.change_record_merge))
95+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
8596
clickOnViewWithText(coreR.string.change_record_actions_hint)
8697
pressBack()
8798
}
@@ -135,6 +146,7 @@ class RecordActionsMergeTest : BaseUiTest() {
135146
isCompletelyDisplayed(),
136147
),
137148
)
149+
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
138150
clickOnViewWithText(coreR.string.change_record_actions_hint)
139151
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_merge))
140152
clickOnViewWithText(coreR.string.change_record_merge)

0 commit comments

Comments
 (0)