Jave samples have been synchronized with java_client v3.0

TikhomirovSergey · TikhomirovSergey · commit 95ff53a610aa · 2015-06-22T01:28:23.000+03:00
diff --git a/sample-code/examples/java/junit/pom.xml b/sample-code/examples/java/junit/pom.xml
@@ -14,16 +14,10 @@
 			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>selenium-java</artifactId>
-			<version>LATEST</version>
-			<scope>test</scope>
-		</dependency>
         <dependency>
             <groupId>io.appium</groupId>
             <artifactId>java-client</artifactId>
-            <version>2.1.0</version>
+            <version>3.0.0</version>
         </dependency>
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java
@@ -15,7 +15,7 @@
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 public class AndroidContactsTest {
-    private AppiumDriver driver;
+    private AppiumDriver<WebElement> driver;
 
     @Before
     public void setUp() throws Exception {
@@ -29,7 +29,7 @@ public void setUp() throws Exception {
         capabilities.setCapability("app", app.getAbsolutePath());
         capabilities.setCapability("appPackage", "com.example.android.contactmanager");
         capabilities.setCapability("appActivity", ".ContactManager");
-        driver = new AndroidDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+        driver = new AndroidDriver<>(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
     }
 
     @After
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidPageObjectTest_ByAllPossible.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidPageObjectTest_ByAllPossible.java
@@ -1,5 +1,6 @@
 package com.saucelabs.appium;
 
+import io.appium.java_client.MobileElement;
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
 import io.appium.java_client.remote.MobileCapabilityType;
@@ -45,7 +46,7 @@ public void setUp() throws Exception {
 	    DesiredCapabilities capabilities = new DesiredCapabilities();
 	    capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
 	    capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
-	    driver = new AndroidDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+	    driver = new AndroidDriver<MobileElement>(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
         
 	    apiDemosPageObject = new ApiDemosListViewScreenByAllPossible();
 		PageFactory.initElements(new AppiumFieldDecorator(driver, 5, TimeUnit.SECONDS), 
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidPageObjectTest_Chained.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidPageObjectTest_Chained.java
@@ -1,5 +1,6 @@
 package com.saucelabs.appium;
 
+import io.appium.java_client.MobileElement;
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
 import io.appium.java_client.remote.MobileCapabilityType;
@@ -45,7 +46,7 @@ public void setUp() throws Exception {
 	    DesiredCapabilities capabilities = new DesiredCapabilities();
 	    capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
 	    capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
-	    driver = new AndroidDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+	    driver = new AndroidDriver<MobileElement>(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
         
 	    apiDemosPageObject = new ApiDemosListViewScreenChaided();
 		PageFactory.initElements(new AppiumFieldDecorator(driver, 5, TimeUnit.SECONDS), 
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidPageObjectTest_PageObjectLikeComplexElement.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidPageObjectTest_PageObjectLikeComplexElement.java
@@ -1,5 +1,6 @@
 package com.saucelabs.appium;
 
+import io.appium.java_client.MobileElement;
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
 import io.appium.java_client.remote.MobileCapabilityType;
@@ -49,7 +50,7 @@ public void setUp() throws Exception {
 	    DesiredCapabilities capabilities = new DesiredCapabilities();
 	    capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
 	    capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
-	    driver = new AndroidDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+	    driver = new AndroidDriver<MobileElement>(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
         
 	    apiDemosPageObject = new ApiDemosListViewScreenSimple();
 		PageFactory.initElements(new AppiumFieldDecorator(driver.
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidPageObjectTest_Simple.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidPageObjectTest_Simple.java
@@ -1,5 +1,6 @@
 package com.saucelabs.appium;
 
+import io.appium.java_client.MobileElement;
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
 import io.appium.java_client.remote.MobileCapabilityType;
@@ -31,7 +32,7 @@ public void setUp() throws Exception {
 	    DesiredCapabilities capabilities = new DesiredCapabilities();
 	    capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
 	    capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
-	    driver = new AndroidDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+	    driver = new AndroidDriver<MobileElement>(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
         
 	    apiDemosPageObject = new ApiDemosListViewScreenSimple();
 	    //This time out is set because test can be run on slow Android SDK emulator
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java
@@ -17,7 +17,7 @@
 
 public class AndroidTest {
 
-    private AppiumDriver driver;
+    private AppiumDriver<WebElement> driver;
 
     @Before
     public void setUp() throws Exception {
@@ -30,7 +30,7 @@ public void setUp() throws Exception {
         capabilities.setCapability("app", app.getAbsolutePath());
         capabilities.setCapability("appPackage", "io.appium.android.apis");
         capabilities.setCapability("appActivity", ".ApiDemos");
-        driver = new AndroidDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+        driver = new AndroidDriver<>(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
     }
 
     @After
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java
@@ -15,7 +15,7 @@
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 public class AndroidWebViewTest {
-    private AppiumDriver driver;
+    private AppiumDriver<WebElement> driver;
 
     @Before
     public void setUp() throws Exception {
@@ -28,7 +28,7 @@ public void setUp() throws Exception {
         capabilities.setCapability("app", app.getAbsolutePath());
         capabilities.setCapability("appPackage", "io.selendroid.testapp");
         capabilities.setCapability("appActivity", ".HomeScreenActivity");
-        driver = new AndroidDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+        driver = new AndroidDriver<WebElement>(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
     }
     @After
     public void tearDown() throws Exception {
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/MobileFindJavaTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/MobileFindJavaTest.java
@@ -12,7 +12,7 @@
 
 public class MobileFindJavaTest {
 
-  private AppiumDriver            driver;
+  private AppiumDriver<?>            driver;
   private static final String     url    = "http://127.0.0.1:4723/wd/hub";
 
   @Test
@@ -28,7 +28,7 @@ public void setUp() throws Exception {
     capabilities.setCapability("deviceName", "Android Emulator");
     capabilities.setCapability("appPackage", "com.android.settings");
     capabilities.setCapability("appActivity", ".Settings");
-    driver = new AndroidDriver(new URL(url), capabilities);
+    driver = new AndroidDriver<>(new URL(url), capabilities);
   }
 
   @After
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SafariTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SafariTest.java
@@ -37,7 +37,7 @@ public void setUp() throws Exception {
         capabilities.setCapability("platformName", "iOS");
         capabilities.setCapability("platformVersion", "8.1");
         capabilities.setCapability("browserName", "safari");
-        driver = new IOSDriver(new URL("http://127.0.0.1:4723/wd/hub"),
+        driver = new IOSDriver<WebElement>(new URL("http://127.0.0.1:4723/wd/hub"),
                 capabilities);
         //driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
     }
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SauceTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SauceTest.java
@@ -37,7 +37,7 @@
  */
 public class SauceTest implements SauceOnDemandSessionIdProvider {
 
-    private AppiumDriver driver;
+    private AppiumDriver<WebElement> driver;
 
     private List<Integer> values;
 
@@ -74,7 +74,7 @@ public void setUp() throws Exception {
         capabilities.setCapability("appiumVersion", "1.3.4");
         capabilities.setCapability("app", "https://appium.s3.amazonaws.com/TestApp7.1.app.zip");
 
-        driver = new IOSDriver(new URL(MessageFormat.format("http://{0}:{1}@ondemand.saucelabs.com:80/wd/hub", sauceUserName, sauceAccessKey)),
+        driver = new IOSDriver<WebElement>(new URL(MessageFormat.format("http://{0}:{1}@ondemand.saucelabs.com:80/wd/hub", sauceUserName, sauceAccessKey)),
                 capabilities);
         this.sessionId = driver.getSessionId().toString();
         values = new ArrayList<Integer>();
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java
@@ -39,7 +39,7 @@
 @SuppressWarnings("deprecation")
 public class SimpleTest {
 
-    private AppiumDriver driver;
+    private AppiumDriver<WebElement> driver;
 
     private List<Integer> values;
 
@@ -55,7 +55,7 @@ public void setUp() throws Exception {
         capabilities.setCapability("platformVersion", "8.1");
         capabilities.setCapability("deviceName", "iPhone 6");
         capabilities.setCapability("app", app.getAbsolutePath());
-        driver = new IOSDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+        driver = new IOSDriver<WebElement>(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
         values = new ArrayList<Integer>();
     }
 
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java
@@ -46,7 +46,7 @@
 @SuppressWarnings("deprecation")
 public class UICatalogTest {
 
-    private AppiumDriver driver;
+    private AppiumDriver<MobileElement> driver;
 
     private WebElement row;
 
@@ -60,7 +60,7 @@ public void setUp() throws Exception {
         capabilities.setCapability("platformVersion", "8.1");
         capabilities.setCapability("deviceName", "iPhone 6");
         capabilities.setCapability("app", app.getAbsolutePath());
-        driver = new IOSDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+        driver = new IOSDriver<MobileElement>(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
     }
 
     @After
@@ -88,7 +88,7 @@ public void testFindElement() throws Exception {
         MobileElement table = (MobileElement)driver.findElementByClassName("UIATableView");
         assertNotNull(table);
         //is number of cells/rows inside table correct
-        List<WebElement> rows = table.findElementsByClassName("UIATableCell");
+        List<MobileElement> rows = table.findElementsByClassName("UIATableCell");
         assertEquals(12, rows.size());
         //is first one about buttons
         assertEquals("Buttons, Various uses of UIButton", rows.get(0).getAttribute("name"));
@@ -156,7 +156,7 @@ public void testAlertInteraction() {
         openMenuPosition(10);
 
         //trigger modal alert with cancel & ok buttons
-        List<WebElement> triggerOkCancel = driver.findElementsByAccessibilityId("Show OK-Cancel");
+        List<MobileElement> triggerOkCancel = driver.findElementsByAccessibilityId("Show OK-Cancel");
         triggerOkCancel.get(1).click();
         Alert alert = driver.switchTo().alert();
         //check if title of alert is correct
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/iOSPageObjectTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/iOSPageObjectTest.java
@@ -1,5 +1,6 @@
 package com.saucelabs.appium;
 
+import io.appium.java_client.MobileElement;
 import io.appium.java_client.ios.IOSDriver;
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
 import io.appium.java_client.remote.MobileCapabilityType;
@@ -49,7 +50,7 @@ public void setUp() throws Exception {
 	    capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
 	    
 	    uiTestApp = new TestAppScreenSimple();
-	    driver = new IOSDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+	    driver = new IOSDriver<MobileElement>(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
 
 		PageFactory.initElements(new AppiumFieldDecorator(driver), uiTestApp);
 	}

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public void setUp() throws Exception {`
`37`	`37`	`capabilities.setCapability("platformName", "iOS");`
`38`	`38`	`capabilities.setCapability("platformVersion", "8.1");`
`39`	`39`	`capabilities.setCapability("browserName", "safari");`
`40`		`- driver = new IOSDriver(new URL("http://127.0.0.1:4723/wd/hub"),`
	`40`	`+ driver = new IOSDriver<WebElement>(new URL("http://127.0.0.1:4723/wd/hub"),`
`41`	`41`	`capabilities);`
`42`	`42`	`//driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);`
`43`	`43`	`}`