Merge pull request appium-boneyard#82 from saikrishna321/master

imurchie · imurchie · commit 10cd649e6cae · 2016-04-25T08:18:33.000-07:00
updated java_client version and fixed tests By.name
diff --git a/sample-code/examples/java/generic/pom.xml b/sample-code/examples/java/generic/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>io.appium</groupId>
             <artifactId>java-client</artifactId>
-            <version>2.1.0</version>
+            <version>3.4.1</version>
         </dependency>
         <dependency>
             <groupId>com.saucelabs</groupId>
diff --git a/sample-code/examples/java/junit/pom.xml b/sample-code/examples/java/junit/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>io.appium</groupId>
             <artifactId>java-client</artifactId>
-            <version>3.3.0</version>
+            <version>3.4.1</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
@@ -3,18 +3,17 @@
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.android.AndroidElement;
-
-import java.io.File;
-import java.net.URL;
-import java.util.List;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
 public class AndroidContactsTest {
     private AppiumDriver<AndroidElement> driver;
 
@@ -40,13 +39,13 @@ public void tearDown() throws Exception {
 
     @Test
     public void addContact(){
-        WebElement el = driver.findElement(By.name("Add Contact"));
+        WebElement el = driver.findElement(By.xpath(".//*[@text='Add Contact']"));
         el.click();
         List<AndroidElement> textFieldsList = driver.findElementsByClassName("android.widget.EditText");
         textFieldsList.get(0).sendKeys("Some Name");
         textFieldsList.get(2).sendKeys("Some@example.com");
         driver.swipe(100, 500, 100, 100, 2);
-        driver.findElementByName("Save").click();
+        driver.findElementByXPath(".//*[@text='Save']").click();
     }
 
 }
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
@@ -1,20 +1,20 @@
 package com.saucelabs.appium;
 
-import static org.junit.Assert.assertEquals;
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.android.AndroidDriver;
-
-import java.io.File;
-import java.net.URL;
-import java.util.List;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
 public class AndroidTest {
 
     private AppiumDriver<WebElement> driver;
@@ -40,11 +40,11 @@ public void tearDown() throws Exception {
 
     @Test
     public void apiDemo(){
-        WebElement el = driver.findElement(By.name("Animation"));
+        WebElement el = driver.findElement(By.xpath(".//*[@text=Animation]"));
         assertEquals("Animation", el.getText());
         el = driver.findElementByClassName("android.widget.TextView");
         assertEquals("API Demos", el.getText());
-        el = driver.findElement(By.name("App"));
+        el = driver.findElement(By.xpath(".//*[@text='App']"));
         el.click();
         List<WebElement> els = driver.findElementsByClassName("android.widget.TextView");
         assertEquals("Activity", els.get(2).getText());
