Skip to content

Commit e476953

Browse files
Add constant
1 parent e2c20ee commit e476953

File tree

6 files changed

+16
-11
lines changed

6 files changed

+16
-11
lines changed

src/e2eAndroidTest/java/io/appium/java_client/android/AndroidContextTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.junit.jupiter.api.BeforeAll;
2121
import org.junit.jupiter.api.Test;
2222

23+
import static io.appium.java_client.HasBrowserCheck.NATIVE_CONTEXT;
2324
import static org.junit.jupiter.api.Assertions.assertEquals;
2425
import static org.junit.jupiter.api.Assertions.assertThrows;
2526

@@ -31,7 +32,7 @@ public class AndroidContextTest extends BaseAndroidTest {
3132
}
3233

3334
@Test public void testGetContext() {
34-
assertEquals("NATIVE_APP", driver.getContext());
35+
assertEquals(NATIVE_CONTEXT, driver.getContext());
3536
}
3637

3738
@Test public void testGetContextHandles() {
@@ -42,8 +43,8 @@ public class AndroidContextTest extends BaseAndroidTest {
4243
driver.getContextHandles();
4344
driver.context("WEBVIEW_io.appium.android.apis");
4445
assertEquals(driver.getContext(), "WEBVIEW_io.appium.android.apis");
45-
driver.context("NATIVE_APP");
46-
assertEquals(driver.getContext(), "NATIVE_APP");
46+
driver.context(NATIVE_CONTEXT);
47+
assertEquals(driver.getContext(), NATIVE_CONTEXT);
4748
}
4849

4950
@Test public void testContextError() {

src/e2eAndroidTest/java/io/appium/java_client/android/AndroidFunctionTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.util.regex.Matcher;
1919
import java.util.regex.Pattern;
2020

21+
import static io.appium.java_client.HasBrowserCheck.NATIVE_CONTEXT;
2122
import static java.time.Duration.ofMillis;
2223
import static java.time.Duration.ofSeconds;
2324
import static org.hamcrest.MatcherAssert.assertThat;
@@ -75,7 +76,7 @@ public static void startWebViewActivity() {
7576
@BeforeEach
7677
public void setUp() {
7778

78-
driver.context("NATIVE_APP");
79+
driver.context(NATIVE_CONTEXT);
7980
}
8081

8182
@Test

src/e2eIosTest/java/io/appium/java_client/ios/IOSBiDiTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import java.util.concurrent.CopyOnWriteArrayList;
2525

26+
import static io.appium.java_client.HasBrowserCheck.NATIVE_CONTEXT;
2627
import static org.junit.jupiter.api.Assertions.assertFalse;
2728

2829
public class IOSBiDiTest extends AppIOSTest {
@@ -31,7 +32,7 @@ public class IOSBiDiTest extends AppIOSTest {
3132
@Disabled("Need to resolve compatibility issues")
3233
public void listenForIosLogs() {
3334
var logs = new CopyOnWriteArrayList<LogEntry>();
34-
try (var logInspector = new LogInspector(driver)) {
35+
try (var logInspector = new LogInspector(NATIVE_CONTEXT, driver)) {
3536
logInspector.onLog(logs::add);
3637
driver.getPageSource();
3738
}

src/e2eIosTest/java/io/appium/java_client/ios/IOSContextTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import io.appium.java_client.NoSuchContextException;
2020
import org.junit.jupiter.api.Test;
2121

22+
import static io.appium.java_client.HasBrowserCheck.NATIVE_CONTEXT;
2223
import static org.hamcrest.MatcherAssert.assertThat;
2324
import static org.hamcrest.core.StringContains.containsString;
2425
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -27,7 +28,7 @@
2728
public class IOSContextTest extends BaseIOSWebViewTest {
2829

2930
@Test public void testGetContext() {
30-
assertEquals("NATIVE_APP", driver.getContext());
31+
assertEquals(NATIVE_CONTEXT, driver.getContext());
3132
}
3233

3334
@Test public void testGetContextHandles() {
@@ -38,7 +39,7 @@ public class IOSContextTest extends BaseIOSWebViewTest {
3839
driver.getContextHandles();
3940
findAndSwitchToWebView();
4041
assertThat(driver.getContext(), containsString("WEBVIEW"));
41-
driver.context("NATIVE_APP");
42+
driver.context(NATIVE_CONTEXT);
4243
}
4344

4445
@Test public void testContextError() {

src/main/java/io/appium/java_client/HasBrowserCheck.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import static java.util.Objects.requireNonNull;
1111

1212
public interface HasBrowserCheck extends ExecutesMethod, HasCapabilities {
13+
String NATIVE_CONTEXT = "NATIVE_APP";
14+
1315
/**
1416
* Validates if the driver is currently in a web browser context.
1517
*
@@ -32,7 +34,7 @@ default boolean isBrowser() {
3234
}
3335
try {
3436
var context = ((ContextAware) this).getContext();
35-
return context != null && !context.toUpperCase().contains("NATIVE_APP");
37+
return context != null && !context.toUpperCase().contains(NATIVE_CONTEXT);
3638
} catch (WebDriverException e) {
3739
return false;
3840
}

src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@
2828

2929
import java.util.Optional;
3030

31+
import static io.appium.java_client.HasBrowserCheck.NATIVE_CONTEXT;
3132
import static io.appium.java_client.pagefactory.bys.ContentType.HTML_OR_DEFAULT;
3233
import static io.appium.java_client.pagefactory.bys.ContentType.NATIVE_MOBILE_SPECIFIC;
3334

3435
public final class WebDriverUnpackUtility {
35-
private static final String NATIVE_APP_PATTERN = "NATIVE_APP";
36-
3736
private WebDriverUnpackUtility() {
3837
}
3938

@@ -109,7 +108,7 @@ public static ContentType getCurrentContentType(SearchContext context) {
109108

110109
var contextAware = unpackObjectFromSearchContext(context, ContextAware.class);
111110
if (contextAware.map(ContextAware::getContext)
112-
.filter(c -> c.toUpperCase().contains(NATIVE_APP_PATTERN)).isPresent()) {
111+
.filter(c -> c.toUpperCase().contains(NATIVE_CONTEXT)).isPresent()) {
113112
return NATIVE_MOBILE_SPECIFIC;
114113
}
115114

0 commit comments

Comments
 (0)