test: Update e2e tests (#1706)

Author: mykola-mokhnach

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<String, Object> 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

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 {
 
@@ -42,8 +43,6 @@ public static Collection<Object[]> 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(),
@@ -62,7 +61,7 @@ public CombinedAppTest(AbstractApp app, WebDriver driver, Class<? extends Defaul
 
     @Override
     public void checkThatWidgetsAreCreatedCorrectly() {
-        assertThat("Excpected widget class was " + widgetClass.getName(),
+        assertThat("Expected widget class was " + widgetClass.getName(),
                 app.getWidget().getSelfReference().getClass(),
                 equalTo(widgetClass));
 

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<Object[]> 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));
 

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 {