click notification permission dialog 2

Author: jonathanbataire

src/androidTestMedicmobilegammaDebug/java/org/medicmobile/webapp/mobile/LoginTests.java

@@ -32,6 +32,11 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.platform.app.InstrumentationRegistry;
+
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
@@ -42,6 +47,7 @@
 import org.junit.runners.MethodSorters;
 
 import java.util.Locale;
+
 @LargeTest
 @RunWith(AndroidJUnit4.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -56,14 +62,16 @@ public class LoginTests {
 	@Test
 	public void testLoginScreen() throws Exception {
 		onData(anything())
-			.inAdapterView(withId(R.id.lstServers))
-			.atPosition(0)
-			.perform(click());
+				.inAdapterView(withId(R.id.lstServers))
+				.atPosition(0)
+				.perform(click());
 		onView(withText("Continue"))
-			.inRoot(isDialog())
-			.perform(click());
+				.inRoot(isDialog())
+				.perform(click());
 		Thread.sleep(7000);//TODO: use better ways to handle delays
 
+		allowNotificationPermission();
+
 		ViewInteraction webView = onView(
 				allOf(withId(R.id.wbvMain),
 						withParent(allOf(withId(R.id.lytWebView),
@@ -124,4 +132,12 @@ public boolean matchesSafely(View view) {
 			}
 		};
 	}
+
+	private void allowNotificationPermission() throws Exception {
+		UiDevice device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+		UiObject allowButton = device.findObject(new UiSelector().text("Allow"));
+		if (allowButton.exists() && allowButton.isEnabled()) {
+			allowButton.click();
+		}
+	}
 }

src/androidTestUnbrandedDebug/java/org/medicmobile/webapp/mobile/SettingsDialogActivityTest.java

@@ -88,22 +88,22 @@ public void serverSelectionScreenIsDisplayed() {
 	@Test
 	public void testLoginScreen() throws Exception {
 		onData(anything())
-			.inAdapterView(withId(R.id.lstServers))
-			.atPosition(1)
-			.perform(click());
+				.inAdapterView(withId(R.id.lstServers))
+				.atPosition(1)
+				.perform(click());
 
 		onView(withText("Login to Gamma Dev?"))
-			.inRoot(isDialog())
-			.check(matches(isDisplayed()));
+				.inRoot(isDialog())
+				.check(matches(isDisplayed()));
 		onView(withText("Cancel"))
-			.inRoot(isDialog())
-			.check(matches(isDisplayed()));
+				.inRoot(isDialog())
+				.check(matches(isDisplayed()));
 
 		onView(withText("Continue"))
-			.inRoot(isDialog())
-			.perform(click());
+				.inRoot(isDialog())
+				.perform(click());
 
-		Thread.sleep(7000);	//TODO: use better ways to handle delays
+		Thread.sleep(7000);    //TODO: use better ways to handle delays
 
 		allowNotificationPermission();
 
@@ -153,13 +153,13 @@ public void testLoginScreen() throws Exception {
 	@Test
 	public void testCancelSelectedServer() {
 		onData(anything())
-			.inAdapterView(withId(R.id.lstServers))
-			.atPosition(2)
-			.perform(click());
+				.inAdapterView(withId(R.id.lstServers))
+				.atPosition(2)
+				.perform(click());
 
 		onView(withText(R.string.btnCancel))
-			.inRoot(isDialog())
-			.perform(click());
+				.inRoot(isDialog())
+				.perform(click());
 
 		onView(withText("CHT Android")).check(matches(isDisplayed()));
 		onView(withText("Custom")).check(matches(isDisplayed()));
@@ -204,21 +204,21 @@ public void testFilterServers() throws InterruptedException {
 		onView(withText(SERVER_THREE)).check(matches(isDisplayed()));
 
 		onData(anything())
-			.inAdapterView(withId(R.id.lstServers))
-			.atPosition(0)
-			.perform(click());
+				.inAdapterView(withId(R.id.lstServers))
+				.atPosition(0)
+				.perform(click());
 
 		onView(withText("Login to Gamma Dev?"))
-			.inRoot(isDialog())
-			.check(matches(isDisplayed()));
+				.inRoot(isDialog())
+				.check(matches(isDisplayed()));
 	}
 
 	private String getLanguage(String code) {
 		Locale aLocale = new Locale(code);
 		return aLocale.getDisplayName();
 	}
 
-	private void allowNotificationPermission () throws Exception {
+	private void allowNotificationPermission() throws Exception {
 		UiDevice device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
 		UiObject allowButton = device.findObject(new UiSelector().text("Allow"));
 		if (allowButton.exists() && allowButton.isEnabled()) {