From 01389d5a24169923a03d4686b67c50294aff3e18 Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Fri, 3 Jun 2022 22:18:58 +0200 Subject: [PATCH 1/5] test: Check new beta version --- .../io/appium/java_client/remote/options/W3CCapabilityKeys.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/appium/java_client/remote/options/W3CCapabilityKeys.java b/src/main/java/io/appium/java_client/remote/options/W3CCapabilityKeys.java index b29150311..de3af0199 100644 --- a/src/main/java/io/appium/java_client/remote/options/W3CCapabilityKeys.java +++ b/src/main/java/io/appium/java_client/remote/options/W3CCapabilityKeys.java @@ -3,7 +3,7 @@ * you may not use this file except in compliance with the License. * See the NOTICE file distributed with this work for additional * information regarding copyright ownership. - * You may obtain a copy of the License at + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * From 0e25586d52799d7fd8d8b5da60b92f566d434f94 Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Sat, 4 Jun 2022 12:28:43 +0200 Subject: [PATCH 2/5] rerun --- .../io/appium/java_client/remote/options/W3CCapabilityKeys.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/appium/java_client/remote/options/W3CCapabilityKeys.java b/src/main/java/io/appium/java_client/remote/options/W3CCapabilityKeys.java index de3af0199..b29150311 100644 --- a/src/main/java/io/appium/java_client/remote/options/W3CCapabilityKeys.java +++ b/src/main/java/io/appium/java_client/remote/options/W3CCapabilityKeys.java @@ -3,7 +3,7 @@ * you may not use this file except in compliance with the License. * See the NOTICE file distributed with this work for additional * information regarding copyright ownership. - * You may obtain a copy of the License at + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * From e8b1d701e870f87034282cd58218fef591d8c3bb Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Sat, 4 Jun 2022 15:14:25 +0200 Subject: [PATCH 3/5] Update Android tests --- .../service/local/StartingAppLocallyAndroidTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java b/src/test/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java index ee7eb82e2..34b0e2565 100644 --- a/src/test/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java +++ b/src/test/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java @@ -46,7 +46,7 @@ public void startingAndroidAppWithCapabilitiesOnlyTest() { Capabilities caps = driver.getCapabilities(); assertTrue(MobilePlatform.ANDROID.equalsIgnoreCase( - (String) caps.getCapability(MobileCapabilityType.PLATFORM_NAME)) + String.valueOf(caps.getCapability(MobileCapabilityType.PLATFORM_NAME))) ); assertEquals(AutomationName.ANDROID_UIAUTOMATOR2, caps.getCapability(MobileCapabilityType.AUTOMATION_NAME)); assertNotNull(caps.getCapability(MobileCapabilityType.DEVICE_NAME)); @@ -70,7 +70,7 @@ public void startingAndroidAppWithCapabilitiesAndServiceTest() { Capabilities caps = driver.getCapabilities(); assertTrue(MobilePlatform.ANDROID.equalsIgnoreCase( - (String) caps.getCapability(MobileCapabilityType.PLATFORM_NAME)) + String.valueOf(caps.getCapability(MobileCapabilityType.PLATFORM_NAME))) ); assertNotNull(caps.getCapability(MobileCapabilityType.DEVICE_NAME)); } finally { @@ -105,7 +105,7 @@ public void startingAndroidAppWithCapabilitiesAndFlagsOnServerSideTest() { Capabilities caps = driver.getCapabilities(); assertTrue(MobilePlatform.ANDROID.equalsIgnoreCase( - (String) caps.getCapability(MobileCapabilityType.PLATFORM_NAME)) + String.valueOf(caps.getCapability(MobileCapabilityType.PLATFORM_NAME))) ); assertNotNull(caps.getCapability(MobileCapabilityType.DEVICE_NAME)); } finally { From 51e262f720d8201260d8fad9cc19c586598384b7 Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Sat, 4 Jun 2022 17:58:19 +0200 Subject: [PATCH 4/5] Update tests --- .../widget/tests/AbstractStubWebDriver.java | 32 ++++++------------- .../tests/combined/CombinedAppTest.java | 2 -- .../tests/combined/CombinedWidgetTest.java | 7 ++-- 3 files changed, 12 insertions(+), 29 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 b9b9d097e..bea245a99 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 @@ -1,7 +1,7 @@ package io.appium.java_client.pagefactory_tests.widget.tests; import static com.google.common.collect.ImmutableList.of; -import static io.appium.java_client.remote.AutomationName.APPIUM; +import static io.appium.java_client.remote.AutomationName.ANDROID_UIAUTOMATOR2; import static io.appium.java_client.remote.AutomationName.IOS_XCUI_TEST; import static io.appium.java_client.remote.MobilePlatform.ANDROID; import static io.appium.java_client.remote.MobilePlatform.IOS; @@ -13,13 +13,12 @@ import org.openqa.selenium.Capabilities; import org.openqa.selenium.Cookie; import org.openqa.selenium.HasCapabilities; +import org.openqa.selenium.ImmutableCapabilities; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.logging.Logs; -import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.Response; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -115,10 +114,10 @@ public String getAutomationName() { @Override public Capabilities getCapabilities() { - Map caps = new HashMap<>(); - caps.put("platformName", getPlatformName()); - caps.put("automationName", getAutomationName()); - return new DesiredCapabilities(caps); + return new ImmutableCapabilities( + "appium:platformName", getPlatformName(), + "appium:automationName", getAutomationName() + ); } @Override @@ -200,20 +199,7 @@ public String getPlatformName() { @Override public String getAutomationName() { - return APPIUM; - } - } - - public static class StubIOSDriver extends AbstractStubWebDriver { - - @Override - public String getPlatformName() { - return IOS; - } - - @Override - public String getAutomationName() { - return APPIUM; + return ANDROID_UIAUTOMATOR2; } } @@ -239,7 +225,7 @@ public String getPlatformName() { @Override public String getAutomationName() { - return APPIUM; + return WINDOWS; } } @@ -265,7 +251,7 @@ public String getPlatformName() { @Override public String getAutomationName() { - return APPIUM; + return ANDROID; } @Override diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedAppTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedAppTest.java index a0d87a4f8..1416cdc42 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedAppTest.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedAppTest.java @@ -42,8 +42,6 @@ public static Collection data() { DefaultFindByWidget.class), dataArray(new PartiallyCombinedApp(), new AbstractStubWebDriver.StubAndroidDriver(), DefaultAndroidWidget.class), - dataArray(new PartiallyCombinedApp(), new AbstractStubWebDriver.StubIOSDriver(), - DefaultStubWidget.class), dataArray(new PartiallyCombinedApp(), new AbstractStubWebDriver.StubIOSXCUITDriver(), DefaultStubWidget.class), dataArray(new PartiallyCombinedApp(), new AbstractStubWebDriver.StubWindowsDriver(), diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java index 253603e2d..cbae48bcc 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java @@ -2,9 +2,9 @@ import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; import io.appium.java_client.pagefactory.OverrideWidget; import io.appium.java_client.pagefactory_tests.widget.tests.AbstractApp; @@ -23,6 +23,7 @@ import java.util.List; +@SuppressWarnings({"unchecked", "unused"}) @RunWith(Parameterized.class) public class CombinedWidgetTest extends WidgetTest { @@ -48,8 +49,6 @@ public static Collection data() { new AbstractStubWebDriver.StubAndroidBrowserOrWebViewDriver(), DefaultFindByWidget.class), dataArray(new AppWithPartiallyCombinedWidgets(), new AbstractStubWebDriver.StubAndroidDriver(), DefaultAndroidWidget.class), - dataArray(new AppWithPartiallyCombinedWidgets(), - new AbstractStubWebDriver.StubIOSDriver(), DefaultStubWidget.class), dataArray(new AppWithPartiallyCombinedWidgets(), new AbstractStubWebDriver.StubIOSXCUITDriver(), DefaultStubWidget.class), dataArray(new AppWithPartiallyCombinedWidgets(), @@ -68,7 +67,7 @@ public CombinedWidgetTest(AbstractApp app, WebDriver driver, Class widgetClas @Override public void checkThatWidgetsAreCreatedCorrectly() { - assertThat("Excpected widget class was " + widgetClass.getName(), + assertThat("Expected widget class was " + widgetClass.getName(), app.getWidget().getSubWidget().getSelfReference().getClass(), equalTo(widgetClass)); From 0b79932d4952d6ea6bb42c44a30551372c98f812 Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Sat, 4 Jun 2022 18:35:10 +0200 Subject: [PATCH 5/5] Update deprecations --- .../widget/tests/combined/CombinedAppTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedAppTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedAppTest.java index 1416cdc42..9953578be 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedAppTest.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedAppTest.java @@ -2,9 +2,9 @@ import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; import io.appium.java_client.pagefactory.OverrideWidget; import io.appium.java_client.pagefactory_tests.widget.tests.AbstractApp; @@ -20,6 +20,7 @@ import java.util.Collection; import java.util.List; +@SuppressWarnings({"unused", "unchecked"}) @RunWith(Parameterized.class) public class CombinedAppTest extends WidgetTest { @@ -60,7 +61,7 @@ public CombinedAppTest(AbstractApp app, WebDriver driver, Class