Merge pull request dtmilano#12 from dtmilano/viewclient-start-viewserver

dtmilano · dtmilano · commit 825f03fa004a · 2012-11-06T22:43:39.000-08:00
Viewclient starts viewserver optionally
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,6 @@
 ############
 .*.swp
 
-# other #
-#########
+# other files #
+##########
 *~
diff --git a/AndroidViewClient/examples/temperature-converter-get-conversion.py b/AndroidViewClient/examples/temperature-converter-get-conversion.py
@@ -35,8 +35,13 @@
 
 from com.android.monkeyrunner import MonkeyRunner, MonkeyDevice
 
-
-device, serialno = ViewClient.connectToDeviceOrExit()
+print sys.argv
+localViewServer = False
+if len(sys.argv) > 1 and sys.argv[1] == '--localViewServer':
+    localViewServer = True
+    sys.argv.pop(1)
+    
+device, serialno = ViewClient.connectToDeviceOrExit(ignoresecuredevice=localViewServer)
 
 FLAG_ACTIVITY_NEW_TASK = 0x10000000
 package = 'com.example.i2at.tc'                                          
@@ -50,7 +55,7 @@
 device.type("123")
 MonkeyRunner.sleep(3)
 
-vc = ViewClient(device, serialno)
+vc = ViewClient(device, serialno, startviewserver=(not localViewServer))
 
 # obtain the views by id
 celsius = vc.findViewByIdOrRaise("id/celsius")
diff --git a/AndroidViewClient/examples/viewserveractivity-new-activity.py b/AndroidViewClient/examples/viewserveractivity-new-activity.py
@@ -0,0 +1,32 @@
+#! /usr/bin/env monkeyrunner
+'''
+Copyright (C) 2012  Diego Torres Milano
+Created on Feb 3, 2012
+
+@author: diego
+'''
+
+
+import sys
+import os
+
+# This must be imported before MonkeyRunner and MonkeyDevice,
+# otherwise the import fails.
+# PyDev sets PYTHONPATH, use it
+try:
+    for p in os.environ['PYTHONPATH'].split(':'):
+        if not p in sys.path:
+            sys.path.append(p)
+except:
+    pass
+    
+try:
+    sys.path.append(os.path.join(os.environ['ANDROID_VIEW_CLIENT_HOME'], 'src'))
+except:
+    pass
+
+from com.dtmilano.android.viewclient import ViewClient
+
+device, serialno = ViewClient.connectToDeviceOrExit(ignoresecuredevice=True)
+vc = ViewClient(device=device, serialno=serialno, startviewserver=False)
+vc.findViewWithTextOrRaise("New activity").touch()
diff --git a/AndroidViewClient/src/com/dtmilano/android/viewclient.py b/AndroidViewClient/src/com/dtmilano/android/viewclient.py
@@ -707,7 +707,7 @@ class ViewClient:
     mapping is created.
     '''
 
-    def __init__(self, device, serialno, adb=None, autodump=True, localport=VIEW_SERVER_PORT, remoteport=VIEW_SERVER_PORT):
+    def __init__(self, device, serialno, adb=None, autodump=True, localport=VIEW_SERVER_PORT, remoteport=VIEW_SERVER_PORT, startviewserver=True):
         '''
         Constructor
         
@@ -724,6 +724,8 @@ def __init__(self, device, serialno, adb=None, autodump=True, localport=VIEW_SER
         @type remoteport: int
         @param remoteport: the remote port used to start the C{ViewServer} in the device or
                            emulator
+        @type startviewserverparam: boolean
+        @param startviewserverparam: Whether to start the B{global} ViewServer
         '''
 
         if not device:
@@ -744,12 +746,13 @@ def __init__(self, device, serialno, adb=None, autodump=True, localport=VIEW_SER
         else:
             adb = ViewClient.__obtainAdbPath()
 
-        if not self.serviceResponse(device.shell('service call window 3')):
-            try:
-                self.assertServiceResponse(device.shell('service call window 1 i32 %d' %
+        if startviewserver:
+            if not self.serviceResponse(device.shell('service call window 3')):
+                try:
+                    self.assertServiceResponse(device.shell('service call window 1 i32 %d' %
                                                         remoteport))
-            except:
-                raise Exception('Cannot start View server.\n'
+                except:
+                    raise Exception('Cannot start View server.\n'
                                 'This only works on emulator and devices running developer versions.\n'
                                 'Does hierarchyviewer work on your device ?')
 
@@ -909,8 +912,11 @@ def connectToDeviceOrExit(timeout=60, verbose=False, ignoresecuredevice=False):
         @return: the device and serialno used for the connection
         '''
         
-        serialno = sys.argv[1] if len(sys.argv) > 1 else '.*'
         progname = os.path.basename(sys.argv[0])
+        # eat all the extra options the invoking script may have added
+        while len(sys.argv) > 1 and sys.argv[1][0] == '-':
+            sys.argv.pop(1)
+        serialno = sys.argv[1] if len(sys.argv) > 1 else '.*'
         if verbose:
             print 'Connecting to a device with serialno=%s with a timeout of %d secs...' % (serialno, timeout)
         # Sometimes MonkeyRunner doesn't even timeout (i.e. two connections from same process), so let's
diff --git a/AndroidViewClient/uml/AndroidViewClient.zargo b/AndroidViewClient/uml/AndroidViewClient.zargo
