Skip to content

Commit c91aafe

Browse files
RazeemanRazeeman
committed
adding more tests
1 parent 23bf667 commit c91aafe

File tree

3 files changed

+80
-1
lines changed

3 files changed

+80
-1
lines changed

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,55 @@ class SettingsTest : BaseUiTest() {
568568
)
569569
}
570570

571+
@Test
572+
fun ignoreShortRecords() {
573+
val name = "Test"
574+
575+
// Add data
576+
testUtils.addActivity(name)
577+
578+
// Change settings
579+
NavUtils.openSettingsScreen()
580+
onView(withId(R.id.groupSettingsIgnoreShortRecords)).perform(nestedScrollTo())
581+
checkViewIsDisplayed(
582+
allOf(
583+
withId(R.id.tvSettingsIgnoreShortRecordsTime),
584+
withText(R.string.settings_inactivity_reminder_disabled)
585+
)
586+
)
587+
588+
clickOnViewWithId(R.id.groupSettingsIgnoreShortRecords)
589+
clickOnViewWithId(R.id.tvNumberKeyboard3)
590+
clickOnViewWithText(R.string.duration_dialog_save)
591+
checkViewIsDisplayed(withText("3$secondString"))
592+
593+
// Check record ignored
594+
NavUtils.openRunningRecordsScreen()
595+
clickOnViewWithText(name)
596+
tryAction { clickOnView(allOf(isDescendantOfA(withId(R.id.viewRunningRecordItem)), withText(name))) }
597+
NavUtils.openRecordsScreen()
598+
checkViewDoesNotExist(allOf(withText(name), isCompletelyDisplayed()))
599+
600+
// Disable
601+
NavUtils.openSettingsScreen()
602+
onView(withId(R.id.groupSettingsIgnoreShortRecords)).perform(nestedScrollTo())
603+
clickOnViewWithId(R.id.groupSettingsIgnoreShortRecords)
604+
clickOnViewWithText(R.string.duration_dialog_disable)
605+
checkViewIsDisplayed(
606+
allOf(
607+
withId(R.id.tvSettingsIgnoreShortRecordsTime),
608+
withText(R.string.settings_inactivity_reminder_disabled)
609+
)
610+
)
611+
612+
// Check record not ignored
613+
NavUtils.openRunningRecordsScreen()
614+
clickOnViewWithText(name)
615+
tryAction { clickOnView(allOf(isDescendantOfA(withId(R.id.viewRunningRecordItem)), withText(name))) }
616+
NavUtils.openRecordsScreen()
617+
checkViewIsDisplayed(allOf(withText(name), isCompletelyDisplayed()))
618+
}
619+
571620
@Test
572621
fun militaryTime() {
573622
// Check settings

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,16 @@ class StatisticsDetailTest : BaseUiTest() {
382382
// Split chart
383383
onView(withId(R.id.chartStatisticsDetailSplit)).perform(nestedScrollTo())
384384
checkViewIsDisplayed(allOf(withId(R.id.chartStatisticsDetailSplit), isCompletelyDisplayed()))
385+
checkViewIsDisplayed(allOf(withId(R.id.tvStatisticsDetailSplitHint), isCompletelyDisplayed()))
385386
onView(withId(R.id.buttonsStatisticsDetailSplitGrouping)).perform(nestedScrollTo())
386387
clickOnSplitChartGrouping(R.string.statistics_detail_chart_hourly)
387388
clickOnSplitChartGrouping(R.string.statistics_detail_chart_daily)
388389

390+
// Duration chart
391+
onView(withId(R.id.chartStatisticsDetailDurationSplit)).perform(nestedScrollTo())
392+
checkViewIsDisplayed(allOf(withId(R.id.chartStatisticsDetailDurationSplit), isCompletelyDisplayed()))
393+
checkViewIsDisplayed(allOf(withId(R.id.tvStatisticsDetailDurationSplitHint), isCompletelyDisplayed()))
394+
389395
// Tag split
390396
onView(withId(R.id.rvStatisticsDetailTagSplit)).perform(nestedScrollTo())
391397
checkTagItem(color, tag, "2$hourString 0$minuteString", "67%")
@@ -455,8 +461,14 @@ class StatisticsDetailTest : BaseUiTest() {
455461
// Split chart
456462
onView(withId(R.id.chartStatisticsDetailSplit)).perform(nestedScrollTo())
457463
checkViewIsDisplayed(allOf(withId(R.id.chartStatisticsDetailSplit), isCompletelyDisplayed()))
464+
checkViewIsDisplayed(allOf(withId(R.id.tvStatisticsDetailSplitHint), isCompletelyDisplayed()))
458465
checkViewDoesNotExist(allOf(withId(R.id.buttonsStatisticsDetailSplitGrouping), isCompletelyDisplayed()))
459466

467+
// Duration chart
468+
onView(withId(R.id.chartStatisticsDetailDurationSplit)).perform(nestedScrollTo())
469+
checkViewIsDisplayed(allOf(withId(R.id.chartStatisticsDetailDurationSplit), isCompletelyDisplayed()))
470+
checkViewIsDisplayed(allOf(withId(R.id.tvStatisticsDetailDurationSplitHint), isCompletelyDisplayed()))
471+
460472
// All records
461473
checkAllRecords(3)
462474

@@ -542,10 +554,16 @@ class StatisticsDetailTest : BaseUiTest() {
542554
// Split chart
543555
onView(withId(R.id.chartStatisticsDetailSplit)).perform(nestedScrollTo())
544556
checkViewIsDisplayed(allOf(withId(R.id.chartStatisticsDetailSplit), isCompletelyDisplayed()))
557+
checkViewIsDisplayed(allOf(withId(R.id.tvStatisticsDetailSplitHint), isCompletelyDisplayed()))
545558
onView(withId(R.id.buttonsStatisticsDetailSplitGrouping)).perform(nestedScrollTo())
546559
clickOnSplitChartGrouping(R.string.statistics_detail_chart_hourly)
547560
clickOnSplitChartGrouping(R.string.statistics_detail_chart_daily)
548561

562+
// Duration chart
563+
onView(withId(R.id.chartStatisticsDetailDurationSplit)).perform(nestedScrollTo())
564+
checkViewIsDisplayed(allOf(withId(R.id.chartStatisticsDetailDurationSplit), isCompletelyDisplayed()))
565+
checkViewIsDisplayed(allOf(withId(R.id.tvStatisticsDetailDurationSplitHint), isCompletelyDisplayed()))
566+
549567
// All records
550568
checkAllRecords(3)
551569

@@ -644,10 +662,16 @@ class StatisticsDetailTest : BaseUiTest() {
644662
// Split chart
645663
onView(withId(R.id.chartStatisticsDetailSplit)).perform(nestedScrollTo())
646664
checkViewIsDisplayed(allOf(withId(R.id.chartStatisticsDetailSplit), isCompletelyDisplayed()))
665+
checkViewIsDisplayed(allOf(withId(R.id.tvStatisticsDetailSplitHint), isCompletelyDisplayed()))
647666
onView(withId(R.id.buttonsStatisticsDetailSplitGrouping)).perform(nestedScrollTo())
648667
clickOnSplitChartGrouping(R.string.statistics_detail_chart_hourly)
649668
clickOnSplitChartGrouping(R.string.statistics_detail_chart_daily)
650669

670+
// Duration chart
671+
onView(withId(R.id.chartStatisticsDetailDurationSplit)).perform(nestedScrollTo())
672+
checkViewIsDisplayed(allOf(withId(R.id.chartStatisticsDetailDurationSplit), isCompletelyDisplayed()))
673+
checkViewIsDisplayed(allOf(withId(R.id.tvStatisticsDetailDurationSplitHint), isCompletelyDisplayed()))
674+
651675
// All records
652676
checkAllRecords(3)
653677

@@ -752,10 +776,16 @@ class StatisticsDetailTest : BaseUiTest() {
752776
// Split chart
753777
onView(withId(R.id.chartStatisticsDetailSplit)).perform(nestedScrollTo())
754778
checkViewIsDisplayed(allOf(withId(R.id.chartStatisticsDetailSplit), isCompletelyDisplayed()))
779+
checkViewIsDisplayed(allOf(withId(R.id.tvStatisticsDetailSplitHint), isCompletelyDisplayed()))
755780
onView(withId(R.id.buttonsStatisticsDetailSplitGrouping)).perform(nestedScrollTo())
756781
clickOnSplitChartGrouping(R.string.statistics_detail_chart_hourly)
757782
clickOnSplitChartGrouping(R.string.statistics_detail_chart_daily)
758783

784+
// Duration chart
785+
onView(withId(R.id.chartStatisticsDetailDurationSplit)).perform(nestedScrollTo())
786+
checkViewIsDisplayed(allOf(withId(R.id.chartStatisticsDetailDurationSplit), isCompletelyDisplayed()))
787+
checkViewIsDisplayed(allOf(withId(R.id.tvStatisticsDetailDurationSplitHint), isCompletelyDisplayed()))
788+
759789
// All records
760790
checkAllRecords(3)
761791

‎features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/customRangeSelection/viewModel/CustomRangeSelectionViewModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class CustomRangeSelectionViewModel @Inject constructor(
4949
DateTimeDialogParams(
5050
tag = TIME_STARTED_TAG,
5151
timestamp = rangeStart,
52-
type = DateTimeDialogType.DATETIME(initialTab = DateTimeDialogType.Tab.DATE),
52+
type = DateTimeDialogType.DATE,
5353
useMilitaryTime = useMilitaryTime,
5454
firstDayOfWeek = firstDayOfWeek
5555
)

0 commit comments

Comments
 (0)