Skip to content

Commit edf5ad7

Browse files
RazeemanRazeeman
committed
fix tests
1 parent 67b8dbe commit edf5ad7

File tree

21 files changed

+201
-60
lines changed

21 files changed

+201
-60
lines changed

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

+15-6
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class AddCategoryTest : BaseUiTest() {
128128
clickOnViewWithText(coreR.string.change_category_types_hint)
129129

130130
// Selecting goal time
131-
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)
131+
openGoals()
132132
clickOnView(
133133
allOf(
134134
isDescendantOfA(withId(R.id.layoutChangeRecordTypeGoalSession)),
@@ -141,7 +141,7 @@ class AddCategoryTest : BaseUiTest() {
141141
clickOnViewWithId(dialogsR.id.tvNumberKeyboard0)
142142
clickOnViewWithText(coreR.string.duration_dialog_save)
143143
checkViewIsDisplayed(withText("10$minuteString"))
144-
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)
144+
openGoals()
145145

146146
// Adding note
147147
onView(withId(changeCategoryR.id.etChangeRecordCategoryNote)).perform(nestedScrollTo())
@@ -164,9 +164,9 @@ class AddCategoryTest : BaseUiTest() {
164164

165165
// Check goals saved
166166
Thread.sleep(1000)
167-
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)
167+
openGoals()
168168
checkViewIsDisplayed(withText("10$minuteString"))
169-
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)
169+
openGoals()
170170

171171
// Check note saved
172172
onView(withId(changeCategoryR.id.etChangeRecordCategoryNote)).perform(nestedScrollTo())
@@ -180,15 +180,15 @@ class AddCategoryTest : BaseUiTest() {
180180
clickOnViewWithText(coreR.string.categories_add_category)
181181

182182
// Goal time is disabled
183-
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)
183+
openGoals()
184184
checkViewIsDisplayed(
185185
allOf(
186186
isDescendantOfA(withId(R.id.layoutChangeRecordTypeGoalSession)),
187187
withId(R.id.tvChangeRecordTypeGoalDurationValue),
188188
withText(coreR.string.change_record_type_goal_time_disabled),
189189
),
190190
)
191-
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)
191+
openGoals()
192192

