Skip to content

Commit d8cf93c

Browse files
mykola-mokhnachmykola-mokhnach
authored
tests: Remove obsolete API calls from tests (appium#2006)
1 parent 2fd8c0c commit d8cf93c

16 files changed

+55
-220
lines changed

‎src/test/java/io/appium/java_client/android/AndroidAbilityToUseSupplierTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.appium.java_client.android;
22

3+
import com.google.common.collect.ImmutableMap;
34
import io.appium.java_client.AppiumBy;
45
import io.appium.java_client.functions.ActionSupplier;
56
import io.appium.java_client.touch.offset.ElementOption;
@@ -46,8 +47,7 @@ public class AndroidAbilityToUseSupplierTest extends BaseAndroidTest {
4647
.release();
4748

4849
@Test public void horizontalSwipingWithSupplier() {
49-
Activity activity = new Activity("io.appium.android.apis", ".view.Gallery1");
50-
driver.startActivity(activity);
50+
startActivity(".view.Gallery1");
5151
WebElement gallery = driver.findElement(By.id("io.appium.android.apis:id/gallery"));
5252
List<WebElement> images = gallery.findElements(AppiumBy.className("android.widget.ImageView"));
5353
int originalImageCount = images.size();
@@ -59,7 +59,8 @@ public class AndroidAbilityToUseSupplierTest extends BaseAndroidTest {
5959
}
6060

6161
@Test public void verticalSwipingWithSupplier() throws Exception {
62-
driver.resetApp();
62+
driver.executeScript("mobile: terminateApp", ImmutableMap.of("appId", APP_ID));
63+
driver.executeScript("mobile: activateApp", ImmutableMap.of("appId", APP_ID));
6364
driver.findElement(AppiumBy.accessibilityId("Views")).click();
6465

6566
Point originalLocation = driver.findElement(AppiumBy.accessibilityId("Gallery")).getLocation();

‎src/test/java/io/appium/java_client/android/AndroidActivityTest.java

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎src/test/java/io/appium/java_client/android/AndroidContextTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
public class AndroidContextTest extends BaseAndroidTest {
2727

2828
@BeforeAll public static void beforeClass2() throws Exception {
29-
Activity activity = new Activity("io.appium.android.apis", ".view.WebView1");
30-
driver.startActivity(activity);
29+
startActivity(".view.WebView1");
3130
Thread.sleep(20000);
3231
}
3332

‎src/test/java/io/appium/java_client/android/AndroidDriverTest.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package io.appium.java_client.android;
1818

19+
import com.google.common.collect.ImmutableMap;
1920
import io.appium.java_client.appmanagement.ApplicationState;
2021
import org.apache.commons.io.FileUtils;
2122
import org.hamcrest.Matchers;
@@ -148,8 +149,8 @@ public void isAppNotInstalledTest() {
148149

149150
@Test
150151
public void closeAppTest() {
151-
driver.closeApp();
152-
driver.launchApp();
152+
driver.executeScript("mobile: terminateApp", ImmutableMap.of("appId", APP_ID));
153+
driver.executeScript("mobile: activateApp", ImmutableMap.of("appId", APP_ID));
153154
assertEquals(".ApiDemos", driver.currentActivity());
154155
}
155156

@@ -241,11 +242,6 @@ public void pullFileTest() {
241242
assert (data.length > 0);
242243
}
243244

244-
@Test
245-
public void resetTest() {
246-
driver.resetApp();
247-
}
248-
249245
@Test
250246
public void deviceDetailsAndKeyboardTest() {
251247
assertFalse(driver.isKeyboardShown());
@@ -255,7 +251,7 @@ public void deviceDetailsAndKeyboardTest() {
255251

256252
@Test
257253
public void getSupportedPerformanceDataTypesTest() {
258-
driver.startActivity(new Activity(APP_ID, ".ApiDemos"));
254+
startActivity(".ApiDemos");
259255

260256
List<String> dataTypes = new ArrayList<>();
261257
dataTypes.add("cpuinfo");
@@ -270,13 +266,11 @@ public void getSupportedPerformanceDataTypesTest() {
270266
for (int i = 0; i < supportedPerformanceDataTypes.size(); ++i) {
271267
assertEquals(dataTypes.get(i), supportedPerformanceDataTypes.get(i));
272268
}
273-
274-
275269
}
276270

277271
@Test
278272
public void getPerformanceDataTest() {
279-
driver.startActivity(new Activity(APP_ID, ".ApiDemos"));
273+
startActivity(".ApiDemos");
280274

281275
List<String> supportedPerformanceDataTypes = driver.getSupportedPerformanceDataTypes();
282276

‎src/test/java/io/appium/java_client/android/AndroidElementTest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
public class AndroidElementTest extends BaseAndroidTest {
3131

3232
@BeforeEach public void setup() {
33-
Activity activity = new Activity("io.appium.android.apis", ".ApiDemos");
34-
driver.startActivity(activity);
33+
startActivity(".ApiDemos");
3534
}
3635

3736

@@ -57,8 +56,7 @@ public class AndroidElementTest extends BaseAndroidTest {
5756
@Test public void replaceValueTest() {
5857
String originalValue = "original value";
5958

60-
Activity activity = new Activity("io.appium.android.apis", ".view.Controls1");
61-
driver.startActivity(activity);
59+
startActivity(".view.Controls1");
6260
WebElement editElement = driver
6361
.findElement(AppiumBy.androidUIAutomator("resourceId(\"io.appium.android.apis:id/edit\")"));
6462
editElement.sendKeys(originalValue);
@@ -81,8 +79,7 @@ public class AndroidElementTest extends BaseAndroidTest {
8179
@Test public void setValueTest() {
8280
String value = "new value";
8381

84-
Activity activity = new Activity("io.appium.android.apis", ".view.Controls1");
85-
driver.startActivity(activity);
82+
startActivity(".view.Controls1");
8683
WebElement editElement = driver
8784
.findElement(AppiumBy.androidUIAutomator("resourceId(\"io.appium.android.apis:id/edit\")"));
8885
editElement.sendKeys(value);

‎src/test/java/io/appium/java_client/android/AndroidFunctionTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ public class AndroidFunctionTest extends BaseAndroidTest {
6868
@BeforeAll
6969
public static void startWebViewActivity() {
7070
if (driver != null) {
71-
Activity activity = new Activity("io.appium.android.apis", ".view.WebView1");
72-
driver.startActivity(activity);
71+
startActivity(".view.WebView1");
7372
}
7473
}
7574

‎src/test/java/io/appium/java_client/android/AndroidScreenRecordTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ public class AndroidScreenRecordTest extends BaseAndroidTest {
1515

1616
@BeforeEach
1717
public void setUp() {
18-
Activity activity = new Activity("io.appium.android.apis", ".ApiDemos");
19-
driver.startActivity(activity);
18+
startActivity(".ApiDemos");
2019
}
2120

2221
@Test

‎src/test/java/io/appium/java_client/android/AndroidSearchingTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public class AndroidSearchingTest extends BaseAndroidTest {
3030

3131
@BeforeEach
3232
public void setup() {
33-
Activity activity = new Activity("io.appium.android.apis", ".ApiDemos");
34-
driver.startActivity(activity);
33+
startActivity(".ApiDemos");
3534
}
3635

3736
@Test public void findByAccessibilityIdTest() {

‎src/test/java/io/appium/java_client/android/AndroidTouchTest.java

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.appium.java_client.android;
22

3+
import com.google.common.collect.ImmutableMap;
34
import io.appium.java_client.AppiumBy;
45
import io.appium.java_client.MultiTouchAction;
56
import io.appium.java_client.TouchAction;
@@ -25,12 +26,12 @@ public class AndroidTouchTest extends BaseAndroidTest {
2526

2627
@BeforeEach
2728
public void setUp() {
28-
driver.resetApp();
29+
driver.executeScript("mobile: terminateApp", ImmutableMap.of("appId", APP_ID));
30+
driver.executeScript("mobile: activateApp", ImmutableMap.of("appId", APP_ID));
2931
}
3032

3133
@Test public void dragNDropByElementTest() {
32-
Activity activity = new Activity("io.appium.android.apis", ".view.DragAndDropDemo");
33-
driver.startActivity(activity);
34+
startActivity(".view.DragAndDropDemo");
3435
WebElement dragDot1 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_1"));
3536
WebElement dragDot3 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_3"));
3637

@@ -46,8 +47,7 @@ public void setUp() {
4647
}
4748

4849
@Test public void dragNDropByElementAndDurationTest() {
49-
Activity activity = new Activity("io.appium.android.apis", ".view.DragAndDropDemo");
50-
driver.startActivity(activity);
50+
startActivity(".view.DragAndDropDemo");
5151
WebElement dragDot1 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_1"));
5252
WebElement dragDot3 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_3"));
5353

@@ -65,8 +65,7 @@ public void setUp() {
6565
}
6666

6767
@Test public void dragNDropByCoordinatesTest() {
68-
Activity activity = new Activity("io.appium.android.apis", ".view.DragAndDropDemo");
69-
driver.startActivity(activity);
68+
startActivity(".view.DragAndDropDemo");
7069
WebElement dragDot1 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_1"));
7170
WebElement dragDot3 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_3"));
7271

@@ -85,8 +84,7 @@ public void setUp() {
8584
}
8685

8786
@Test public void dragNDropByCoordinatesAndDurationTest() {
88-
Activity activity = new Activity("io.appium.android.apis", ".view.DragAndDropDemo");
89-
driver.startActivity(activity);
87+
startActivity(".view.DragAndDropDemo");
9088
WebElement dragDot1 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_1"));
9189
WebElement dragDot3 = driver.findElement(By.id("io.appium.android.apis:id/drag_dot_3"));
9290

@@ -107,8 +105,7 @@ public void setUp() {
107105
}
108106

109107
@Test public void pressByCoordinatesTest() {
110-
Activity activity = new Activity("io.appium.android.apis", ".view.Buttons1");
111-
driver.startActivity(activity);
108+
startActivity(".view.Buttons1");
112109
Point point = driver.findElement(By.id("io.appium.android.apis:id/button_toggle")).getLocation();
113110
new TouchAction(driver)
114111
.press(point(point.x + 20, point.y + 30))
@@ -119,8 +116,7 @@ public void setUp() {
119116
}
120117

121118
@Test public void pressByElementTest() {
122-
Activity activity = new Activity("io.appium.android.apis", ".view.Buttons1");
123-
driver.startActivity(activity);
119+
startActivity(".view.Buttons1");
124120
new TouchAction(driver)
125121
.press(element(driver.findElement(By.id("io.appium.android.apis:id/button_toggle"))))
126122
.waitAction(waitOptions(ofSeconds(1)))
@@ -130,8 +126,7 @@ public void setUp() {
130126
}
131127

132128
@Test public void tapActionTestByElement() throws Exception {
133-
Activity activity = new Activity("io.appium.android.apis", ".view.ChronometerDemo");
134-
driver.startActivity(activity);
129+
startActivity(".view.ChronometerDemo");
135130
WebElement chronometer = driver.findElement(By.id("io.appium.android.apis:id/chronometer"));
136131

137132
TouchAction startStop = new TouchAction(driver)
@@ -148,8 +143,7 @@ public void setUp() {
148143
}
149144

150145
@Test public void tapActionTestByCoordinates() throws Exception {
151-
Activity activity = new Activity("io.appium.android.apis", ".view.ChronometerDemo");
152-
driver.startActivity(activity);
146+
startActivity(".view.ChronometerDemo");
153147
WebElement chronometer = driver.findElement(By.id("io.appium.android.apis:id/chronometer"));
154148

155149
Point center1 = getCenter(driver.findElement(By.id("io.appium.android.apis:id/start")));
@@ -166,8 +160,7 @@ public void setUp() {
166160
}
167161

168162
@Test public void horizontalSwipingTest() {
169-
Activity activity = new Activity("io.appium.android.apis", ".view.Gallery1");
170-
driver.startActivity(activity);
163+
startActivity(".view.Gallery1");
171164

172165
WebElement gallery = driver.findElement(By.id("io.appium.android.apis:id/gallery"));
173166
List<WebElement> images = gallery.findElements(AppiumBy.className("android.widget.ImageView"));
@@ -186,8 +179,7 @@ public void setUp() {
186179
}
187180

188181
@Test public void multiTouchTest() {
189-
Activity activity = new Activity("io.appium.android.apis", ".view.Buttons1");
190-
driver.startActivity(activity);
182+
startActivity(".view.Buttons1");
191183
TouchAction press = new TouchAction(driver)
192184
.press(element(driver.findElement(By.id("io.appium.android.apis:id/button_toggle"))))
193185
.waitAction(waitOptions(ofSeconds(1)))

‎src/test/java/io/appium/java_client/android/BaseAndroidTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package io.appium.java_client.android;
1818

19+
import com.google.common.collect.ImmutableMap;
1920
import io.appium.java_client.android.options.UiAutomator2Options;
2021
import io.appium.java_client.service.local.AppiumDriverLocalService;
2122
import io.appium.java_client.service.local.AppiumServiceBuilder;
@@ -59,4 +60,13 @@ public class BaseAndroidTest {
5960
service.stop();
6061
}
6162
}
63+
64+
public static void startActivity(String name) {
65+
driver.executeScript(
66+
"mobile: startActivity",
67+
ImmutableMap.of(
68+
"component", String.format("%s/%s", APP_ID, name)
69+
)
70+
);
71+
}
6272
}

‎src/test/java/io/appium/java_client/android/ClipboardTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package io.appium.java_client.android;
1818

19+
import com.google.common.collect.ImmutableMap;
1920
import org.junit.jupiter.api.BeforeEach;
2021
import org.junit.jupiter.api.Test;
2122

@@ -24,7 +25,8 @@
2425
public class ClipboardTest extends BaseAndroidTest {
2526

2627
@BeforeEach public void setUp() {
27-
driver.resetApp();
28+
driver.executeScript("mobile: terminateApp", ImmutableMap.of("appId", APP_ID));
29+
driver.executeScript("mobile: activateApp", ImmutableMap.of("appId", APP_ID));
2830
}
2931

3032
@Test public void verifySetAndGetClipboardText() {

0 commit comments

Comments
 (0)