Fixed indentation problem (affecting ANDROID_SERIAL environment variable

dtmilano · dtmilano · commit fbcf3f006c00 · 2012-11-29T00:20:05.000-05:00
consideration)

- Added serialno as argument test
- Cleanup the environment
diff --git a/AndroidViewClient/src/com/dtmilano/android/viewclient.py b/AndroidViewClient/src/com/dtmilano/android/viewclient.py
@@ -1040,9 +1040,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 \
+            serialno = sys.argv[1] if len(sys.argv) > 1 else \
                     os.environ['ANDROID_SERIAL'] if os.environ.has_key('ANDROID_SERIAL') \
                     else '.*'
         if verbose:
@@ -1081,7 +1082,7 @@ def connectToDeviceOrExit(timeout=60, verbose=False, ignoresecuredevice=False, s
         return device, serialno
         
     @staticmethod
-    def traverseShowClassIdAndText(view, extraInfo=None):
+    def traverseShowClassIdAndText(view, extraInfo=None, noextrainfo=None):
         '''
         Shows the View class, id and text if available.
         This function can be used as a transform function to L{ViewClient.traverse()}
@@ -1094,7 +1095,14 @@ def traverseShowClassIdAndText(view, extraInfo=None):
         '''
         
         try:
-            return "%s %s %s%s" % (view.getClass(), view.getId(), view.getText(), " " + extraInfo(view).__str__() if extraInfo != None else '')
+            eis = ''
+            if extraInfo:
+                eis = extraInfo(view).__str__()
+                if not eis and noextrainfo:
+                    eis = noextrainfo
+            if eis:
+                eis = ' ' + eis
+            return "%s %s %s%s" % (view.getClass(), view.getId(), view.getText(), eis)
         except Exception, e:
             return "Exception in view=%s: %s" % (view.__smallStr__(), e)
         
@@ -1122,7 +1130,7 @@ def traverseShowClassIdTextAndContentDescription(view):
         @return: the string containing class, id, and text if available and the content description
         '''
         
-        return ViewClient.traverseShowClassIdAndText(view, View.getContentDescription)
+        return ViewClient.traverseShowClassIdAndText(view, View.getContentDescription, 'NAF')
     
     @staticmethod
     def traverseShowClassIdTextAndCenter(view):
diff --git a/AndroidViewClient/tests/com/dtmilano/android/viewclient.py b/AndroidViewClient/tests/com/dtmilano/android/viewclient.py
@@ -42,7 +42,10 @@ def setUp(self):
         self.view = View(VIEW_MAP, None, -1)
 
     def tearDown(self):
-        pass
+        try:
+            del os.environ['ANDROID_SERIAL']
+        except:
+            pass
 
     def testViewFactory_View(self):
         attrs = {'class': 'android.widget.AnyView', 'text:mText': 'Button with ID'}
@@ -204,7 +207,18 @@ def testConnectToDeviceOrExit_environ(self):
             ViewClient.connectToDeviceOrExit(timeout=1, verbose=True)
         except exceptions.SystemExit, e:
             self.assertEquals(3, e.code)
-        
+        except java.lang.NullPointerException:
+            self.fail('Serialno was not taken from environment')
+       
+    def testConnectToDeviceOrExit_serialno(self):
+        sys.argv = ['']
+        try:
+            ViewClient.connectToDeviceOrExit(timeout=1, verbose=True, serialno='ABC123')
+        except exceptions.SystemExit, e:
+            self.assertEquals(3, e.code)
+        except java.lang.NullPointerException:
+            self.fail('Serialno was not taken from argument')
+     
     def testConstructor(self):
         device = MockDevice()
         vc = ViewClient(device, device.serialno, adb=TRUE, autodump=False)
