Skip to content

Commit 7dc045f

Browse files
committed
fix tests
1 parent 551151a commit 7dc045f

File tree

7 files changed

+45
-8
lines changed

7 files changed

+45
-8
lines changed

app/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,8 @@ dependencies {
6363

6464
kapt(Deps.Kapt.dagger)
6565
kaptAndroidTest(Deps.Kapt.dagger)
66+
67+
androidTestImplementation(Deps.UiTest.junit)
68+
androidTestImplementation(Deps.UiTest.espresso)
69+
androidTestImplementation(Deps.UiTest.espressoContrib)
6670
}

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

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ class SettingsTest : BaseUiTest() {
127127

128128
// Click on already running
129129
NavUtils.openRunningRecordsScreen()
130-
Thread.sleep(1000)
131130
clickOnView(
132131
allOf(isDescendantOfA(withId(R.id.layoutRecordTypeItem)), withText(name1))
133132
)
@@ -179,7 +178,6 @@ class SettingsTest : BaseUiTest() {
179178

180179
// Start another timer
181180
NavUtils.openRunningRecordsScreen()
182-
Thread.sleep(1000)
183181
clickOnView(
184182
allOf(isDescendantOfA(withId(R.id.layoutRecordTypeItem)), withText(name3))
185183
)
@@ -376,4 +374,36 @@ class SettingsTest : BaseUiTest() {
376374
onView(allOf(isDescendantOfA(withId(R.id.layoutRecordTypeItem)), withText(name3)))
377375
.check(isCompletelyLeftOf(allOf(isDescendantOfA(withId(R.id.layoutRecordTypeItem)), withText(name1))))
378376
}
377+
378+
@Test
379+
fun enableNotifications() {
380+
val name1 = "Test1"
381+
val name2 = "Test2"
382+
383+
// Add activities
384+
NavUtils.addActivity(name1)
385+
NavUtils.addActivity(name2)
386+
387+
// Start one timer
388+
clickOnViewWithText(name1)
389+
390+
// Change settings
391+
NavUtils.openSettingsScreen()
392+
onView(withId(R.id.checkboxSettingsShowNotifications)).check(matches(isNotChecked()))
393+
unconstrainedClickOnView(withId(R.id.checkboxSettingsShowNotifications))
394+
onView(withId(R.id.checkboxSettingsShowNotifications)).check(matches(isChecked()))
395+
396+
// Stop first timer
397+
NavUtils.openRunningRecordsScreen()
398+
clickOnView(allOf(withId(R.id.layoutRunningRecordItem), hasDescendant(withText(name1))))
399+
400+
// Start another timer
401+
clickOnViewWithText(name2)
402+
403+
// Change settings
404+
NavUtils.openSettingsScreen()
405+
onView(withId(R.id.checkboxSettingsShowNotifications)).check(matches(isChecked()))
406+
unconstrainedClickOnView(withId(R.id.checkboxSettingsShowNotifications))
407+
onView(withId(R.id.checkboxSettingsShowNotifications)).check(matches(isNotChecked()))
408+
}
379409
}

app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsFilterTest.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class StatisticsFilterTest : BaseUiTest() {
4747

4848
// Filter untracked
4949
clickOnViewWithId(R.id.btnStatisticsChartFilter)
50+
Thread.sleep(1000)
5051
clickOnView(
5152
allOf(
5253
isDescendantOfA(withId(R.id.layoutRecordTypeItem)),
@@ -62,6 +63,7 @@ class StatisticsFilterTest : BaseUiTest() {
6263

6364
// Filter activity
6465
clickOnViewWithId(R.id.btnStatisticsChartFilter)
66+
Thread.sleep(1000)
6567
clickOnView(allOf(isDescendantOfA(withId(R.id.layoutRecordTypeItem)), withText(name)))
6668
pressBack()
6769
checkViewDoesNotExist(
@@ -72,6 +74,7 @@ class StatisticsFilterTest : BaseUiTest() {
7274

7375
// Filter all
7476
clickOnViewWithId(R.id.btnStatisticsChartFilter)
77+
Thread.sleep(1000)
7578
clickOnView(allOf(isDescendantOfA(withId(R.id.layoutRecordTypeItem)), withText(newName)))
7679
pressBack()
7780
checkViewDoesNotExist(allOf(withText(newName), isCompletelyDisplayed()))

app/src/androidTest/java/com/example/util/simpletimetracker/di/TestAppComponent.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import com.example.util.simpletimetracker.StatisticsFilterTest
1414
import com.example.util.simpletimetracker.StatisticsRangesTest
1515
import com.example.util.simpletimetracker.StatisticsTest
1616
import com.example.util.simpletimetracker.data_local.di.DataLocalModule
17+
import com.example.util.simpletimetracker.feature_notification.di.NotificationModule
1718
import com.example.util.simpletimetracker.feature_widget.di.WidgetModule
1819
import com.example.util.simpletimetracker.utils.BaseUiTest
1920
import dagger.Component
@@ -24,7 +25,8 @@ import javax.inject.Singleton
2425
modules = [
2526
AppModule::class,
2627
DataLocalModule::class,
27-
WidgetModule::class
28+
WidgetModule::class,
29+
NotificationModule::class
2830
]
2931
)
3032
interface TestAppComponent: AppComponent {

app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ object NavUtils {
2929
}
3030

3131
fun addActivity(name: String, color: Int? = null, icon: Int? = null) {
32+
Thread.sleep(1000)
33+
3234
clickOnViewWithText(R.string.running_records_add_type)
3335

3436
// Name

core/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,4 @@ dependencies {
4040
api(Deps.Ktx.liveData)
4141
api(Deps.Ktx.viewModel)
4242
api(Deps.UiTest.espressoIdling)
43-
44-
androidTestApi(Deps.UiTest.junit)
45-
androidTestApi(Deps.UiTest.espresso)
46-
androidTestApi(Deps.UiTest.espressoContrib)
4743
}

domain/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ dependencies {
2424
api(Deps.coroutines)
2525
api(Deps.timber)
2626

27-
testApi(Deps.Test.junit)
27+
testImplementation(Deps.Test.junit)
2828
}

0 commit comments

Comments
 (0)