193193
// Open activity chooser
194194
clickOnViewWithText(coreR.string.change_category_types_hint)
@@ -264,4 +264,13 @@ class AddCategoryTest : BaseUiTest() {
264264

265265
private fun checkPreviewUpdated(matcher: Matcher<View>) =
266266
checkViewIsDisplayed(allOf(withId(changeCategoryR.id.previewChangeCategory), matcher))
267+
268+
private fun openGoals() {
269+
clickOnView(
270+
allOf(
271+
withId(changeCategoryR.id.tvChangeCategoryGoalHint),
272+
withText(coreR.string.change_record_type_goal_time_hint),
273+
),
274+
)
275+
}
267276
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ class AddRecordTest : BaseUiTest() {
331331
closeSoftKeyboard()
332332
checkViewDoesNotExist(withText(coreR.string.change_record_last_comments_hint))
333333
checkViewDoesNotExist(withText(coreR.string.change_record_favourite_comments_hint))
334-
checkViewIsNotDisplayed(withId(changeRecordR.id.btnChangeRecordFavouriteComment))
334+
checkViewIsDisplayed(withId(changeRecordR.id.btnChangeRecordFavouriteComment))
335335

336336
// Add favourite
337337
typeTextIntoView(changeRecordR.id.etChangeRecordCommentField, comment1)
@@ -392,7 +392,7 @@ class AddRecordTest : BaseUiTest() {
392392

393393
checkViewIsDisplayed(withId(changeRecordR.id.etChangeRecordCommentField))
394394

395-
typeTextIntoView(changeRecordR.id.etChangeRecordCommentField, "comment")
395+
typeTextIntoView(changeRecordR.id.etChangeRecordCommentField, "comm")
396396
tryAction {
397397
checkViewIsDisplayed(allOf(withId(changeRecordR.id.tvChangeRecordItemComment), withText(comment1)))
398398
}

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

+13-4
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class AddRecordTypeTest : BaseUiTest() {
145145
clickOnViewWithText(coreR.string.category_hint)
146146

147147
// Selecting goal time
148-
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)
148+
openGoals()
149149
clickOnView(
150150
allOf(
151151
isDescendantOfA(withId(changeRecordTypeR.id.layoutChangeRecordTypeGoalSession)),
@@ -158,7 +158,7 @@ class AddRecordTypeTest : BaseUiTest() {
158158
clickOnViewWithId(dialogsR.id.tvNumberKeyboard0)
159159
clickOnViewWithText(coreR.string.duration_dialog_save)
160160
checkViewIsDisplayed(withText("10$minuteString"))
161-
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)
161+
openGoals()
162162

163163
// Adding note
164164
onView(withId(changeRecordTypeR.id.etChangeRecordTypeNote)).perform(nestedScrollTo())
@@ -189,15 +189,15 @@ class AddRecordTypeTest : BaseUiTest() {
189189
closeSoftKeyboard()
190190

191191
// Goal time is disabled
192-
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)
192+
openGoals()
193193
checkViewIsDisplayed(
194194
allOf(
195195
isDescendantOfA(withId(changeRecordTypeR.id.layoutChangeRecordTypeGoalSession)),
196196
withId(changeRecordTypeR.id.tvChangeRecordTypeGoalDurationValue),
197197
withText(coreR.string.change_record_type_goal_time_disabled),
198198
),
199199
)
200-
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)
200+
openGoals()
201201

202202
// Open category chooser
203203
clickOnViewWithText(coreR.string.category_hint)
@@ -229,4 +229,13 @@ class AddRecordTypeTest : BaseUiTest() {
229229

230230
private fun checkPreviewUpdated(matcher: Matcher<View>) =
231231
checkViewIsDisplayed(allOf(withId(changeRecordTypeR.id.previewChangeRecordType), matcher))
232+
233+
private fun openGoals() {
234+
clickOnView(
235+
allOf(
236+
withId(changeRecordTypeR.id.tvChangeRecordTypeGoalHint),
237+
withText(coreR.string.change_record_type_goal_time_hint),
238+
),
239+
)
240+
}
232241
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class ChangeRecordTest : BaseUiTest() {
9898
checkViewIsDisplayed(withId(changeRecordR.id.btnChangeRecordStatistics))
9999
checkViewIsNotDisplayed(withId(changeRecordR.id.rvChangeRecordType))
100100
checkViewIsNotDisplayed(withId(changeRecordR.id.rvChangeRecordCategories))
101-
checkViewIsNotDisplayed(allOf(withId(changeRecordR.id.etChangeRecordCommentField), withText(comment)))
101+
checkViewIsNotDisplayed(withId(changeRecordR.id.rvChangeRecordComments))
102102
checkViewIsDisplayed(allOf(withId(changeRecordR.id.tvChangeRecordTimeStartedDate), withText(timeStarted.date)))
103103
checkViewIsDisplayed(allOf(withId(changeRecordR.id.tvChangeRecordTimeStartedTime), withText(timeStarted.time)))
104104
checkViewIsDisplayed(allOf(withId(changeRecordR.id.tvChangeRecordTimeEndedDate), withText(timeEnded.date)))

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

+11-2
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class ChangeRecordTypeTest : BaseUiTest() {
163163
clickOnRecyclerItem(changeRecordTypeR.id.rvIconSelection, withTag(lastIcon))
164164
clickOnViewWithId(changeRecordTypeR.id.fieldChangeRecordTypeIcon)
165165

166-
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)
166+
openGoals()
167167
clickOnView(
168168
allOf(
169169
isDescendantOfA(withId(changeRecordTypeR.id.layoutChangeRecordTypeGoalSession)),
@@ -176,7 +176,7 @@ class ChangeRecordTypeTest : BaseUiTest() {
176176
clickOnViewWithId(dialogsR.id.tvNumberKeyboard0)
177177
clickOnViewWithText(coreR.string.duration_dialog_save)
178178
tryAction { checkViewIsDisplayed(withText("10$minuteString")) }
179-
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)
179+
openGoals()
180180

181181
clickOnViewWithText(coreR.string.change_record_type_save)
182182

@@ -269,4 +269,13 @@ class ChangeRecordTypeTest : BaseUiTest() {
269269

270270
private fun checkPreviewUpdated(matcher: Matcher<View>) =
271271
checkViewIsDisplayed(allOf(withId(changeRecordTypeR.id.previewChangeRecordType), matcher))
272+
273+
private fun openGoals() {
274+
clickOnView(
275+
allOf(
276+
withId(changeRecordTypeR.id.tvChangeRecordTypeGoalHint),
277+
withText(coreR.string.change_record_type_goal_time_hint),
278+
),
279+
)
280+
}
272281
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class ChangeRunningRecordTest : BaseUiTest() {
107107
checkViewIsNotDisplayed(withId(changeRecordR.id.rvChangeRecordCategories))
108108
checkViewIsDisplayed(withId(changeRecordR.id.containerChangeRecordTimeStartedAdjust))
109109
checkViewIsNotDisplayed(withId(changeRecordR.id.containerChangeRecordTimeEndedAdjust))
110-
checkViewIsNotDisplayed(allOf(withId(changeRecordR.id.etChangeRecordCommentField), withText("")))
110+
checkViewIsNotDisplayed(withId(changeRecordR.id.rvChangeRecordComments))
111111
checkViewIsDisplayed(allOf(withId(changeRecordR.id.tvChangeRecordTimeStartedDate), withText(timeStarted.date)))
112112
checkViewIsDisplayed(allOf(withId(changeRecordR.id.tvChangeRecordTimeStartedTime), withText(timeStarted.time)))
113113

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

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import com.example.util.simpletimetracker.utils.BaseUiTest
2828
import com.example.util.simpletimetracker.utils.NavUtils
2929
import com.example.util.simpletimetracker.utils.checkViewIsDisplayed
3030
import com.example.util.simpletimetracker.utils.clickOnView
31+
import com.example.util.simpletimetracker.utils.clickOnViewWithId
3132
import com.example.util.simpletimetracker.utils.clickOnViewWithText
3233
import com.example.util.simpletimetracker.utils.longClickOnView
3334
import com.example.util.simpletimetracker.utils.nestedScrollTo
@@ -113,6 +114,7 @@ class GoalsTabTest : BaseUiTest() {
113114
clickOnViewWithText(coreR.string.change_record_type_goal_time_hint)
114115
goalsToAdd.forEach { goal ->
115116
NavUtils.addGoalToActivity(goal)
117+
runCatching { clickOnViewWithId(com.google.android.material.R.id.snackbar_text) }
116118
checkGoal(goal)
117119
}
118120
clickOnViewWithText(coreR.string.change_record_type_save)

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

+20-5
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ class RecordActionsAdjustTest : BaseUiTest() {
9494
adjust(isStart = false, buttonText = "+30")
9595
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
9696
clickOnViewWithText(coreR.string.change_record_actions_hint)
97-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust))
97+
scrollRecyclerToView(
98+
changeRecordR.id.rvChangeRecordAction,
99+
hasDescendant(withText(coreR.string.change_record_adjust)),
100+
)
98101
clickOnViewWithText(coreR.string.change_record_adjust)
99102

100103
// Check records
@@ -180,7 +183,10 @@ class RecordActionsAdjustTest : BaseUiTest() {
180183
clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name2))
181184
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
182185
clickOnViewWithText(coreR.string.change_record_actions_hint)
183-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust))
186+
scrollRecyclerToView(
187+
changeRecordR.id.rvChangeRecordAction,
188+
hasDescendant(withText(coreR.string.change_record_adjust)),
189+
)
184190
clickOnViewWithText(coreR.string.change_record_adjust)
185191

186192
// Check records
@@ -245,7 +251,10 @@ class RecordActionsAdjustTest : BaseUiTest() {
245251
clickOnViewWithText("-5")
246252
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
247253
clickOnViewWithText(coreR.string.change_record_actions_hint)
248-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust))
254+
scrollRecyclerToView(
255+
changeRecordR.id.rvChangeRecordAction,
256+
hasDescendant(withText(coreR.string.change_record_adjust)),
257+
)
249258
clickOnViewWithText(coreR.string.change_record_adjust)
250259

251260
// Check records
@@ -298,7 +307,10 @@ class RecordActionsAdjustTest : BaseUiTest() {
298307
adjust(isStart = false, buttonText = "+30")
299308
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
300309
clickOnViewWithText(coreR.string.change_record_actions_hint)
301-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust))
310+
scrollRecyclerToView(
311+
changeRecordR.id.rvChangeRecordAction,
312+
hasDescendant(withText(coreR.string.change_record_adjust)),
313+
)
302314
clickOnViewWithText(coreR.string.change_record_adjust)
303315

304316
// Check records
@@ -415,7 +427,10 @@ class RecordActionsAdjustTest : BaseUiTest() {
415427
onPreviewCheck(name1).perform(click())
416428
onPreviewCheck(name1).check(matches(isNotChecked()))
417429

418-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust))
430+
scrollRecyclerToView(
431+
changeRecordR.id.rvChangeRecordAction,
432+
hasDescendant(withText(coreR.string.change_record_adjust)),
433+
)
419434
clickOnViewWithText(coreR.string.change_record_adjust)
420435

421436
// Check records

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

+40-10
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ class RecordActionsContinueTest : BaseUiTest() {
7575
clickOnViewWithText(fullName)
7676
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
7777
clickOnViewWithText(coreR.string.change_record_actions_hint)
78-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
78+
scrollRecyclerToView(
79+
changeRecordR.id.rvChangeRecordAction,
80+
hasDescendant(withText(coreR.string.change_record_continue)),
81+
)
7982
clickOnViewWithText(coreR.string.change_record_continue)
8083

8184
// Check no record
@@ -124,7 +127,10 @@ class RecordActionsContinueTest : BaseUiTest() {
124127
// Continue untracked doesn't work
125128
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
126129
clickOnViewWithText(coreR.string.change_record_actions_hint)
127-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
130+
scrollRecyclerToView(
131+
changeRecordR.id.rvChangeRecordAction,
132+
hasDescendant(withText(coreR.string.change_record_continue)),
133+
)
128134
clickOnViewWithText(coreR.string.change_record_continue)
129135
clickOnViewWithId(com.google.android.material.R.id.snackbar_text)
130136
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
@@ -137,7 +143,10 @@ class RecordActionsContinueTest : BaseUiTest() {
137143
// Continue
138144
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
139145
clickOnViewWithText(coreR.string.change_record_actions_hint)
140-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
146+
scrollRecyclerToView(
147+
changeRecordR.id.rvChangeRecordAction,
148+
hasDescendant(withText(coreR.string.change_record_continue)),
149+
)
141150
clickOnViewWithText(coreR.string.change_record_continue)
142151

143152
checkViewIsDisplayed(
@@ -185,7 +194,10 @@ class RecordActionsContinueTest : BaseUiTest() {
185194
// Continue untracked doesn't work
186195
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
187196
clickOnViewWithText(coreR.string.change_record_actions_hint)
188-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
197+
scrollRecyclerToView(
198+
changeRecordR.id.rvChangeRecordAction,
199+
hasDescendant(withText(coreR.string.change_record_continue)),
200+
)
189201
clickOnViewWithText(coreR.string.change_record_continue)
190202
clickOnViewWithId(com.google.android.material.R.id.snackbar_text)
191203
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
@@ -198,7 +210,10 @@ class RecordActionsContinueTest : BaseUiTest() {
198210
// Continue
199211
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
200212
clickOnViewWithText(coreR.string.change_record_actions_hint)
201-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
213+
scrollRecyclerToView(
214+
changeRecordR.id.rvChangeRecordAction,
215+
hasDescendant(withText(coreR.string.change_record_continue)),
216+
)
202217
clickOnViewWithText(coreR.string.change_record_continue)
203218

204219
checkViewDoesNotExist(
@@ -251,7 +266,10 @@ class RecordActionsContinueTest : BaseUiTest() {
251266
clickOnView(allOf(withText(name), isCompletelyDisplayed()))
252267
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
253268
clickOnViewWithText(coreR.string.change_record_actions_hint)
254-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
269+
scrollRecyclerToView(
270+
changeRecordR.id.rvChangeRecordAction,
271+
hasDescendant(withText(coreR.string.change_record_continue)),
272+
)
255273
clickOnViewWithText(coreR.string.change_record_continue)
256274
// Snackbar is in the way of Add button
257275
clickOnViewWithId(com.google.android.material.R.id.snackbar_text)
@@ -272,7 +290,10 @@ class RecordActionsContinueTest : BaseUiTest() {
272290
adjust("+5")
273291
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
274292
clickOnViewWithText(coreR.string.change_record_actions_hint)
275-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
293+
scrollRecyclerToView(
294+
changeRecordR.id.rvChangeRecordAction,
295+
hasDescendant(withText(coreR.string.change_record_continue)),
296+
)
276297
clickOnViewWithText(coreR.string.change_record_continue)
277298

278299
// Still on edit screen
@@ -318,7 +339,10 @@ class RecordActionsContinueTest : BaseUiTest() {
318339
clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name))
319340
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
320341
clickOnViewWithText(coreR.string.change_record_actions_hint)
321-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
342+
scrollRecyclerToView(
343+
changeRecordR.id.rvChangeRecordAction,
344+
hasDescendant(withText(coreR.string.change_record_continue)),
345+
)
322346
clickOnViewWithText(coreR.string.change_record_continue)
323347

324348
// Running record stopped
@@ -351,7 +375,10 @@ class RecordActionsContinueTest : BaseUiTest() {
351375
clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name2))
352376
onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo())
353377
clickOnViewWithText(coreR.string.change_record_actions_hint)
354-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
378+
scrollRecyclerToView(
379+
changeRecordR.id.rvChangeRecordAction,
380+
hasDescendant(withText(coreR.string.change_record_continue)),
381+
)
355382
clickOnViewWithText(coreR.string.change_record_continue)
356383

357384
// Running record stopped
@@ -391,7 +418,10 @@ class RecordActionsContinueTest : BaseUiTest() {
391418
NavUtils.openRecordsScreen()
392419
clickOnView(allOf(withText(name), isCompletelyDisplayed()))
393420
clickOnViewWithText(coreR.string.change_record_actions_hint)
394-
scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue))
421+
scrollRecyclerToView(
422+
changeRecordR.id.rvChangeRecordAction,
423+
hasDescendant(withText(coreR.string.change_record_continue)),
424+
)
395425
clickOnViewWithText(coreR.string.change_record_continue)
396426

397427
// New running record

0 commit comments

Comments
 (0)