Merge pull request macaca-sample#8 from baozhida/master

xudafeng · web-flow · commit fb94603e7b80 · 2018-04-28T15:38:11.000+08:00
adapt wd.java version 2.0.24
diff --git a/pom.xml b/pom.xml
@@ -15,6 +15,7 @@
                 <configuration>
                     <source>1.5</source>
                     <target>1.5</target>
+                    <encoding>utf8</encoding>
                 </configuration>
             </plugin>
             <plugin>
@@ -44,7 +45,7 @@
         <dependency>
             <groupId>macaca.webdriver.client</groupId>
             <artifactId>macacaclient</artifactId>
-            <version>2.0.20</version>
+            <version>2.0.24</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
diff --git a/src/test/java/macaca/client/AndroidSampleTest.java b/src/test/java/macaca/client/AndroidSampleTest.java
@@ -3,15 +3,15 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
-import macaca.client.commands.Element;
-import macaca.client.common.ElementSelector;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
+import macaca.client.commands.Element;
 
 import static org.hamcrest.CoreMatchers.containsString;
 
@@ -68,8 +68,8 @@ public void loginTest() throws Exception {
         driver.elementById("com.github.android_app_bootstrap:id/mobileNoEditText")
                 .sendKeys("中文+Test+12345678");
 
-        ElementSelector selector = driver.elementsByClassName("android.widget.EditText");
-        selector.getIndex(1).sendKeys("111111");
+        List<Element> elements = driver.elementsByClassName("android.widget.EditText");
+        elements.get(1).sendKeys("111111");
         driver.elementByName("Login").click();
         driver.sleep(1000);
     }
diff --git a/src/test/java/macaca/client/DesktopSampleTest.java b/src/test/java/macaca/client/DesktopSampleTest.java
@@ -67,7 +67,7 @@ public void testCaseThree() throws Exception {
         System.out.println("test case #3");
 
         driver.get("https://www.baidu.com");
-        driver.elementsByXPath("//*[@id=\"u1\"]/a").getIndex(0).click();
+        driver.elementsByXPath("//*[@id=\"u1\"]/a").get(0).click();
         driver.sleep(3000);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void testCaseThree() throws Exception {`
`67`	`67`	`System.out.println("test case #3");`
`68`	`68`
`69`	`69`	`driver.get("https://www.baidu.com");`
`70`		`- driver.elementsByXPath("//*[@id=\"u1\"]/a").getIndex(0).click();`
	`70`	`+ driver.elementsByXPath("//*[@id=\"u1\"]/a").get(0).click();`
`71`	`71`	`driver.sleep(3000);`
`72`	`72`	`}`
`73`	`73`