diff --git a/src/e2eAndroidTest/java/io/appium/java_client/android/BaseAndroidTest.java b/src/e2eAndroidTest/java/io/appium/java_client/android/BaseAndroidTest.java index d56c8ca45..1325a0f85 100644 --- a/src/e2eAndroidTest/java/io/appium/java_client/android/BaseAndroidTest.java +++ b/src/e2eAndroidTest/java/io/appium/java_client/android/BaseAndroidTest.java @@ -19,6 +19,7 @@ import io.appium.java_client.android.options.UiAutomator2Options; import io.appium.java_client.service.local.AppiumDriverLocalService; import io.appium.java_client.service.local.AppiumServiceBuilder; +import io.appium.java_client.utils.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -45,7 +46,7 @@ public class BaseAndroidTest { UiAutomator2Options options = new UiAutomator2Options() .setDeviceName("Android Emulator") .enableBiDi() - .setApp(TestResources.API_DEMOS_APK.toString()) + .setApp(TestUtils.ANDROID_APIDEMOS_APK_URL) .eventTimings(); driver = new AndroidDriver(service.getUrl(), options); } diff --git a/src/e2eAndroidTest/java/io/appium/java_client/android/BaseEspressoTest.java b/src/e2eAndroidTest/java/io/appium/java_client/android/BaseEspressoTest.java index f26469cb8..2245b1be3 100644 --- a/src/e2eAndroidTest/java/io/appium/java_client/android/BaseEspressoTest.java +++ b/src/e2eAndroidTest/java/io/appium/java_client/android/BaseEspressoTest.java @@ -19,6 +19,7 @@ import io.appium.java_client.android.options.EspressoOptions; import io.appium.java_client.service.local.AppiumDriverLocalService; import io.appium.java_client.service.local.AppiumServerHasNotBeenStartedLocallyException; +import io.appium.java_client.utils.TestUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -42,7 +43,7 @@ public class BaseEspressoTest { EspressoOptions options = new EspressoOptions() .setDeviceName("Android Emulator") - .setApp(TestResources.API_DEMOS_APK.toString()) + .setApp(TestUtils.ANDROID_APIDEMOS_APK_URL) .eventTimings(); driver = new AndroidDriver(service.getUrl(), options); } diff --git a/src/e2eAndroidTest/java/io/appium/java_client/android/TestResources.java b/src/e2eAndroidTest/java/io/appium/java_client/android/TestResources.java deleted file mode 100644 index 373241fe4..000000000 --- a/src/e2eAndroidTest/java/io/appium/java_client/android/TestResources.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.appium.java_client.android; - -import io.appium.java_client.utils.TestUtils; - -import java.nio.file.Path; - -public class TestResources { - public static final Path API_DEMOS_APK = TestUtils.resourcePathToAbsolutePath("ApiDemos-debug.apk"); - - private TestResources() { - } -} 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 a73a00dad..235e7a5e9 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,6 +1,5 @@ package io.appium.java_client.service.local; -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; @@ -148,7 +147,7 @@ void checkAbilityToStartServiceUsingCapabilities() { .setNewCommandTimeout(Duration.ofSeconds(60)) .setAppPackage("io.appium.android.apis") .setAppActivity(".view.WebView1") - .setApp(TestResources.API_DEMOS_APK.toString()) + .setApp(TestUtils.ANDROID_APIDEMOS_APK_URL) .setChromedriverExecutable(chromeManager.getDownloadedDriverPath()); service = new AppiumServiceBuilder().withCapabilities(options).build(); @@ -164,7 +163,7 @@ void checkAbilityToStartServiceUsingCapabilitiesAndFlags() { .setNewCommandTimeout(Duration.ofSeconds(60)) .setAppPackage("io.appium.android.apis") .setAppActivity(".view.WebView1") - .setApp(TestResources.API_DEMOS_APK.toString()) + .setApp(TestUtils.ANDROID_APIDEMOS_APK_URL) .setChromedriverExecutable(chromeManager.getDownloadedDriverPath()) .amend("winPath", "C:\\selenium\\app.apk") .amend("unixPath", "/selenium/app.apk") diff --git a/src/e2eAndroidTest/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java b/src/e2eAndroidTest/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java index 77a7cc585..131610d35 100644 --- a/src/e2eAndroidTest/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java +++ b/src/e2eAndroidTest/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java @@ -17,11 +17,11 @@ package io.appium.java_client.service.local; import io.appium.java_client.android.AndroidDriver; -import io.appium.java_client.android.TestResources; import io.appium.java_client.android.options.UiAutomator2Options; 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 io.github.bonigarcia.wdm.WebDriverManager; import org.junit.jupiter.api.Test; import org.openqa.selenium.Capabilities; @@ -44,7 +44,7 @@ void startingAndroidAppWithCapabilitiesOnlyTest() { AndroidDriver driver = new AndroidDriver(new UiAutomator2Options() .setDeviceName("Android Emulator") .autoGrantPermissions() - .setApp(TestResources.API_DEMOS_APK.toString())); + .setApp(TestUtils.ANDROID_APIDEMOS_APK_URL)); try { Capabilities caps = driver.getCapabilities(); @@ -53,7 +53,7 @@ void startingAndroidAppWithCapabilitiesOnlyTest() { ); assertEquals(AutomationName.ANDROID_UIAUTOMATOR2, caps.getCapability(AUTOMATION_NAME_OPTION)); assertNotNull(caps.getCapability(DEVICE_NAME_OPTION)); - assertEquals(TestResources.API_DEMOS_APK.toString(), caps.getCapability(APP_OPTION)); + assertEquals(TestUtils.ANDROID_APIDEMOS_APK_URL, caps.getCapability(APP_OPTION)); } finally { driver.quit(); } @@ -68,7 +68,7 @@ void startingAndroidAppWithCapabilitiesAndServiceTest() { AndroidDriver driver = new AndroidDriver(builder, new UiAutomator2Options() .setDeviceName("Android Emulator") .autoGrantPermissions() - .setApp(TestResources.API_DEMOS_APK.toString())); + .setApp(TestUtils.ANDROID_APIDEMOS_APK_URL)); try { Capabilities caps = driver.getCapabilities(); @@ -88,7 +88,7 @@ void startingAndroidAppWithCapabilitiesAndFlagsOnServerSideTest() { .fullReset() .autoGrantPermissions() .setNewCommandTimeout(Duration.ofSeconds(60)) - .setApp(TestResources.API_DEMOS_APK.toString()); + .setApp(TestUtils.ANDROID_APIDEMOS_APK_URL); WebDriverManager chromeManager = chromedriver(); chromeManager.setup(); diff --git a/src/e2eAndroidTest/resources/ApiDemos-debug.apk b/src/e2eAndroidTest/resources/ApiDemos-debug.apk deleted file mode 100644 index 62a1fd607..000000000 Binary files a/src/e2eAndroidTest/resources/ApiDemos-debug.apk and /dev/null differ diff --git a/src/test/java/io/appium/java_client/utils/TestUtils.java b/src/test/java/io/appium/java_client/utils/TestUtils.java index 92cb215aa..8aa90892c 100644 --- a/src/test/java/io/appium/java_client/utils/TestUtils.java +++ b/src/test/java/io/appium/java_client/utils/TestUtils.java @@ -36,6 +36,8 @@ public class TestUtils { public static final String IOS_SIM_VODQA_RELEASE_URL = "https://github.com/appium/VodQAReactNative/releases/download/v1.2.3/VodQAReactNative-simulator-release.zip"; + public static final String ANDROID_APIDEMOS_APK_URL = + "https://github.com/appium/android-apidemos/releases/download/v6.0.2/ApiDemos-debug.apk"; private TestUtils() { }