Skip to content

Commit 329daab

Browse files
test: Fetch VodQA test app dynamically (#2360)
1 parent b6123db commit 329daab

File tree

13 files changed

+21
-17
lines changed

13 files changed

+21
-17
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.appium.java_client.android;
22

3-
import io.appium.java_client.TestUtils;
3+
import io.appium.java_client.utils.TestUtils;
44

55
import java.nio.file.Path;
66

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

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

3-
import io.appium.java_client.TestUtils;
43
import io.appium.java_client.android.TestResources;
54
import io.appium.java_client.android.options.UiAutomator2Options;
5+
import io.appium.java_client.utils.TestUtils;
66
import io.github.bonigarcia.wdm.WebDriverManager;
77
import org.junit.jupiter.api.AfterEach;
88
import org.junit.jupiter.api.BeforeAll;
@@ -17,14 +17,14 @@
1717
import java.util.List;
1818
import java.util.Map;
1919

20-
import static io.appium.java_client.TestUtils.getLocalIp4Address;
2120
import static io.appium.java_client.service.local.AppiumDriverLocalService.buildDefaultService;
2221
import static io.appium.java_client.service.local.AppiumServiceBuilder.APPIUM_PATH;
2322
import static io.appium.java_client.service.local.AppiumServiceBuilder.BROADCAST_IP4_ADDRESS;
2423
import static io.appium.java_client.service.local.AppiumServiceBuilder.DEFAULT_APPIUM_PORT;
2524
import static io.appium.java_client.service.local.flags.GeneralServerFlag.BASEPATH;
2625
import static io.appium.java_client.service.local.flags.GeneralServerFlag.CALLBACK_ADDRESS;
2726
import static io.appium.java_client.service.local.flags.GeneralServerFlag.SESSION_OVERRIDE;
27+
import static io.appium.java_client.utils.TestUtils.getLocalIp4Address;
2828
import static io.github.bonigarcia.wdm.WebDriverManager.chromedriver;
2929
import static java.lang.System.getProperty;
3030
import static java.lang.System.setProperty;

src/e2eFlutterTest/java/io/appium/java_client/android/CommandTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.appium.java_client.android;
22

33
import io.appium.java_client.AppiumBy;
4-
import io.appium.java_client.TestUtils;
54
import io.appium.java_client.flutter.commands.DoubleClickParameter;
65
import io.appium.java_client.flutter.commands.DragAndDropParameter;
76
import io.appium.java_client.flutter.commands.LongPressParameter;
87
import io.appium.java_client.flutter.commands.ScrollParameter;
98
import io.appium.java_client.flutter.commands.WaitParameter;
9+
import io.appium.java_client.utils.TestUtils;
1010
import org.junit.jupiter.api.Test;
1111
import org.openqa.selenium.Point;
1212
import org.openqa.selenium.WebElement;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.appium.java_client.ios;
22

3-
import io.appium.java_client.TestUtils;
43
import io.appium.java_client.ios.options.XCUITestOptions;
4+
import io.appium.java_client.utils.TestUtils;
55
import org.junit.jupiter.api.BeforeAll;
66
import org.openqa.selenium.SessionNotCreatedException;
77

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,31 @@
1616

1717
package io.appium.java_client.ios;
1818

19-
import io.appium.java_client.TestUtils;
2019
import io.appium.java_client.ios.options.XCUITestOptions;
2120
import org.junit.jupiter.api.BeforeAll;
2221
import org.openqa.selenium.SessionNotCreatedException;
2322

23+
import java.io.IOException;
24+
import java.net.URL;
2425
import java.time.Duration;
2526
import java.util.function.Supplier;
2627

27-
public class BaseIOSWebViewTest extends BaseIOSTest {
28-
private static final String VODQA_ZIP = TestUtils.resourcePathToAbsolutePath("vodqa.zip").toString();
28+
import static io.appium.java_client.utils.TestUtils.IOS_SIM_VODQA_RELEASE_URL;
2929

30+
public class BaseIOSWebViewTest extends BaseIOSTest {
3031
private static final Duration WEB_VIEW_DETECT_INTERVAL = Duration.ofSeconds(2);
3132
private static final Duration WEB_VIEW_DETECT_DURATION = Duration.ofSeconds(30);
3233

3334
@BeforeAll
34-
public static void beforeClass() {
35+
public static void beforeClass() throws IOException {
3536
startAppiumServer();
3637

3738
XCUITestOptions options = new XCUITestOptions()
3839
.setPlatformVersion(PLATFORM_VERSION)
3940
.setDeviceName(DEVICE_NAME)
4041
.setWdaLaunchTimeout(WDA_LAUNCH_TIMEOUT)
4142
.setCommandTimeouts(Duration.ofSeconds(240))
42-
.setApp(VODQA_ZIP);
43+
.setApp(new URL(IOS_SIM_VODQA_RELEASE_URL));
4344
if (PREBUILT_WDA_PATH != null) {
4445
options.usePreinstalledWda().setPrebuiltWdaPath(PREBUILT_WDA_PATH);
4546
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.appium.java_client.ios;
1818

1919
import io.appium.java_client.NoSuchContextException;
20-
import io.appium.java_client.TestUtils;
20+
import io.appium.java_client.utils.TestUtils;
2121
import org.junit.jupiter.api.Assumptions;
2222
import org.junit.jupiter.api.Test;
2323

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import java.time.Duration;
3232
import java.util.Map;
3333

34-
import static io.appium.java_client.TestUtils.waitUntilTrue;
34+
import static io.appium.java_client.utils.TestUtils.waitUntilTrue;
3535
import static org.hamcrest.MatcherAssert.assertThat;
3636
import static org.hamcrest.Matchers.greaterThan;
3737
import static org.junit.jupiter.api.Assertions.assertEquals;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.appium.java_client.ios;
22

33
import io.appium.java_client.AppiumBy;
4-
import io.appium.java_client.TestUtils;
4+
import io.appium.java_client.utils.TestUtils;
55
import org.junit.jupiter.api.Assumptions;
66
import org.junit.jupiter.api.Test;
77
import org.openqa.selenium.By;

src/e2eIosTest/java/io/appium/java_client/service/local/StartingAppLocallyIosTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
package io.appium.java_client.service.local;
1818

19-
import io.appium.java_client.TestUtils;
2019
import io.appium.java_client.ios.BaseIOSTest;
2120
import io.appium.java_client.ios.IOSDriver;
2221
import io.appium.java_client.ios.options.XCUITestOptions;
2322
import io.appium.java_client.remote.AutomationName;
2423
import io.appium.java_client.remote.MobilePlatform;
2524
import io.appium.java_client.service.local.flags.GeneralServerFlag;
25+
import io.appium.java_client.utils.TestUtils;
2626
import org.junit.jupiter.api.Test;
2727
import org.openqa.selenium.Capabilities;
2828
import org.openqa.selenium.Platform;

src/e2eIosTest/resources/vodqa.zip

-2.91 MB
Binary file not shown.

0 commit comments

Comments
 (0)