Add constant

appium · Dec 14, 2024 · e476953 · e476953
1 parent e2c20ee
commit e476953
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/src/e2eAndroidTest/java/io/appium/java_client/android/AndroidContextTest.java b/src/e2eAndroidTest/java/io/appium/java_client/android/AndroidContextTest.java
@@ -20,6 +20,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import static io.appium.java_client.HasBrowserCheck.NATIVE_CONTEXT;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -31,7 +32,7 @@ public class AndroidContextTest extends BaseAndroidTest {
     }
 
     @Test public void testGetContext() {
-        assertEquals("NATIVE_APP", driver.getContext());
+        assertEquals(NATIVE_CONTEXT, driver.getContext());
     }
 
     @Test public void testGetContextHandles() {
@@ -42,8 +43,8 @@ public class AndroidContextTest extends BaseAndroidTest {
         driver.getContextHandles();
         driver.context("WEBVIEW_io.appium.android.apis");
         assertEquals(driver.getContext(), "WEBVIEW_io.appium.android.apis");
-        driver.context("NATIVE_APP");
-        assertEquals(driver.getContext(), "NATIVE_APP");
+        driver.context(NATIVE_CONTEXT);
+        assertEquals(driver.getContext(), NATIVE_CONTEXT);
     }
 
     @Test public void testContextError() {

diff --git a/src/e2eAndroidTest/java/io/appium/java_client/android/AndroidFunctionTest.java b/src/e2eAndroidTest/java/io/appium/java_client/android/AndroidFunctionTest.java
@@ -18,6 +18,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static io.appium.java_client.HasBrowserCheck.NATIVE_CONTEXT;
 import static java.time.Duration.ofMillis;
 import static java.time.Duration.ofSeconds;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -75,7 +76,7 @@ public static void startWebViewActivity() {
     @BeforeEach
     public void setUp() {
 
-        driver.context("NATIVE_APP");
+        driver.context(NATIVE_CONTEXT);
     }
 
     @Test

diff --git a/src/e2eIosTest/java/io/appium/java_client/ios/IOSBiDiTest.java b/src/e2eIosTest/java/io/appium/java_client/ios/IOSBiDiTest.java
@@ -23,6 +23,7 @@
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import static io.appium.java_client.HasBrowserCheck.NATIVE_CONTEXT;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class IOSBiDiTest extends AppIOSTest {
@@ -31,7 +32,7 @@ public class IOSBiDiTest extends AppIOSTest {
     @Disabled("Need to resolve compatibility issues")
     public void listenForIosLogs() {
         var logs = new CopyOnWriteArrayList<LogEntry>();
-        try (var logInspector = new LogInspector(driver)) {
+        try (var logInspector = new LogInspector(NATIVE_CONTEXT, driver)) {
             logInspector.onLog(logs::add);
             driver.getPageSource();
         }

diff --git a/src/e2eIosTest/java/io/appium/java_client/ios/IOSContextTest.java b/src/e2eIosTest/java/io/appium/java_client/ios/IOSContextTest.java
@@ -19,6 +19,7 @@
 import io.appium.java_client.NoSuchContextException;
 import org.junit.jupiter.api.Test;
 
+import static io.appium.java_client.HasBrowserCheck.NATIVE_CONTEXT;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -27,7 +28,7 @@
 public class IOSContextTest extends BaseIOSWebViewTest {
 
     @Test public void testGetContext() {
-        assertEquals("NATIVE_APP", driver.getContext());
+        assertEquals(NATIVE_CONTEXT, driver.getContext());
     }
 
     @Test public void testGetContextHandles() {
@@ -38,7 +39,7 @@ public class IOSContextTest extends BaseIOSWebViewTest {
         driver.getContextHandles();
         findAndSwitchToWebView();
         assertThat(driver.getContext(), containsString("WEBVIEW"));
-        driver.context("NATIVE_APP");
+        driver.context(NATIVE_CONTEXT);
     }
 
     @Test public void testContextError() {

diff --git a/src/main/java/io/appium/java_client/HasBrowserCheck.java b/src/main/java/io/appium/java_client/HasBrowserCheck.java
@@ -10,6 +10,8 @@
 import static java.util.Objects.requireNonNull;
 
 public interface HasBrowserCheck extends ExecutesMethod, HasCapabilities {
+    String NATIVE_CONTEXT = "NATIVE_APP";
+
     /**
      * Validates if the driver is currently in a web browser context.
      *
@@ -32,7 +34,7 @@ default boolean isBrowser() {
         }
         try {
             var context = ((ContextAware) this).getContext();
-            return context != null && !context.toUpperCase().contains("NATIVE_APP");
+            return context != null && !context.toUpperCase().contains(NATIVE_CONTEXT);
         } catch (WebDriverException e) {
             return false;
         }

diff --git a/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java b/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java
@@ -28,12 +28,11 @@
 
 import java.util.Optional;
 
+import static io.appium.java_client.HasBrowserCheck.NATIVE_CONTEXT;
 import static io.appium.java_client.pagefactory.bys.ContentType.HTML_OR_DEFAULT;
 import static io.appium.java_client.pagefactory.bys.ContentType.NATIVE_MOBILE_SPECIFIC;
 
 public final class WebDriverUnpackUtility {
-    private static final String NATIVE_APP_PATTERN = "NATIVE_APP";
-
     private WebDriverUnpackUtility() {
     }
 
@@ -109,7 +108,7 @@ public static ContentType getCurrentContentType(SearchContext context) {
 
         var contextAware = unpackObjectFromSearchContext(context, ContextAware.class);
         if (contextAware.map(ContextAware::getContext)
-                .filter(c -> c.toUpperCase().contains(NATIVE_APP_PATTERN)).isPresent()) {
+                .filter(c -> c.toUpperCase().contains(NATIVE_CONTEXT)).isPresent()) {
             return NATIVE_MOBILE_SPECIFIC;
         }