Skip to content

Commit 3aa020c

Browse files
author
Eric Millin
committed
added startActivity function
1 parent c53ca79 commit 3aa020c

File tree

6 files changed

+72
-112
lines changed

6 files changed

+72
-112
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Javadocs: http://appium.github.io/java-client/
2121
More can be found in the docs, but here's a quick list of features which this project has added to the usual selenium binding.
2222

2323

24+
- startActivity()
2425
- resetApp()
2526
- getAppString()
2627
- sendKeyEvent()

‎java-client.iml‎

Lines changed: 1 addition & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,3 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
4-
<output url="file://$MODULE_DIR$/target/classes" />
5-
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6-
<content url="file://$MODULE_DIR$">
7-
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="false" />
8-
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9-
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
10-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
11-
<excludeFolder url="file://$MODULE_DIR$/target" />
12-
</content>
13-
<orderEntry type="inheritedJdk" />
14-
<orderEntry type="sourceFolder" forTests="false" />
15-
<orderEntry type="library" name="hamcrest-core-1.3" level="project" />
16-
<orderEntry type="library" name="httpcore-4.3.2" level="project" />
17-
<orderEntry type="library" name="commons-logging-1.1.3" level="project" />
18-
<orderEntry type="library" name="commons-core-1.2.2" level="project" />
19-
<orderEntry type="library" name="commons-lang-2.4" level="project" />
20-
<orderEntry type="library" name="commons-codec-1.9" level="project" />
21-
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
22-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.42.2" level="project" />
23-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:2.42.2" level="project" />
24-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:2.42.2" level="project" />
25-
<orderEntry type="library" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
26-
<orderEntry type="library" name="Maven: org.json:json:20080701" level="project" />
27-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.42.2" level="project" />
28-
<orderEntry type="library" name="Maven: com.google.guava:guava:17.0" level="project" />
29-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" level="project" />
30-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
31-
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
32-
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
33-
<orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.1" level="project" />
34-
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:3.4.0" level="project" />
35-
<orderEntry type="library" name="Maven: net.java.dev.jna:platform:3.4.0" level="project" />
36-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-htmlunit-driver:2.42.2" level="project" />
37-
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.14" level="project" />
38-
<orderEntry type="library" name="Maven: xalan:xalan:2.7.1" level="project" />
39-
<orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
40-
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
41-
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
42-
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.2.1" level="project" />
43-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.2" level="project" />
44-
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.14" level="project" />
45-
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
46-
<orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.20" level="project" />
47-
<orderEntry type="library" name="Maven: net.sourceforge.cssparser:cssparser:0.9.13" level="project" />
48-
<orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
49-
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
50-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-websocket:8.1.14.v20131031" level="project" />
51-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:8.1.14.v20131031" level="project" />
52-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:8.1.14.v20131031" level="project" />
53-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:8.1.14.v20131031" level="project" />
54-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.42.2" level="project" />
55-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:2.42.2" level="project" />
56-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-safari-driver:2.42.2" level="project" />
57-
<orderEntry type="library" name="Maven: org.webbitserver:webbit:0.4.14" level="project" />
58-
<orderEntry type="library" name="Maven: io.netty:netty:3.5.2.Final" level="project" />
59-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.42.2" level="project" />
60-
<orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
61-
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
62-
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
63-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.42.2" level="project" />
64-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:2.42.2" level="project" />
65-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:2.42.2" level="project" />
66-
<orderEntry type="library" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
67-
<orderEntry type="library" name="Maven: org.json:json:20080701" level="project" />
68-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.42.2" level="project" />
69-
<orderEntry type="library" name="Maven: com.google.guava:guava:17.0" level="project" />
70-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" level="project" />
71-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
72-
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
73-
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
74-
<orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.1" level="project" />
75-
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:3.4.0" level="project" />
76-
<orderEntry type="library" name="Maven: net.java.dev.jna:platform:3.4.0" level="project" />
77-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-htmlunit-driver:2.42.2" level="project" />
78-
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.14" level="project" />
79-
<orderEntry type="library" name="Maven: xalan:xalan:2.7.1" level="project" />
80-
<orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
81-
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
82-
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
83-
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.2.1" level="project" />
84-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.2" level="project" />
85-
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.14" level="project" />
86-
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
87-
<orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.20" level="project" />
88-
<orderEntry type="library" name="Maven: net.sourceforge.cssparser:cssparser:0.9.13" level="project" />
89-
<orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
90-
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
91-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-websocket:8.1.14.v20131031" level="project" />
92-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:8.1.14.v20131031" level="project" />
93-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:8.1.14.v20131031" level="project" />
94-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:8.1.14.v20131031" level="project" />
95-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.42.2" level="project" />
96-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:2.42.2" level="project" />
97-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-safari-driver:2.42.2" level="project" />
98-
<orderEntry type="library" name="Maven: org.webbitserver:webbit:0.4.14" level="project" />
99-
<orderEntry type="library" name="Maven: io.netty:netty:3.5.2.Final" level="project" />
100-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.42.2" level="project" />
101-
<orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
102-
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
103-
<orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
104-
<orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
105-
</component>
106-
</module>
2+
<module classpath="eclipse" classpath-dir="$MODULE_DIR$" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4" />
1073

