Skip to content

Commit 34ddfe9

Browse files
RazeemanRazeeman
committed
fix tests
1 parent 5550b02 commit 34ddfe9

27 files changed

Lines changed: 211 additions & 215 deletions

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ class AddRecordTagTest : BaseUiTest() {
435435
// Check items
436436
NavUtils.openSettingsScreen()
437437
NavUtils.openCategoriesScreen()
438-
onView(withId(categoriesR.id.rvCategoriesList)).check(recyclerItemCount(7))
438+
onView(withId(categoriesR.id.rvCategoriesList)).check(recyclerItemCount(8))
439439

440440
// Add another tag
441441
clickOnViewWithText(coreR.string.categories_add_record_tag)
@@ -446,7 +446,7 @@ class AddRecordTagTest : BaseUiTest() {
446446
clickOnRecyclerItem(changeRecordTagR.id.rvChangeRecordTagType, withText(typeName))
447447
clickOnViewWithText(coreR.string.change_record_type_save)
448448

449-
onView(withId(categoriesR.id.rvCategoriesList)).check(recyclerItemCount(8))
449+
onView(withId(categoriesR.id.rvCategoriesList)).check(recyclerItemCount(9))
450450

451451
// Add another general tag
452452
clickOnViewWithText(coreR.string.categories_add_record_tag)
@@ -456,7 +456,7 @@ class AddRecordTagTest : BaseUiTest() {
456456
closeSoftKeyboard()
457457
clickOnViewWithText(coreR.string.change_record_type_save)
458458

459-
onView(withId(categoriesR.id.rvCategoriesList)).check(recyclerItemCount(9))
459+
onView(withId(categoriesR.id.rvCategoriesList)).check(recyclerItemCount(10))
460460
}
461461

462462
@Test

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import com.example.util.simpletimetracker.utils.clickOnRecyclerItem
2222
import com.example.util.simpletimetracker.utils.clickOnView
2323
import com.example.util.simpletimetracker.utils.clickOnViewWithId
2424
import com.example.util.simpletimetracker.utils.clickOnViewWithText
25+
import com.example.util.simpletimetracker.utils.longClickOnViewWithId
2526
import com.example.util.simpletimetracker.utils.tryAction
2627
import com.example.util.simpletimetracker.utils.typeTextIntoView
2728
import com.example.util.simpletimetracker.utils.withCardColor
@@ -58,7 +59,7 @@ class AddRecordTest : BaseUiTest() {
5859

5960
// Add record
6061
NavUtils.openRecordsScreen()
61-
clickOnViewWithId(recordsR.id.btnRecordAdd)
62+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
6263

6364
// View is set up
6465
checkViewIsNotDisplayed(withId(changeRecordR.id.btnChangeRecordDelete))
@@ -206,7 +207,7 @@ class AddRecordTest : BaseUiTest() {
206207
@Test
207208
fun addRecordTypesEmpty() {
208209
NavUtils.openRecordsScreen()
209-
clickOnViewWithId(recordsR.id.btnRecordAdd)
210+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
210211

211212
// Open activity chooser
212213
clickOnViewWithText(coreR.string.change_record_type_field)
@@ -219,7 +220,7 @@ class AddRecordTest : BaseUiTest() {
219220
testUtils.addActivity(name)
220221

221222
NavUtils.openRecordsScreen()
222-
clickOnViewWithId(recordsR.id.btnRecordAdd)
223+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
223224

224225
// Select activity
225226
clickOnViewWithText(coreR.string.change_record_type_field)
@@ -250,7 +251,7 @@ class AddRecordTest : BaseUiTest() {
250251

251252
// Check comments
252253
NavUtils.openRecordsScreen()
253-
clickOnViewWithId(recordsR.id.btnRecordAdd)
254+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
254255

255256
// No last comments
256257
clickOnViewWithText(coreR.string.change_record_comment_field)
@@ -324,7 +325,7 @@ class AddRecordTest : BaseUiTest() {
324325

325326
// Check
326327
NavUtils.openRecordsScreen()
327-
clickOnViewWithId(recordsR.id.btnRecordAdd)
328+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
328329

329330
// No favourites
330331
clickOnViewWithText(coreR.string.change_record_comment_field)
@@ -386,7 +387,7 @@ class AddRecordTest : BaseUiTest() {
386387

387388
// Check
388389
NavUtils.openRecordsScreen()
389-
clickOnViewWithId(recordsR.id.btnRecordAdd)
390+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
390391
clickOnViewWithText(coreR.string.change_record_comment_field)
391392
closeSoftKeyboard()
392393

@@ -413,7 +414,7 @@ class AddRecordTest : BaseUiTest() {
413414
fun addRecordAdjustTime() {
414415
// Add record
415416
NavUtils.openRecordsScreen()
416-
clickOnViewWithId(recordsR.id.btnRecordAdd)
417+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
417418

418419
// Setup
419420
val hourStarted = 15
@@ -555,7 +556,7 @@ class AddRecordTest : BaseUiTest() {
555556

556557
// Switch start and end
557558
NavUtils.openRecordsScreen()
558-
clickOnViewWithId(recordsR.id.btnRecordAdd)
559+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
559560
checkField(isStart = true, isDuration = false)
560561
checkField(isStart = false, isDuration = false)
561562

@@ -588,7 +589,7 @@ class AddRecordTest : BaseUiTest() {
588589
fun adjustDuration() {
589590
// Add record
590591
NavUtils.openRecordsScreen()
591-
clickOnViewWithId(recordsR.id.btnRecordAdd)
592+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
592593

593594
// Setup
594595
val hourStarted = 15

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ import com.example.util.simpletimetracker.utils.checkViewDoesNotExist
1313
import com.example.util.simpletimetracker.utils.checkViewIsDisplayed
1414
import com.example.util.simpletimetracker.utils.clickOnView
1515
import com.example.util.simpletimetracker.utils.clickOnViewWithId
16-
import com.example.util.simpletimetracker.utils.clickOnViewWithIdOnPager
1716
import com.example.util.simpletimetracker.utils.clickOnViewWithText
1817
import com.example.util.simpletimetracker.utils.longClickOnView
18+
import com.example.util.simpletimetracker.utils.longClickOnViewWithId
19+
import com.example.util.simpletimetracker.utils.longClickOnViewWithIdOnPager
1920
import com.example.util.simpletimetracker.utils.tryAction
2021
import dagger.hilt.android.testing.HiltAndroidTest
2122
import org.hamcrest.CoreMatchers.allOf
@@ -56,7 +57,7 @@ class ArchiveTest : BaseUiTest() {
5657

5758
// Not shown on records
5859
NavUtils.openRecordsScreen()
59-
clickOnViewWithId(recordsR.id.btnRecordAdd)
60+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
6061
clickOnViewWithText(coreR.string.change_record_type_field)
6162
checkTypeVisible(name1)
6263
checkTypeNotVisible(name2)
@@ -65,14 +66,14 @@ class ArchiveTest : BaseUiTest() {
6566

6667
// Still shown in stat filter
6768
NavUtils.openStatisticsScreen()
68-
clickOnViewWithIdOnPager(statisticsR.id.btnStatisticsChartFilter)
69+
longClickOnViewWithIdOnPager(statisticsR.id.btnStatisticsContainerOptions)
6970
tryAction { checkTypeVisible(name1) }
7071
checkTypeVisible(name2)
7172
pressBack()
7273

7374
// Still shown in stat detail filter
7475
clickOnView(allOf(withText(name1), isCompletelyDisplayed()))
75-
clickOnViewWithId(statisticsDetailR.id.cardStatisticsDetailFilter)
76+
longClickOnViewWithId(statisticsDetailR.id.btnStatisticsDetailOptions)
7677
tryAction { checkTypeVisible(name1) }
7778
checkTypeVisible(name2)
7879
pressBack()
@@ -174,7 +175,7 @@ class ArchiveTest : BaseUiTest() {
174175

175176
// Not shown on records
176177
NavUtils.openRecordsScreen()
177-
clickOnViewWithId(recordsR.id.btnRecordAdd)
178+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
178179
clickOnViewWithText(coreR.string.change_record_type_field)
179180
clickOnView(allOf(withId(R.id.viewRecordTypeItem), hasDescendant(withText(name1))))
180181
tryAction { checkTagVisible(tag1) }
@@ -187,7 +188,7 @@ class ArchiveTest : BaseUiTest() {
187188
// Still shown in stat detail filter
188189
NavUtils.openStatisticsScreen()
189190
clickOnView(allOf(withText(name1), isCompletelyDisplayed()))
190-
clickOnViewWithId(statisticsDetailR.id.cardStatisticsDetailFilter)
191+
longClickOnViewWithId(statisticsDetailR.id.btnStatisticsDetailOptions)
191192
clickOnViewWithText(coreR.string.records_filter_select_tags)
192193
checkTagVisible(tag1)
193194
checkTagVisible(tag2)

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import com.example.util.simpletimetracker.utils.clickOnView
2222
import com.example.util.simpletimetracker.utils.clickOnViewWithId
2323
import com.example.util.simpletimetracker.utils.clickOnViewWithText
2424
import com.example.util.simpletimetracker.utils.longClickOnView
25+
import com.example.util.simpletimetracker.utils.longClickOnViewWithId
2526
import com.example.util.simpletimetracker.utils.tryAction
2627
import com.example.util.simpletimetracker.utils.typeTextIntoView
2728
import com.example.util.simpletimetracker.utils.withCardColor
@@ -63,7 +64,7 @@ class ChangeRecordTest : BaseUiTest() {
6364

6465
// Add record
6566
NavUtils.openRecordsScreen()
66-
clickOnViewWithId(recordsR.id.btnRecordAdd)
67+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
6768

6869
val currentTime = System.currentTimeMillis()
6970
var timeStartedTimestamp = currentTime - 60 * 60 * 1000
@@ -226,7 +227,7 @@ class ChangeRecordTest : BaseUiTest() {
226227

227228
// Add record
228229
NavUtils.openRecordsScreen()
229-
clickOnViewWithId(recordsR.id.btnRecordAdd)
230+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
230231
clickOnViewWithText(coreR.string.change_record_type_field)
231232
clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name))
232233
clickOnViewWithText(coreR.string.change_record_save)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import com.example.util.simpletimetracker.utils.checkViewIsNotDisplayed
2222
import com.example.util.simpletimetracker.utils.clickLocation
2323
import com.example.util.simpletimetracker.utils.clickOnRecyclerItem
2424
import com.example.util.simpletimetracker.utils.clickOnViewWithId
25-
import com.example.util.simpletimetracker.utils.clickOnViewWithIdOnPager
2625
import com.example.util.simpletimetracker.utils.clickOnViewWithText
2726
import com.example.util.simpletimetracker.utils.longClickOnView
27+
import com.example.util.simpletimetracker.utils.longClickOnViewWithIdOnPager
2828
import com.example.util.simpletimetracker.utils.scrollRecyclerToView
2929
import com.example.util.simpletimetracker.utils.tryAction
3030
import com.example.util.simpletimetracker.utils.typeTextIntoView
@@ -426,7 +426,7 @@ class CustomColorTest : BaseUiTest() {
426426
testUtils.addActivity(name = name, categories = listOf(categoryName))
427427
testUtils.addRecord(name)
428428
NavUtils.openStatisticsScreen()
429-
clickOnViewWithIdOnPager(statisticsR.id.btnStatisticsChartFilter)
429+
longClickOnViewWithIdOnPager(statisticsR.id.btnStatisticsContainerOptions)
430430
clickOnViewWithText(coreR.string.category_hint)
431431
pressBack()
432432
Thread.sleep(1000)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import com.example.util.simpletimetracker.utils.NavUtils
3030
import com.example.util.simpletimetracker.utils.checkViewIsDisplayed
3131
import com.example.util.simpletimetracker.utils.clickOnView
3232
import com.example.util.simpletimetracker.utils.clickOnViewWithId
33-
import com.example.util.simpletimetracker.utils.clickOnViewWithIdOnPager
3433
import com.example.util.simpletimetracker.utils.clickOnViewWithText
34+
import com.example.util.simpletimetracker.utils.longClickOnViewWithIdOnPager
3535
import com.example.util.simpletimetracker.utils.scrollRecyclerInPagerToView
3636
import com.example.util.simpletimetracker.utils.scrollToBottom
3737
import com.example.util.simpletimetracker.utils.tryAction
@@ -368,7 +368,7 @@ class GoalsStatisticsTest : BaseUiTest() {
368368
addRecords(testUtils, otherGoals.second())
369369

370370
NavUtils.openStatisticsScreen()
371-
clickOnViewWithIdOnPager(statisticsR.id.btnStatisticsChartFilter)
371+
longClickOnViewWithIdOnPager(statisticsR.id.btnStatisticsContainerOptions)
372372
clickOnViewWithText(coreR.string.category_hint)
373373
pressBack()
374374

@@ -492,7 +492,7 @@ class GoalsStatisticsTest : BaseUiTest() {
492492
NavUtils.openStatisticsScreen()
493493
clickOnViewWithId(statisticsR.id.btnStatisticsContainerToday)
494494
clickOnViewWithText(coreR.string.range_week)
495-
clickOnViewWithIdOnPager(statisticsR.id.btnStatisticsChartFilter)
495+
longClickOnViewWithIdOnPager(statisticsR.id.btnStatisticsContainerOptions)
496496
clickOnViewWithText(coreR.string.category_hint)
497497
pressBack()
498498

@@ -616,7 +616,7 @@ class GoalsStatisticsTest : BaseUiTest() {
616616
NavUtils.openStatisticsScreen()
617617
clickOnViewWithId(statisticsR.id.btnStatisticsContainerToday)
618618
clickOnViewWithText(coreR.string.range_month)
619-
clickOnViewWithIdOnPager(statisticsR.id.btnStatisticsChartFilter)
619+
longClickOnViewWithIdOnPager(statisticsR.id.btnStatisticsContainerOptions)
620620
clickOnViewWithText(coreR.string.category_hint)
621621
pressBack()
622622

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,12 @@ object GoalsTestUtils {
147147
}
148148

149149
fun checkStatisticsMark(typeName: String, isVisible: Boolean) {
150-
allOf(
151-
isDescendantOfA(withId(baseR.id.viewStatisticsGoalItem)),
152-
hasSibling(withText(typeName)),
153-
withId(R.id.ivStatisticsGoalItemCheck),
154-
).let {
155-
if (isVisible) checkViewIsDisplayed(it) else checkViewIsNotDisplayed(it)
156-
}
150+
allOf(withId(R.id.viewStatisticsGoalItem), hasDescendant(withText(typeName)), isCompletelyDisplayed())
151+
.let(::checkViewIsDisplayed)
152+
allOf(getStatisticsMatcher(typeName), withId(R.id.ivGoalCheckmarkItemCheckOutline))
153+
.let(::checkViewIsDisplayed)
154+
allOf(getStatisticsMatcher(typeName), withId(R.id.ivGoalCheckmarkItemCheck))
155+
.let { if (isVisible) checkViewIsDisplayed(it) else checkViewIsNotDisplayed(it) }
157156
}
158157

159158
fun checkTypeMark(typeName: String, isVisible: Boolean) {
@@ -210,6 +209,15 @@ object GoalsTestUtils {
210209
)
211210
}
212211

212+
private fun getStatisticsMatcher(typeName: String): Matcher<View> {
213+
return isDescendantOfA(
214+
allOf(
215+
withId(R.id.viewStatisticsGoalItem),
216+
hasDescendant(withText(typeName)),
217+
),
218+
)
219+
}
220+
213221
private fun getDurationGoal(
214222
range: RecordTypeGoal.Range,
215223
duration: Long,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import com.example.util.simpletimetracker.utils.checkViewDoesNotExist
1515
import com.example.util.simpletimetracker.utils.checkViewIsDisplayed
1616
import com.example.util.simpletimetracker.utils.clickOnView
1717
import com.example.util.simpletimetracker.utils.clickOnViewWithId
18-
import com.example.util.simpletimetracker.utils.clickOnViewWithIdOnPager
1918
import com.example.util.simpletimetracker.utils.clickOnViewWithText
2019
import com.example.util.simpletimetracker.utils.longClickOnViewWithId
20+
import com.example.util.simpletimetracker.utils.longClickOnViewWithIdOnPager
2121
import com.example.util.simpletimetracker.utils.tryAction
2222
import com.example.util.simpletimetracker.utils.typeTextIntoView
2323
import dagger.hilt.android.testing.HiltAndroidTest
@@ -147,7 +147,7 @@ class MainScreenEmptyTest : BaseUiTest() {
147147
checkRanges()
148148

149149
// Empty category statistics
150-
clickOnViewWithIdOnPager(statisticsR.id.btnStatisticsEmptyFilter)
150+
longClickOnViewWithIdOnPager(statisticsR.id.btnStatisticsContainerOptions)
151151
clickOnViewWithText(coreR.string.category_hint)
152152
pressBack()
153153
longClickOnViewWithId(statisticsR.id.btnStatisticsContainerToday)
@@ -190,7 +190,7 @@ class MainScreenEmptyTest : BaseUiTest() {
190190
checkRanges()
191191

192192
// Empty tag statistics
193-
clickOnViewWithIdOnPager(statisticsR.id.btnStatisticsEmptyFilter)
193+
longClickOnViewWithIdOnPager(statisticsR.id.btnStatisticsContainerOptions)
194194
clickOnViewWithText(coreR.string.record_tag_hint_short)
195195
pressBack()
196196
longClickOnViewWithId(statisticsR.id.btnStatisticsContainerToday)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import com.example.util.simpletimetracker.utils.NavUtils
1212
import com.example.util.simpletimetracker.utils.clickOnRecyclerItem
1313
import com.example.util.simpletimetracker.utils.clickOnView
1414
import com.example.util.simpletimetracker.utils.clickOnViewWithId
15-
import com.example.util.simpletimetracker.utils.clickOnViewWithIdOnPager
1615
import com.example.util.simpletimetracker.utils.clickOnViewWithText
1716
import com.example.util.simpletimetracker.utils.longClickOnViewWithId
17+
import com.example.util.simpletimetracker.utils.longClickOnViewWithIdOnPager
1818
import com.example.util.simpletimetracker.utils.tryAction
1919
import com.example.util.simpletimetracker.utils.typeTextIntoView
2020
import dagger.hilt.android.testing.HiltAndroidTest
@@ -59,10 +59,10 @@ class MainScreenTest : BaseUiTest() {
5959
clickOnView(allOf(withText(name), isCompletelyDisplayed()))
6060
pressBack()
6161

62-
clickOnViewWithId(recordsR.id.btnRecordAdd)
62+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
6363
pressBack()
6464

65-
clickOnViewWithId(recordsR.id.btnRecordAdd)
65+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
6666
clickOnViewWithText(coreR.string.change_record_type_field)
6767
clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name))
6868
clickOnViewWithText(coreR.string.change_record_save)
@@ -73,7 +73,7 @@ class MainScreenTest : BaseUiTest() {
7373

7474
// Statistics
7575
NavUtils.openStatisticsScreen()
76-
clickOnViewWithIdOnPager(statisticsR.id.btnStatisticsChartFilter)
76+
longClickOnViewWithIdOnPager(statisticsR.id.btnStatisticsContainerOptions)
7777
pressBack()
7878
clickOnViewWithId(statisticsR.id.btnStatisticsContainerPrevious)
7979
longClickOnViewWithId(statisticsR.id.btnStatisticsContainerToday)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.example.util.simpletimetracker.utils.clickOnView
1212
import com.example.util.simpletimetracker.utils.clickOnViewWithId
1313
import com.example.util.simpletimetracker.utils.clickOnViewWithText
1414
import com.example.util.simpletimetracker.utils.longClickOnView
15+
import com.example.util.simpletimetracker.utils.longClickOnViewWithId
1516
import com.example.util.simpletimetracker.utils.tryAction
1617
import dagger.hilt.android.testing.HiltAndroidTest
1718
import org.hamcrest.Matchers.allOf
@@ -43,7 +44,7 @@ class MessagesTest : BaseUiTest() {
4344
@Test
4445
fun messageRecordActivity() {
4546
NavUtils.openRecordsScreen()
46-
clickOnViewWithId(recordsR.id.btnRecordAdd)
47+
longClickOnViewWithId(recordsR.id.btnRecordAdd)
4748
clickOnViewWithText(coreR.string.change_record_save)
4849
checkViewIsDisplayed(
4950
allOf(

0 commit comments

Comments
 (0)