From f1c08d5bb5baab1a84e7ed1ffe00e0955d87a981 Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Sat, 17 May 2025 06:04:35 +0200 Subject: [PATCH 1/6] test: Run tests with appium3 beta --- .github/workflows/gradle.yml | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index cd70a8203..022278087 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -92,15 +92,15 @@ jobs: - name: Install Appium if: ${{ matrix.e2e-tests }} - run: npm install --location=global appium + run: npm install --location=global appium@beta - name: Install UIA2 driver if: matrix.e2e-tests == 'android' || matrix.e2e-tests == 'flutter-android' - run: appium driver install uiautomator2 + run: appium driver install uiautomator2@beta - - name: Install Flutter Integration driver - if: matrix.e2e-tests == 'flutter-android' || matrix.e2e-tests == 'flutter-ios' - run: appium driver install appium-flutter-integration-driver --source npm + # - name: Install Flutter Integration driver + # if: matrix.e2e-tests == 'flutter-android' || matrix.e2e-tests == 'flutter-ios' + # run: appium driver install appium-flutter-integration-driver --source npm - name: Run Android E2E tests if: matrix.e2e-tests == 'android' @@ -113,16 +113,16 @@ jobs: disable-animations: true target: ${{ env.ANDROID_EMU_TARGET }} - - name: Run Flutter Android E2E tests - if: matrix.e2e-tests == 'flutter-android' - uses: reactivecircus/android-emulator-runner@v2 - with: - script: ./gradlew e2eFlutterTest -Pplatform="android" -Pselenium.version=$latest_snapshot -PisCI -PflutterApp=${{ env.FLUTTER_ANDROID_APP }} - api-level: ${{ env.ANDROID_SDK_VERSION }} - avd-name: ${{ env.ANDROID_EMU_NAME }} - disable-spellchecker: true - disable-animations: true - target: ${{ env.ANDROID_EMU_TARGET }} + # - name: Run Flutter Android E2E tests + # if: matrix.e2e-tests == 'flutter-android' + # uses: reactivecircus/android-emulator-runner@v2 + # with: + # script: ./gradlew e2eFlutterTest -Pplatform="android" -Pselenium.version=$latest_snapshot -PisCI -PflutterApp=${{ env.FLUTTER_ANDROID_APP }} + # api-level: ${{ env.ANDROID_SDK_VERSION }} + # avd-name: ${{ env.ANDROID_EMU_NAME }} + # disable-spellchecker: true + # disable-animations: true + # target: ${{ env.ANDROID_EMU_TARGET }} - name: Select Xcode if: matrix.e2e-tests == 'ios' || matrix.e2e-tests == 'flutter-ios' @@ -137,7 +137,7 @@ jobs: os_version: "${{ env.IOS_PLATFORM_VERSION }}" - name: Install XCUITest driver if: matrix.e2e-tests == 'ios' || matrix.e2e-tests == 'flutter-ios' - run: appium driver install xcuitest + run: appium driver install xcuitest@beta - name: Prebuild XCUITest driver if: matrix.e2e-tests == 'ios' || matrix.e2e-tests == 'flutter-ios' run: appium driver run xcuitest build-wda --sdk=${{ env.IOS_PLATFORM_VERSION }} --name='${{ env.IOS_DEVICE_NAME }}' @@ -145,6 +145,6 @@ jobs: if: matrix.e2e-tests == 'ios' run: ./gradlew e2eIosTest -PisCI -Pselenium.version=$latest_snapshot - - name: Run Flutter iOS E2E tests - if: matrix.e2e-tests == 'flutter-ios' - run: ./gradlew e2eFlutterTest -Pplatform="ios" -Pselenium.version=$latest_snapshot -PisCI -PflutterApp=${{ env.FLUTTER_IOS_APP }} + # - name: Run Flutter iOS E2E tests + # if: matrix.e2e-tests == 'flutter-ios' + # run: ./gradlew e2eFlutterTest -Pplatform="ios" -Pselenium.version=$latest_snapshot -PisCI -PflutterApp=${{ env.FLUTTER_IOS_APP }} From 27be599767465bd03b79a2f2cf899c48022e43a7 Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Sat, 17 May 2025 06:39:25 +0200 Subject: [PATCH 2/6] fix compilation --- .../pagefactory_tests/widget/tests/AbstractStubWebDriver.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java index 636d33c4e..c2ec16949 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java @@ -155,17 +155,14 @@ public Cookie getCookieNamed(String name) { @Override public Timeouts timeouts() { return new Timeouts() { - @Override public Timeouts implicitlyWait(long time, TimeUnit unit) { return this; } - @Override public Timeouts setScriptTimeout(long time, TimeUnit unit) { return this; } - @Override public Timeouts pageLoadTimeout(long time, TimeUnit unit) { return this; } From b278889f7b8dcbcb431b722702828f374562214a Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Sat, 17 May 2025 06:48:55 +0200 Subject: [PATCH 3/6] moar --- .../widget/tests/AbstractStubWebDriver.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java index c2ec16949..acc316921 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java @@ -154,19 +154,7 @@ public Cookie getCookieNamed(String name) { @Override public Timeouts timeouts() { - return new Timeouts() { - public Timeouts implicitlyWait(long time, TimeUnit unit) { - return this; - } - - public Timeouts setScriptTimeout(long time, TimeUnit unit) { - return this; - } - - public Timeouts pageLoadTimeout(long time, TimeUnit unit) { - return this; - } - }; + return new TimeoutsImpl(); } @Override @@ -181,6 +169,21 @@ public Logs logs() { }; } + private static class TimeoutsImpl implements Timeouts { + + public Timeouts implicitlyWait(long time, TimeUnit unit) { + return this; + } + + public Timeouts setScriptTimeout(long time, TimeUnit unit) { + return this; + } + + public Timeouts pageLoadTimeout(long time, TimeUnit unit) { + return this; + } + } + public static class StubAndroidDriver extends AbstractStubWebDriver { @Override From a102334d19c7a8cfd017d2520cf721ef8691d2bc Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Sat, 17 May 2025 06:57:01 +0200 Subject: [PATCH 4/6] moar --- .../widget/tests/AbstractStubWebDriver.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java index acc316921..aab4b1a31 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java @@ -11,6 +11,7 @@ import org.openqa.selenium.logging.Logs; import org.openqa.selenium.remote.Response; +import java.time.Duration; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -175,13 +176,25 @@ public Timeouts implicitlyWait(long time, TimeUnit unit) { return this; } + public Timeouts implicitlyWait(Duration duration) { + return this; + } + public Timeouts setScriptTimeout(long time, TimeUnit unit) { return this; } + public Timeouts setScriptTimeout(Duration duration) { + return this; + } + public Timeouts pageLoadTimeout(long time, TimeUnit unit) { return this; } + + public Timeouts pageLoadTimeout(Duration duration) { + return this; + } } public static class StubAndroidDriver extends AbstractStubWebDriver { From b409c98e36bf18a7359eaabfd4ed2a09e678dc06 Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Sat, 17 May 2025 08:06:38 +0200 Subject: [PATCH 5/6] update test --- .../java/io/appium/java_client/ios/IOSDriverTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 438178e36..70289fd85 100644 --- a/src/e2eIosTest/java/io/appium/java_client/ios/IOSDriverTest.java +++ b/src/e2eIosTest/java/io/appium/java_client/ios/IOSDriverTest.java @@ -50,9 +50,9 @@ public void setupEach() { @Test public void addCustomCommandTest() { - driver.addCommand(HttpMethod.GET, "/sessions", "getSessions"); - final Response getSessions = driver.execute("getSessions"); - assertNotNull(getSessions.getSessionId()); + driver.addCommand(HttpMethod.GET, "/status", "getStatus"); + final Response getStatus = driver.execute("getStatus"); + assertNotNull(getStatus.getSessionId()); } @Test From 16376c3169834933a7d96fe791e31cc148e2354c Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Sat, 17 May 2025 08:08:04 +0200 Subject: [PATCH 6/6] moar --- .../java/io/appium/java_client/ios/IOSDriverTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 70289fd85..9b2d7db4b 100644 --- a/src/e2eIosTest/java/io/appium/java_client/ios/IOSDriverTest.java +++ b/src/e2eIosTest/java/io/appium/java_client/ios/IOSDriverTest.java @@ -51,8 +51,7 @@ public void setupEach() { @Test public void addCustomCommandTest() { driver.addCommand(HttpMethod.GET, "/status", "getStatus"); - final Response getStatus = driver.execute("getStatus"); - assertNotNull(getStatus.getSessionId()); + assertNotNull(driver.execute("getStatus")); } @Test