Skip to content

Commit a139d9b

Browse files
test: Use Api-Demos.apk downloaded from Github releases
1 parent cfb7c7f commit a139d9b

File tree

7 files changed

+13
-22
lines changed

7 files changed

+13
-22
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import io.appium.java_client.android.options.UiAutomator2Options;
2020
import io.appium.java_client.service.local.AppiumDriverLocalService;
2121
import io.appium.java_client.service.local.AppiumServiceBuilder;
22+
import io.appium.java_client.utils.TestUtils;
2223
import org.junit.jupiter.api.AfterAll;
2324
import org.junit.jupiter.api.BeforeAll;
2425

@@ -45,7 +46,7 @@ public class BaseAndroidTest {
4546
UiAutomator2Options options = new UiAutomator2Options()
4647
.setDeviceName("Android Emulator")
4748
.enableBiDi()
48-
.setApp(TestResources.API_DEMOS_APK.toString())
49+
.setApp(TestUtils.ANDROID_APIDEMOS_APK_URL)
4950
.eventTimings();
5051
driver = new AndroidDriver(service.getUrl(), options);
5152
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import io.appium.java_client.android.options.EspressoOptions;
2020
import io.appium.java_client.service.local.AppiumDriverLocalService;
2121
import io.appium.java_client.service.local.AppiumServerHasNotBeenStartedLocallyException;
22+
import io.appium.java_client.utils.TestUtils;
2223
import org.junit.jupiter.api.AfterAll;
2324
import org.junit.jupiter.api.BeforeAll;
2425

@@ -42,7 +43,7 @@ public class BaseEspressoTest {
4243

4344
EspressoOptions options = new EspressoOptions()
4445
.setDeviceName("Android Emulator")
45-
.setApp(TestResources.API_DEMOS_APK.toString())
46+
.setApp(TestUtils.ANDROID_APIDEMOS_APK_URL)
4647
.eventTimings();
4748
driver = new AndroidDriver(service.getUrl(), options);
4849
}

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

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/e2eAndroidTest/java/io/appium/java_client/service/local/ServerBuilderTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.appium.java_client.service.local;
22

3-
import io.appium.java_client.android.TestResources;
43
import io.appium.java_client.android.options.UiAutomator2Options;
54
import io.appium.java_client.utils.TestUtils;
65
import io.github.bonigarcia.wdm.WebDriverManager;
@@ -148,7 +147,7 @@ void checkAbilityToStartServiceUsingCapabilities() {
148147
.setNewCommandTimeout(Duration.ofSeconds(60))
149148
.setAppPackage("io.appium.android.apis")
150149
.setAppActivity(".view.WebView1")
151-
.setApp(TestResources.API_DEMOS_APK.toString())
150+
.setApp(TestUtils.ANDROID_APIDEMOS_APK_URL)
152151
.setChromedriverExecutable(chromeManager.getDownloadedDriverPath());
153152

154153
service = new AppiumServiceBuilder().withCapabilities(options).build();
@@ -164,7 +163,7 @@ void checkAbilityToStartServiceUsingCapabilitiesAndFlags() {
164163
.setNewCommandTimeout(Duration.ofSeconds(60))
165164
.setAppPackage("io.appium.android.apis")
166165
.setAppActivity(".view.WebView1")
167-
.setApp(TestResources.API_DEMOS_APK.toString())
166+
.setApp(TestUtils.ANDROID_APIDEMOS_APK_URL)
168167
.setChromedriverExecutable(chromeManager.getDownloadedDriverPath())
169168
.amend("winPath", "C:\\selenium\\app.apk")
170169
.amend("unixPath", "/selenium/app.apk")

src/e2eAndroidTest/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package io.appium.java_client.service.local;
1818

1919
import io.appium.java_client.android.AndroidDriver;
20-
import io.appium.java_client.android.TestResources;
2120
import io.appium.java_client.android.options.UiAutomator2Options;
21+
import io.appium.java_client.utils.TestUtils;
2222
import io.appium.java_client.remote.AutomationName;
2323
import io.appium.java_client.remote.MobilePlatform;
2424
import io.appium.java_client.service.local.flags.GeneralServerFlag;
@@ -44,7 +44,7 @@ void startingAndroidAppWithCapabilitiesOnlyTest() {
4444
AndroidDriver driver = new AndroidDriver(new UiAutomator2Options()
4545
.setDeviceName("Android Emulator")
4646
.autoGrantPermissions()
47-
.setApp(TestResources.API_DEMOS_APK.toString()));
47+
.setApp(TestUtils.ANDROID_APIDEMOS_APK_URL));
4848
try {
4949
Capabilities caps = driver.getCapabilities();
5050

@@ -53,7 +53,7 @@ void startingAndroidAppWithCapabilitiesOnlyTest() {
5353
);
5454
assertEquals(AutomationName.ANDROID_UIAUTOMATOR2, caps.getCapability(AUTOMATION_NAME_OPTION));
5555
assertNotNull(caps.getCapability(DEVICE_NAME_OPTION));
56-
assertEquals(TestResources.API_DEMOS_APK.toString(), caps.getCapability(APP_OPTION));
56+
assertEquals(TestUtils.ANDROID_APIDEMOS_APK_URL, caps.getCapability(APP_OPTION));
5757
} finally {
5858
driver.quit();
5959
}
@@ -68,7 +68,7 @@ void startingAndroidAppWithCapabilitiesAndServiceTest() {
6868
AndroidDriver driver = new AndroidDriver(builder, new UiAutomator2Options()
6969
.setDeviceName("Android Emulator")
7070
.autoGrantPermissions()
71-
.setApp(TestResources.API_DEMOS_APK.toString()));
71+
.setApp(TestUtils.ANDROID_APIDEMOS_APK_URL));
7272
try {
7373
Capabilities caps = driver.getCapabilities();
7474

@@ -88,7 +88,7 @@ void startingAndroidAppWithCapabilitiesAndFlagsOnServerSideTest() {
8888
.fullReset()
8989
.autoGrantPermissions()
9090
.setNewCommandTimeout(Duration.ofSeconds(60))
91-
.setApp(TestResources.API_DEMOS_APK.toString());
91+
.setApp(TestUtils.ANDROID_APIDEMOS_APK_URL);
9292

9393
WebDriverManager chromeManager = chromedriver();
9494
chromeManager.setup();
-2.94 MB
Binary file not shown.

src/test/java/io/appium/java_client/utils/TestUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
public class TestUtils {
3737
public static final String IOS_SIM_VODQA_RELEASE_URL =
3838
"https://github.com/appium/VodQAReactNative/releases/download/v1.2.3/VodQAReactNative-simulator-release.zip";
39+
public static final String ANDROID_APIDEMOS_APK_URL =
40+
"https://github.com/appium/android-apidemos/releases/download/v6.0.2/ApiDemos-debug.apk";
3941

4042
private TestUtils() {
4143
}

0 commit comments

Comments
 (0)