diff --git a/src/e2eAndroidTest/java/io/appium/java_client/android/TestResources.java b/src/e2eAndroidTest/java/io/appium/java_client/android/TestResources.java index 149a72a4a..373241fe4 100644 --- a/src/e2eAndroidTest/java/io/appium/java_client/android/TestResources.java +++ b/src/e2eAndroidTest/java/io/appium/java_client/android/TestResources.java @@ -1,6 +1,6 @@ package io.appium.java_client.android; -import io.appium.java_client.TestUtils; +import io.appium.java_client.utils.TestUtils; import java.nio.file.Path; diff --git a/src/e2eAndroidTest/java/io/appium/java_client/service/local/ServerBuilderTest.java b/src/e2eAndroidTest/java/io/appium/java_client/service/local/ServerBuilderTest.java index bf1df1fe3..a73a00dad 100644 --- a/src/e2eAndroidTest/java/io/appium/java_client/service/local/ServerBuilderTest.java +++ b/src/e2eAndroidTest/java/io/appium/java_client/service/local/ServerBuilderTest.java @@ -1,8 +1,8 @@ package io.appium.java_client.service.local; -import io.appium.java_client.TestUtils; import io.appium.java_client.android.TestResources; import io.appium.java_client.android.options.UiAutomator2Options; +import io.appium.java_client.utils.TestUtils; import io.github.bonigarcia.wdm.WebDriverManager; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -17,7 +17,6 @@ import java.util.List; import java.util.Map; -import static io.appium.java_client.TestUtils.getLocalIp4Address; import static io.appium.java_client.service.local.AppiumDriverLocalService.buildDefaultService; import static io.appium.java_client.service.local.AppiumServiceBuilder.APPIUM_PATH; import static io.appium.java_client.service.local.AppiumServiceBuilder.BROADCAST_IP4_ADDRESS; @@ -25,6 +24,7 @@ import static io.appium.java_client.service.local.flags.GeneralServerFlag.BASEPATH; import static io.appium.java_client.service.local.flags.GeneralServerFlag.CALLBACK_ADDRESS; import static io.appium.java_client.service.local.flags.GeneralServerFlag.SESSION_OVERRIDE; +import static io.appium.java_client.utils.TestUtils.getLocalIp4Address; import static io.github.bonigarcia.wdm.WebDriverManager.chromedriver; import static java.lang.System.getProperty; import static java.lang.System.setProperty; diff --git a/src/e2eFlutterTest/java/io/appium/java_client/android/CommandTest.java b/src/e2eFlutterTest/java/io/appium/java_client/android/CommandTest.java index 772b316fb..9e7f60bda 100644 --- a/src/e2eFlutterTest/java/io/appium/java_client/android/CommandTest.java +++ b/src/e2eFlutterTest/java/io/appium/java_client/android/CommandTest.java @@ -1,12 +1,12 @@ package io.appium.java_client.android; import io.appium.java_client.AppiumBy; -import io.appium.java_client.TestUtils; import io.appium.java_client.flutter.commands.DoubleClickParameter; import io.appium.java_client.flutter.commands.DragAndDropParameter; import io.appium.java_client.flutter.commands.LongPressParameter; import io.appium.java_client.flutter.commands.ScrollParameter; import io.appium.java_client.flutter.commands.WaitParameter; +import io.appium.java_client.utils.TestUtils; import org.junit.jupiter.api.Test; import org.openqa.selenium.Point; import org.openqa.selenium.WebElement; diff --git a/src/e2eIosTest/java/io/appium/java_client/ios/AppIOSTest.java b/src/e2eIosTest/java/io/appium/java_client/ios/AppIOSTest.java index 8de7d60e7..316b05d08 100644 --- a/src/e2eIosTest/java/io/appium/java_client/ios/AppIOSTest.java +++ b/src/e2eIosTest/java/io/appium/java_client/ios/AppIOSTest.java @@ -1,7 +1,7 @@ package io.appium.java_client.ios; -import io.appium.java_client.TestUtils; import io.appium.java_client.ios.options.XCUITestOptions; +import io.appium.java_client.utils.TestUtils; import org.junit.jupiter.api.BeforeAll; import org.openqa.selenium.SessionNotCreatedException; diff --git a/src/e2eIosTest/java/io/appium/java_client/ios/BaseIOSWebViewTest.java b/src/e2eIosTest/java/io/appium/java_client/ios/BaseIOSWebViewTest.java index 2371a7b72..8c54b30c4 100644 --- a/src/e2eIosTest/java/io/appium/java_client/ios/BaseIOSWebViewTest.java +++ b/src/e2eIosTest/java/io/appium/java_client/ios/BaseIOSWebViewTest.java @@ -16,22 +16,23 @@ package io.appium.java_client.ios; -import io.appium.java_client.TestUtils; import io.appium.java_client.ios.options.XCUITestOptions; import org.junit.jupiter.api.BeforeAll; import org.openqa.selenium.SessionNotCreatedException; +import java.io.IOException; +import java.net.URL; import java.time.Duration; import java.util.function.Supplier; -public class BaseIOSWebViewTest extends BaseIOSTest { - private static final String VODQA_ZIP = TestUtils.resourcePathToAbsolutePath("vodqa.zip").toString(); +import static io.appium.java_client.utils.TestUtils.IOS_SIM_VODQA_RELEASE_URL; +public class BaseIOSWebViewTest extends BaseIOSTest { private static final Duration WEB_VIEW_DETECT_INTERVAL = Duration.ofSeconds(2); private static final Duration WEB_VIEW_DETECT_DURATION = Duration.ofSeconds(30); @BeforeAll - public static void beforeClass() { + public static void beforeClass() throws IOException { startAppiumServer(); XCUITestOptions options = new XCUITestOptions() @@ -39,7 +40,7 @@ public static void beforeClass() { .setDeviceName(DEVICE_NAME) .setWdaLaunchTimeout(WDA_LAUNCH_TIMEOUT) .setCommandTimeouts(Duration.ofSeconds(240)) - .setApp(VODQA_ZIP); + .setApp(new URL(IOS_SIM_VODQA_RELEASE_URL)); if (PREBUILT_WDA_PATH != null) { options.usePreinstalledWda().setPrebuiltWdaPath(PREBUILT_WDA_PATH); } diff --git a/src/e2eIosTest/java/io/appium/java_client/ios/IOSContextTest.java b/src/e2eIosTest/java/io/appium/java_client/ios/IOSContextTest.java index 999957aaa..b746edd24 100644 --- a/src/e2eIosTest/java/io/appium/java_client/ios/IOSContextTest.java +++ b/src/e2eIosTest/java/io/appium/java_client/ios/IOSContextTest.java @@ -17,7 +17,7 @@ package io.appium.java_client.ios; import io.appium.java_client.NoSuchContextException; -import io.appium.java_client.TestUtils; +import io.appium.java_client.utils.TestUtils; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; diff --git a/src/e2eIosTest/java/io/appium/java_client/ios/IOSDriverTest.java b/src/e2eIosTest/java/io/appium/java_client/ios/IOSDriverTest.java index 3ad036b4d..aa0a66f2a 100644 --- a/src/e2eIosTest/java/io/appium/java_client/ios/IOSDriverTest.java +++ b/src/e2eIosTest/java/io/appium/java_client/ios/IOSDriverTest.java @@ -31,7 +31,7 @@ import java.time.Duration; import java.util.Map; -import static io.appium.java_client.TestUtils.waitUntilTrue; +import static io.appium.java_client.utils.TestUtils.waitUntilTrue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/e2eIosTest/java/io/appium/java_client/ios/IOSWebViewTest.java b/src/e2eIosTest/java/io/appium/java_client/ios/IOSWebViewTest.java index da68eeecb..1895e3517 100644 --- a/src/e2eIosTest/java/io/appium/java_client/ios/IOSWebViewTest.java +++ b/src/e2eIosTest/java/io/appium/java_client/ios/IOSWebViewTest.java @@ -1,7 +1,7 @@ package io.appium.java_client.ios; import io.appium.java_client.AppiumBy; -import io.appium.java_client.TestUtils; +import io.appium.java_client.utils.TestUtils; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; import org.openqa.selenium.By; diff --git a/src/e2eIosTest/java/io/appium/java_client/service/local/StartingAppLocallyIosTest.java b/src/e2eIosTest/java/io/appium/java_client/service/local/StartingAppLocallyIosTest.java index b262e93af..d91407509 100644 --- a/src/e2eIosTest/java/io/appium/java_client/service/local/StartingAppLocallyIosTest.java +++ b/src/e2eIosTest/java/io/appium/java_client/service/local/StartingAppLocallyIosTest.java @@ -16,13 +16,13 @@ package io.appium.java_client.service.local; -import io.appium.java_client.TestUtils; import io.appium.java_client.ios.BaseIOSTest; import io.appium.java_client.ios.IOSDriver; import io.appium.java_client.ios.options.XCUITestOptions; import io.appium.java_client.remote.AutomationName; import io.appium.java_client.remote.MobilePlatform; import io.appium.java_client.service.local.flags.GeneralServerFlag; +import io.appium.java_client.utils.TestUtils; import org.junit.jupiter.api.Test; import org.openqa.selenium.Capabilities; import org.openqa.selenium.Platform; diff --git a/src/e2eIosTest/resources/vodqa.zip b/src/e2eIosTest/resources/vodqa.zip deleted file mode 100644 index 74b980dec..000000000 Binary files a/src/e2eIosTest/resources/vodqa.zip and /dev/null differ diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/DesktopBrowserCompatibilityTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/DesktopBrowserCompatibilityTest.java index 911fefc02..c918db58e 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/DesktopBrowserCompatibilityTest.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/DesktopBrowserCompatibilityTest.java @@ -16,13 +16,13 @@ package io.appium.java_client.pagefactory_tests; -import io.appium.java_client.TestUtils; import io.appium.java_client.android.AndroidDriver; import io.appium.java_client.pagefactory.AndroidFindBy; import io.appium.java_client.pagefactory.AppiumFieldDecorator; import io.appium.java_client.pagefactory.HowToUseLocators; import io.appium.java_client.pagefactory.Widget; import io.appium.java_client.pagefactory.iOSXCUITFindBy; +import io.appium.java_client.utils.TestUtils; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriver; diff --git a/src/test/java/io/appium/java_client/plugin/StorageTest.java b/src/test/java/io/appium/java_client/plugin/StorageTest.java index b1042a971..a12708dc7 100644 --- a/src/test/java/io/appium/java_client/plugin/StorageTest.java +++ b/src/test/java/io/appium/java_client/plugin/StorageTest.java @@ -16,8 +16,8 @@ package io.appium.java_client.plugin; -import io.appium.java_client.TestUtils; import io.appium.java_client.plugins.storage.StorageClient; +import io.appium.java_client.utils.TestUtils; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/appium/java_client/TestUtils.java b/src/test/java/io/appium/java_client/utils/TestUtils.java similarity index 93% rename from src/test/java/io/appium/java_client/TestUtils.java rename to src/test/java/io/appium/java_client/utils/TestUtils.java index 5f8b11ddf..da1dd0cd5 100644 --- a/src/test/java/io/appium/java_client/TestUtils.java +++ b/src/test/java/io/appium/java_client/utils/TestUtils.java @@ -1,4 +1,4 @@ -package io.appium.java_client; +package io.appium.java_client.utils; import org.jspecify.annotations.Nullable; import org.openqa.selenium.Dimension; @@ -18,6 +18,9 @@ import java.util.function.Supplier; public class TestUtils { + public static final String IOS_SIM_VODQA_RELEASE_URL = + "https://github.com/appium/VodQAReactNative/releases/download/v1.0.1/VodQAReactNative-simulator-release.zip"; + private TestUtils() { }