Preserve command line arguments in ViewClient.connectToDevice()

dtmilano · dtmilano · commit 9bb99feb61a3 · 2013-04-27T19:41:56.000-04:00
- dump.py: shift args
- check for window ID in window parameter comparison
- added testList()
diff --git a/AndroidViewClient/examples/dump.py b/AndroidViewClient/examples/dump.py
@@ -56,6 +56,7 @@ def usage(exitVal=1):
 
 try:
     opts, args = getopt.getopt(sys.argv[1:], SHORT_OPTS, LONG_OPTS)
+    sys.argv[1:] = args
 except getopt.GetoptError, e:
     print >>sys.stderr, 'ERROR:', str(e)
     usage()
diff --git a/AndroidViewClient/src/com/dtmilano/android/viewclient.py b/AndroidViewClient/src/com/dtmilano/android/viewclient.py
@@ -1122,10 +1122,10 @@ def connectToDeviceOrExit(timeout=60, verbose=False, ignoresecuredevice=False, s
         progname = os.path.basename(sys.argv[0])
         if serialno is None:
             # eat all the extra options the invoking script may have added
-            # FIXME: perhaps we should restore the popped arguments
-            while len(sys.argv) > 1 and sys.argv[1][0] == '-':
-                sys.argv.pop(1)
-            serialno = sys.argv[1] if len(sys.argv) > 1 else \
+            args = sys.argv
+            while len(args) > 1 and args[1][0] == '-':
+                args.pop(1)
+            serialno = args[1] if len(args) > 1 else \
                     os.environ['ANDROID_SERIAL'] if os.environ.has_key('ANDROID_SERIAL') \
                     else '.*'
         if IP_RE.match(serialno):
@@ -1498,12 +1498,13 @@ def traverse(self, root="ROOT", indent="", transform=View.__str__, stream=sys.st
         @type transform: method
         @param transform: a method to use to transform the node before is printed  
         '''
-        if not root:
-            return
 
         if type(root) == types.StringType and root == "ROOT":
             root = self.root
 
+        if not root:
+            return
+
         s = transform(root)
         if s:
             print >>stream, "%s%s" % (indent, s)
@@ -1563,10 +1564,13 @@ def dump(self, window=-1, sleep=1):
                 self.list(sleep=0)
                 found = False
                 for wId in self.windows:
-                    if window == self.windows[wId]:
-                        window = wId
-                        found = True
-                        break
+                    try:
+                        if window == self.windows[wId] or int(window) == wId:
+                            window = wId
+                            found = True
+                            break
+                    except ValueError:
+                        pass
                 if not found:
                     raise RuntimeError("ERROR: Cannot find window '%s'" % window)
             
diff --git a/AndroidViewClient/tests/com/dtmilano/android/mocks.py b/AndroidViewClient/tests/com/dtmilano/android/mocks.py
@@ -370,6 +370,7 @@
 </hierarchy>
 """
 
+WINDOWS = {1:'Window1', 2: 'com.example.window', 3:'StatusBar'}
 
 RUNNING = 1
 STOPPED = 0
diff --git a/AndroidViewClient/tests/com/dtmilano/android/viewclient.py b/AndroidViewClient/tests/com/dtmilano/android/viewclient.py
@@ -27,7 +27,7 @@
 
 from com.dtmilano.android.viewclient import *
 from mocks import MockDevice
-from mocks import DUMP, DUMP_SAMPLE_UI, VIEW_MAP, VIEW_MAP_API_8, RUNNING, STOPPED
+from mocks import DUMP, DUMP_SAMPLE_UI, VIEW_MAP, VIEW_MAP_API_8, RUNNING, STOPPED, WINDOWS
 
 # this is probably the only reliable way of determining the OS in monkeyrunner
 os_name = java.lang.System.getProperty('os.name')
@@ -311,6 +311,13 @@ def __mockTree(self, dump=DUMP):
         vc.setViews(dump)
         return vc
 
+    def __mockWindows(self, windows=WINDOWS):
+        device = MockDevice()
+        vc = ViewClient(device, serialno=device.serialno, adb=TRUE, autodump=False)
+        self.assertNotEquals(None, vc)
+        vc.windows = windows
+        return vc
+
     def testRoot(self):
         vc = self.__mockTree()
         root = vc.root
@@ -444,6 +451,10 @@ def testServiceStoppedAfterDestructor(self):
         # Perhpas there are other ViewClients using the same server, we cannot expect it stops
         #self.assertTrue(device.service == STOPPED)
 
+    def testList(self):
+        vc = self.__mockWindows()
+        self.assertNotEqual(None, vc.windows)
+
     def testFindViewByIdOrRaise(self):
         vc = self.__mockTree(dump=DUMP_SAMPLE_UI)
         vc.findViewByIdOrRaise('id/up')
