From ce4f2b68962b17bc358cf750ec7ca6fcc4b2faaf Mon Sep 17 00:00:00 2001 From: Futsch1 Date: Fri, 3 Jan 2025 22:52:27 +0100 Subject: [PATCH] Try to fling twice --- .../java/com/futsch1/medtimer/SettingsTest.kt | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/androidTest/java/com/futsch1/medtimer/SettingsTest.kt b/app/src/androidTest/java/com/futsch1/medtimer/SettingsTest.kt index 38bad3f9..d230b32e 100644 --- a/app/src/androidTest/java/com/futsch1/medtimer/SettingsTest.kt +++ b/app/src/androidTest/java/com/futsch1/medtimer/SettingsTest.kt @@ -51,14 +51,7 @@ class SettingsTest : BaseTestHelper() { AndroidTestHelper.createIntervalReminder("1", 120) pressBack() - // Now dismiss notification - // We navigate to analysis first to not accidentally grab another UI object with text "Test med" - navigateTo(MainMenu.ANALYSIS) - device.openNotification() - val notification = device.wait(Until.findObject(By.textContains("Test med")), 2000) - Assert.assertNotNull(notification) - if (!notification.fling(Direction.RIGHT)) notification.fling(Direction.RIGHT) - device.pressBack() + dismissNotification(device) // Check overview and next reminders navigateTo(MainMenu.OVERVIEW) @@ -85,14 +78,7 @@ class SettingsTest : BaseTestHelper() { onView(withText(R.string.clear_events)).perform(click()) onView(withId(android.R.id.button1)).perform(click()) - // Now dismiss notification - // We navigate to analysis first to not accidentally grab another UI object with text "Test med" - navigateTo(MainMenu.ANALYSIS) - device.openNotification() - val newNotification = device.wait(Until.findObject(By.textContains("Test med")), 2000) - Assert.assertNotNull(newNotification) - if (!newNotification.fling(Direction.RIGHT)) newNotification.fling(Direction.RIGHT) - device.pressBack() + dismissNotification(device) // Check overview and next reminders navigateTo(MainMenu.OVERVIEW) @@ -139,4 +125,18 @@ class SettingsTest : BaseTestHelper() { val nextNotification = device.wait(Until.findObject(By.textContains("Test med")), 2000) Assert.assertNotNull(nextNotification) } + + private fun dismissNotification(device: UiDevice) { + // Now dismiss notification + // We navigate to analysis first to not accidentally grab another UI object with text "Test med" + navigateTo(MainMenu.ANALYSIS) + device.openNotification() + var notification = device.wait(Until.findObject(By.textContains("Test med")), 2000) + Assert.assertNotNull(notification) + notification.fling(Direction.RIGHT) + notification = device.wait(Until.findObject(By.textContains("Test med")), 500) + notification?.fling(Direction.RIGHT) + + device.pressBack() + } } \ No newline at end of file