‎src/main/java/io/appium/java_client/AppiumDriver.java‎

Lines changed: 52 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818
package io.appium.java_client;
1919

20+
import com.google.common.base.Preconditions;
2021
import com.google.common.collect.ImmutableList;
2122
import com.google.common.collect.ImmutableMap;
2223
import io.appium.java_client.internal.JsonToMobileElementConverter;
24+
import io.appium.java_client.remote.MobileCapabilityType;
2325
import org.openqa.selenium.*;
2426
import org.openqa.selenium.html5.Location;
2527
import org.openqa.selenium.html5.LocationContext;
@@ -81,6 +83,7 @@ public AppiumDriver(URL remoteAddress, Capabilities desiredCapabilities){
8183
.put(OPEN_NOTIFICATIONS, postC("/session/:sessionId/appium/device/open_notifications"))
8284
.put(GET_NETWORK_CONNECTION, getC("/session/:sessionId/network_connection"))
8385
.put(SET_NETWORK_CONNECTION, postC("/session/:sessionId/network_connection"))
86+
.put(START_ACTIVITY, postC("/session/:sessionId/appium/device/start_activity"))
8487
;
8588
ImmutableMap<String, CommandInfo> mobileCommands = builder.build();
8689

@@ -154,11 +157,11 @@ public void sendKeyEvent(int key) {
154157
* @param metastate metastate for the keypress
155158
*/
156159
public void sendKeyEvent(int key, Integer metastate) {
157-
ImmutableMap.Builder builder = ImmutableMap.builder();
158-
builder.put("keycode", key);
159-
if (metastate != null) { builder.put("metastate", metastate); }
160-
ImmutableMap<String, Integer> parameters = builder.build();
161-
execute(KEY_EVENT, parameters);
160+
ImmutableMap.Builder builder = ImmutableMap.builder();
161+
builder.put("keycode", key);
162+
if (metastate != null) { builder.put("metastate", metastate); }
163+
ImmutableMap<String, Integer> parameters = builder.build();
164+
execute(KEY_EVENT, parameters);
162165
}
163166

164167
/**
@@ -168,6 +171,48 @@ public String currentActivity() {
168171
Response response = execute(CURRENT_ACTIVITY);
169172
return response.getValue().toString();
170173
}
174+
175+
/**
176+
* Launches an arbitrary activity during a test. If the activity belongs to
177+
* another application, that application is started and the activity is opened.
178+
*
179+
* This is an Android-only method.
180+
* @param appPackage The package containing the activity. [Required]
181+
* @param appActivity The activity to start. [Required]
182+
* @param appWaitPackage Automation will begin after this package starts. [Optional]
183+
* @param appWaitActivity Automation will begin after this activity starts. [Optional]
184+
* @example
185+
* driver.startActivity("com.foo.bar", ".MyActivity", null, null);
186+
*/
187+
public void startActivity(String appPackage, String appActivity, String appWaitPackage, String appWaitActivity)
188+
throws IllegalArgumentException {
189+
190+
Preconditions.checkArgument((_isNotNullOrEmpty(appPackage) && _isNotNullOrEmpty(appActivity)),
191+
String.format("'%s' and '%s' are required.",
192+
MobileCapabilityType.APP_PACKAGE,
193+
MobileCapabilityType.APP_ACTIVITY));
194+
195+
appWaitPackage = _isNotNullOrEmpty(appWaitPackage) ? appWaitPackage : "";
196+
appWaitActivity = _isNotNullOrEmpty(appWaitActivity) ? appWaitActivity : "";
197+
198+
ImmutableMap<String, String> parameters = ImmutableMap.of(MobileCapabilityType.APP_PACKAGE, appPackage,
199+
MobileCapabilityType.APP_ACTIVITY, appActivity,
200+
MobileCapabilityType.APP_WAIT_PACKAGE, appWaitPackage,
201+
MobileCapabilityType.APP_WAIT_ACTIVITY, appWaitActivity);
202+
203+
execute(START_ACTIVITY, parameters);
204+
}
205+
206+
/**
207+
* Checks if a string is null, empty, or whitespace.
208+
*
209+
* @param str String to check.
210+
*
211+
* @return True if str is not null or empty.
212+
*/
213+
private static boolean _isNotNullOrEmpty(String str) {
214+
return str != null && !str.isEmpty() && str.trim().length() > 0;
215+
}
171216

172217
/**
173218
*
@@ -229,7 +274,7 @@ public void hideKeyboard() {
229274
*/
230275
public void hideKeyboard(String strategy, String keyName) {
231276
ImmutableMap<String, String> parameters = ImmutableMap.of("strategy", strategy);
232-
if (keyName != null) {
277+
if (_isNotNullOrEmpty(keyName)) {
233278
parameters = parameters.of("key", keyName);
234279
}
235280

@@ -574,7 +619,7 @@ public void setNetworkConnection(NetworkConnectionSetting connection) {
574619

575620
@Override
576621
public WebDriver context(String name) {
577-
if (name == null) {
622+
if (_isNotNullOrEmpty(name)) {
578623
throw new IllegalArgumentException("Must supply a context name");
579624
}
580625

‎src/main/java/io/appium/java_client/MobileCommand.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,6 @@ public interface MobileCommand {
4949
String OPEN_NOTIFICATIONS = "openNotifications";
5050
String GET_NETWORK_CONNECTION = "getNetworkConnection";
5151
String SET_NETWORK_CONNECTION = "setNetworkConnection";
52+
String START_ACTIVITY = "startActivity";
5253

5354
}

‎src/main/java/io/appium/java_client/remote/MobileCapabilityType.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ public interface MobileCapabilityType extends CapabilityType {
1919
String APP_PACKAGE = "appPackage";
2020
String APP_ACTIVITY = "appActivity";
2121
String APP_WAIT_ACTIVITY = "appWaitActivity";
22+
String APP_WAIT_PACKAGE = "appWaitPackage";
2223
}

‎src/test/java/io/appium/java_client/MobileDriverAndroidTest.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
import java.io.File;
3030
import java.net.URL;
31+
import java.util.HashMap;
32+
import java.util.Map;
3133

3234
import static org.junit.Assert.*;
3335

@@ -129,4 +131,18 @@ public void networkConnectionTest() {
129131
public void isLockedTest() {
130132
assertEquals(false, driver.isLocked());
131133
}
134+
135+
@Test
136+
public void startActivityInThisAppTest(){
137+
driver.startActivity("io.appium.android.apis", ".accessibility.AccessibilityNodeProviderActivity", null, null);
138+
String activity = driver.currentActivity();
139+
assertTrue(activity.contains("Node"));
140+
}
141+
142+
@Test
143+
public void startActivityInAnotherAppTest(){
144+
driver.startActivity("com.android.contacts", ".ContactsListActivity", null, null);
145+
String activity = driver.currentActivity();
146+
assertTrue(activity.contains("Contact"));
147+
}
132148
}

0 commit comments

Comments
 (0)