Skip to content

Commit 7053413

Browse files
author
jvanderwee
committed
Updated appium java-client to 2.1.0
1 parent 03367a9 commit 7053413

8 files changed

Lines changed: 80 additions & 54 deletions

File tree

‎sample-code/examples/java/junit/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>io.appium</groupId>
2525
<artifactId>java-client</artifactId>
26-
<version>1.2.1</version>
26+
<version>2.1.0</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>com.googlecode.json-simple</groupId>

‎sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package com.saucelabs.appium;
22

33
import io.appium.java_client.AppiumDriver;
4+
import io.appium.java_client.android.AndroidDriver;
5+
6+
import java.io.File;
7+
import java.net.URL;
8+
import java.util.List;
9+
410
import org.junit.After;
511
import org.junit.Before;
612
import org.junit.Test;
@@ -9,10 +15,6 @@
915
import org.openqa.selenium.remote.CapabilityType;
1016
import org.openqa.selenium.remote.DesiredCapabilities;
1117

12-
import java.io.File;
13-
import java.net.URL;
14-
import java.util.List;
15-
1618
public class AndroidContactsTest {
1719
private AppiumDriver driver;
1820

@@ -30,7 +32,7 @@ public void setUp() throws Exception {
3032
capabilities.setCapability("app", app.getAbsolutePath());
3133
capabilities.setCapability("appPackage", "com.example.android.contactmanager");
3234
capabilities.setCapability("appActivity", ".ContactManager");
33-
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
35+
driver = new AndroidDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
3436
}
3537

3638
@After

‎sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
package com.saucelabs.appium;
22

3+
import static org.junit.Assert.assertEquals;
34
import io.appium.java_client.AppiumDriver;
5+
import io.appium.java_client.android.AndroidDriver;
6+
7+
import java.io.File;
8+
import java.net.URL;
9+
import java.util.List;
10+
411
import org.junit.After;
512
import org.junit.Before;
613
import org.junit.Test;
@@ -9,12 +16,6 @@
916
import org.openqa.selenium.remote.CapabilityType;
1017
import org.openqa.selenium.remote.DesiredCapabilities;
1118

12-
import java.io.File;
13-
import java.net.URL;
14-
import java.util.List;
15-
16-
import static org.junit.Assert.assertEquals;
17-
1819
public class AndroidTest {
1920

2021
private AppiumDriver driver;
@@ -32,7 +33,7 @@ public void setUp() throws Exception {
3233
capabilities.setCapability("app", app.getAbsolutePath());
3334
capabilities.setCapability("appPackage", "com.example.android.apis");
3435
capabilities.setCapability("appActivity", ".ApiDemos");
35-
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
36+
driver = new AndroidDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
3637
}
3738

3839
@After

‎sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package com.saucelabs.appium;
22

33
import io.appium.java_client.AppiumDriver;
4+
import io.appium.java_client.android.AndroidDriver;
5+
6+
import java.io.File;
7+
import java.net.URL;
8+
import java.util.Set;
9+
410
import org.junit.After;
511
import org.junit.Before;
612
import org.junit.Test;
@@ -9,10 +15,6 @@
915
import org.openqa.selenium.remote.CapabilityType;
1016
import org.openqa.selenium.remote.DesiredCapabilities;
1117

12-
import java.io.File;
13-
import java.net.URL;
14-
import java.util.Set;
15-
1618
public class AndroidWebViewTest {
1719
private AppiumDriver driver;
1820

@@ -28,7 +30,7 @@ public void setUp() throws Exception {
2830
capabilities.setCapability("app", app.getAbsolutePath());
2931
capabilities.setCapability("appPackage", "io.selendroid.testapp");
3032
capabilities.setCapability("appActivity", ".HomeScreenActivity");
31-
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
33+
driver = new AndroidDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
3234
}
3335
@After
3436
public void tearDown() throws Exception {

‎sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/MobileFindJavaTest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
package com.saucelabs.appium;
22

3-
import com.google.gson.JsonParser;
43
import io.appium.java_client.AppiumDriver;
4+
import io.appium.java_client.android.AndroidDriver;
5+
6+
import java.net.URL;
7+
58
import org.apache.http.client.HttpClient;
69
import org.apache.http.impl.client.HttpClients;
710
import org.junit.After;
@@ -10,7 +13,7 @@
1013
import org.openqa.selenium.remote.CapabilityType;
1114
import org.openqa.selenium.remote.DesiredCapabilities;
1215

13-
import java.net.URL;
16+
import com.google.gson.JsonParser;
1417

1518
public class MobileFindJavaTest {
1619

@@ -34,7 +37,7 @@ public void setUp() throws Exception {
3437
capabilities.setCapability("platformName", "Android");
3538
capabilities.setCapability("appPackage", "com.android.settings");
3639
capabilities.setCapability("appActivity", ".Settings");
37-
driver = new AppiumDriver(new URL(url), capabilities);
40+
driver = new AndroidDriver(new URL(url), capabilities);
3841
}
3942

4043
@After

‎sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SauceTest.java‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
package com.saucelabs.appium;
22

3-
import com.saucelabs.common.SauceOnDemandAuthentication;
4-
import com.saucelabs.common.SauceOnDemandSessionIdProvider;
5-
import com.saucelabs.junit.SauceOnDemandTestWatcher;
3+
import static org.junit.Assert.assertEquals;
64
import io.appium.java_client.AppiumDriver;
5+
import io.appium.java_client.ios.IOSDriver;
6+
7+
import java.net.URL;
8+
import java.text.MessageFormat;
9+
import java.util.ArrayList;
10+
import java.util.List;
11+
import java.util.Random;
12+
713
import org.junit.After;
814
import org.junit.Before;
915
import org.junit.Rule;
@@ -13,13 +19,9 @@
1319
import org.openqa.selenium.remote.DesiredCapabilities;
1420
import org.openqa.selenium.remote.RemoteWebDriver;
1521

16-
import java.net.URL;
17-
import java.text.MessageFormat;
18-
import java.util.ArrayList;
19-
import java.util.List;
20-
import java.util.Random;
21-
22-
import static org.junit.Assert.assertEquals;
22+
import com.saucelabs.common.SauceOnDemandAuthentication;
23+
import com.saucelabs.common.SauceOnDemandSessionIdProvider;
24+
import com.saucelabs.junit.SauceOnDemandTestWatcher;
2325

2426
/**
2527
* Simple test which demonstrates how to run an <a href="https://github.com/appium/appium">Appium</a>
@@ -76,7 +78,7 @@ public void setUp() throws Exception {
7678
capabilities.setCapability("appiumVersion", "1.3.4");
7779
capabilities.setCapability("app", "https://appium.s3.amazonaws.com/TestApp7.1.app.zip");
7880

79-
driver = new AppiumDriver(new URL(MessageFormat.format("http://{0}:{1}@ondemand.saucelabs.com:80/wd/hub", sauceUserName, sauceAccessKey)),
81+
driver = new IOSDriver(new URL(MessageFormat.format("http://{0}:{1}@ondemand.saucelabs.com:80/wd/hub", sauceUserName, sauceAccessKey)),
8082
capabilities);
8183
this.sessionId = ((RemoteWebDriver) driver).getSessionId().toString();
8284
values = new ArrayList<Integer>();

‎sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
package com.saucelabs.appium;
22

3+
import static org.junit.Assert.assertEquals;
4+
import static org.junit.Assert.assertTrue;
35
import io.appium.java_client.AppiumDriver;
46
import io.appium.java_client.MobileBy;
7+
import io.appium.java_client.ios.IOSDriver;
8+
9+
import java.io.File;
10+
import java.net.URL;
11+
import java.util.ArrayList;
12+
import java.util.List;
13+
import java.util.Random;
14+
515
import org.apache.http.HttpEntity;
616
import org.apache.http.HttpResponse;
717
import org.apache.http.client.HttpClient;
@@ -13,19 +23,14 @@
1323
import org.junit.After;
1424
import org.junit.Before;
1525
import org.junit.Test;
16-
import org.openqa.selenium.*;
26+
import org.openqa.selenium.Alert;
27+
import org.openqa.selenium.By;
28+
import org.openqa.selenium.Dimension;
29+
import org.openqa.selenium.Point;
30+
import org.openqa.selenium.WebElement;
1731
import org.openqa.selenium.remote.CapabilityType;
1832
import org.openqa.selenium.remote.DesiredCapabilities;
1933

20-
import java.io.File;
21-
import java.net.URL;
22-
import java.util.ArrayList;
23-
import java.util.List;
24-
import java.util.Random;
25-
26-
import static org.junit.Assert.assertEquals;
27-
import static org.junit.Assert.assertTrue;
28-
2934
/**
3035
* Simple <a href="https://github.com/appium/appium">Appium</a> test which runs against a local Appium instance deployed
3136
* with the 'TestApp' iPhone project which is included in the Appium source distribution.
@@ -52,7 +57,7 @@ public void setUp() throws Exception {
5257
capabilities.setCapability("platformName", "iOS");
5358
capabilities.setCapability("deviceName", "iPhone Simulator");
5459
capabilities.setCapability("app", app.getAbsolutePath());
55-
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
60+
driver = new IOSDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
5661
values = new ArrayList<Integer>();
5762
}
5863

‎sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
package com.saucelabs.appium;
22

3+
import static org.junit.Assert.assertEquals;
4+
import static org.junit.Assert.assertNotNull;
5+
import static org.junit.Assert.assertNotSame;
6+
import static org.junit.Assert.assertNull;
7+
import static org.junit.Assert.assertTrue;
38
import io.appium.java_client.AppiumDriver;
49
import io.appium.java_client.MobileElement;
10+
import io.appium.java_client.ios.IOSDriver;
11+
12+
import java.io.File;
13+
import java.net.URL;
14+
import java.util.List;
15+
516
import org.apache.commons.lang.RandomStringUtils;
617
import org.apache.http.HttpEntity;
718
import org.apache.http.HttpResponse;
@@ -14,18 +25,18 @@
1425
import org.junit.After;
1526
import org.junit.Before;
1627
import org.junit.Test;
17-
import org.openqa.selenium.*;
28+
import org.openqa.selenium.Alert;
29+
import org.openqa.selenium.Dimension;
30+
import org.openqa.selenium.NoSuchElementException;
31+
import org.openqa.selenium.OutputType;
32+
import org.openqa.selenium.Point;
33+
import org.openqa.selenium.TakesScreenshot;
34+
import org.openqa.selenium.WebDriver;
35+
import org.openqa.selenium.WebElement;
1836
import org.openqa.selenium.interactions.Actions;
1937
import org.openqa.selenium.remote.Augmenter;
2038
import org.openqa.selenium.remote.CapabilityType;
2139
import org.openqa.selenium.remote.DesiredCapabilities;
22-
import org.openqa.selenium.remote.RemoteWebElement;
23-
24-
import java.io.File;
25-
import java.net.URL;
26-
import java.util.List;
27-
28-
import static org.junit.Assert.*;
2940

3041
/**
3142
* <a href="https://github.com/appium/appium">Appium</a> test which runs against a local Appium instance deployed
@@ -51,7 +62,7 @@ public void setUp() throws Exception {
5162
capabilities.setCapability("platformName", "iOS");
5263
capabilities.setCapability("deviceName", "iPhone Simulator");
5364
capabilities.setCapability("app", app.getAbsolutePath());
54-
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
65+
driver = new IOSDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
5566
}
5667

5768
@After
@@ -61,7 +72,7 @@ public void tearDown() throws Exception {
6172

6273
private void openMenuPosition(int index) {
6374
//populate text fields with two random number
64-
MobileElement table = new MobileElement((RemoteWebElement)driver.findElementByClassName("UIATableView"), driver);
75+
MobileElement table = (MobileElement)driver.findElementByClassName("UIATableView");
6576
row = table.findElementsByClassName("UIATableCell").get(index);
6677
row.click();
6778
}
@@ -76,7 +87,7 @@ private Point getCenter(WebElement element) {
7687
@Test
7788
public void testFindElement() throws Exception {
7889
//first view in UICatalog is a table
79-
MobileElement table = new MobileElement((RemoteWebElement)driver.findElementByClassName("UIATableView"), driver);
90+
MobileElement table = (MobileElement)driver.findElementByClassName("UIATableView");
8091
assertNotNull(table);
8192
//is number of cells/rows inside table correct
8293
List<WebElement> rows = table.findElementsByClassName("UIATableCell");

0 commit comments

Comments
 (0)