Skip to content
Browse files

Merge with Robotium masters

  • Loading branch information...
1 parent 5f91d44 commit 40bf3b504b55b9ce67b7a1cd446fc9d692ca40f9 @activars committed Sep 28, 2010
View
8 examples/RemoteSoloExamples/src/example/android/notepad/test/NoteListTestCase.java
@@ -26,11 +26,13 @@ protected void setUp( ) throws Exception {
// emulators
solo.addDevice("emulator-5554", 6000, 6000);
-// solo.addDevice("emulator-5556", 5003, 5003);
-// solo.addDevice("emulator-5558", 5004, 5004);
+ solo.addDevice("emulator-5556", 5003, 5003);
+ solo.addDevice("emulator-5558", 5004, 5004);
+ solo.addDevice("emulator-5560", 5007, 5007);
+ solo.addDevice("emulator-5562", 5008, 5008);
// v1.6 device
-// solo.addDevice("HT98YLZ00039", 6565, 6565);
+ //solo.addDevice("HT98YLZ00039", 6565, 6565);
// v2.2 device
//solo.addDevice("HT04TP800408", 5002, 5002);
View
4 examples/RemoteSoloExamples/src/example/android/srplayer/test/SRPlayerTestCase.java
@@ -26,8 +26,8 @@ protected void setUp( ) throws Exception {
// emulators
//solo.addDevice("emulator-5554", 5000, 5000);
- solo.addDevice("emulator-5556", 5008, 5008);
- //solo.addDevice("emulator-5558", 5004, 5004);
+ //solo.addDevice("emulator-5556", 5008, 5008);
+ solo.addDevice("emulator-5558", 5004, 5004);
// v1.6 device
//solo.addDevice("HT98YLZ00039", 5001, 5001);
View
2 robotium-client/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>com.jayway.android.robotium</groupId>
<artifactId>robotium</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-beta-3-SNAPSHOT</version>
</parent>
<repositories>
View
2 robotium-client/src/main/java/com/jayway/android/robotium/remotesolo/MessageWorker.java
@@ -72,7 +72,7 @@ public void removeProxyObject(int systemObjRef, Object proxyObj) {
}
public static void addMessage(Message message) {
- System.out.println("Msg Added: " + message.getMessageId().toString());
+ //System.out.println("Msg Added: " + message.getMessageId().toString());
receivedMessages.put(message.getMessageId().toString(), message);
}
View
8 robotium-client/src/main/java/com/jayway/android/robotium/remotesolo/RemoteSolo.java
@@ -52,11 +52,17 @@ public RemoteSolo(Class<?> activityClass) {
public void addDevice(String deviceSerial, int pcPort, int devicePort) {
devices.addDevice(deviceSerial, pcPort, devicePort);
}
-
+
+ /**
+ * Attempt to connect devices to corresponding server
+ */
public void connect() {
devices.connectAll();
}
+ /**
+ * Attempt to disconnect devices to corresponding server
+ */
public void disconnect() throws RemoteException {
devices.disconnectAllDevices();
}
View
3 robotium-client/src/main/java/com/jayway/android/robotium/remotesolo/ShellCmdHelper.java
@@ -26,10 +26,7 @@ static void forwardingPort(int pcPort, int devicePort, String deviceSerial) thro
commands.add("tcp:" + pcPort);
commands.add("tcp:" + devicePort);
-
executor.executeCommand("adb", commands, false);
-
-
}
static void startInstrumentationServer(int port, String deviceSerial) throws ExecutionException, InterruptedException {
View
2 ...t/src/main/java/com/jayway/android/robotium/remotesolo/proxy/ClientInvocationHandler.java
@@ -170,7 +170,7 @@ private Object sendMessages(DeviceClient device, Object proxyObj,
}
device.sendMessage(message.toString());
- System.out.println("Sent Msg: " + message.toString());
+ //System.out.println("Sent Msg: " + message.toString());
// wait for response
int slept = 0;
View
1 robotium-client/src/main/java/com/jayway/android/robotium/remotesolo/proxy/ProxyCreator.java
@@ -31,7 +31,6 @@
import org.objenesis.Objenesis;
import org.objenesis.ObjenesisStd;
-
/**
* Ported from Project Awaitility
*
View
2 robotium-common/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>robotium</artifactId>
<groupId>com.jayway.android.robotium</groupId>
- <version>1.7.0</version>
+ <version>1.8.0-beta-3-SNAPSHOT</version>
</parent>
<groupId>com.jayway.android.robotium.common</groupId>
<artifactId>robotium-common</artifactId>
View
3 robotium-server/robotium-server-app/.classpath
@@ -4,9 +4,10 @@
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="lib" path="lib/powermock-easymock-1.4-full.jar"/>
- <classpathentry kind="lib" path="lib/netty-3.2.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/netty-3.2.1.Final.jar" sourcepath="/Users/activars/.m2/repository/org/jboss/netty/netty/3.2.1.Final/netty-3.2.1.Final-sources.jar"/>
<classpathentry kind="lib" path="lib/json_simple-1.1.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/robotium-common"/>
<classpathentry combineaccessrules="false" kind="src" path="/robotium-solo"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/robotium-core"/>
<classpathentry kind="output" path="bin"/>
</classpath>

0 comments on commit 40bf3b5

Please sign in to comment.
Something went wrong with that request. Please try again.