Merge pull request dtmilano#172 from steve-the-edwards/master

dtmilano · dtmilano · commit eb3e2bf0402f · 2016-02-04T01:39:03.000-05:00
AVC: Fix adbclient.type to check type and fix package tests
diff --git a/src/com/dtmilano/android/adb/adbclient.py b/src/com/dtmilano/android/adb/adbclient.py
@@ -798,8 +798,11 @@ def dragDip(self, (x0, y0), (x1, y1), duration, steps=1, orientation=-1):
 
     def type(self, text):
         self.__checkTransport()
-        escaped = text.replace('%s', '\\%s')
-        encoded = escaped.replace(' ', '%s')
+        if type(text) is str:
+            escaped = text.replace('%s', '\\%s')
+            encoded = escaped.replace(' ', '%s')
+        else:
+            encoded = str(text);
         #FIXME find out which characters can be dangerous,
         # for exmaple not worst idea to escape " 
         self.shell(u'input text "%s"' % encoded)
diff --git a/tests/com/dtmilano/android/adb/adbclienttests.py b/tests/com/dtmilano/android/adb/adbclienttests.py
@@ -20,8 +20,11 @@
 
 VERBOSE = False
 
+TEST_TEMP_PACKAGE = False
 PKG = 'com.example.i2at.tc'
 ACTIVITY = 'TemperatureConverterActivity'
+CALCULATOR = 'calculator'
+CALC_ACTIVITY = 'Calculator'
 
 #ANDROIANDROID_SERIAL = 'emulator-5554'
 
@@ -168,30 +171,43 @@ def testType_digits_asInt(self):
 
     def __checkPackageInstalled(self):
         packages = self.adbClient.shell('pm list packages').splitlines()
-        self.assertIn('package:' + PKG, packages, PKG + " is not installed")
+        self.assertTrue(packages, "Could not detect any packages installed")
+        if TEST_TEMP_PACKAGE:
+            self.assertIn('package:' + PKG, packages, PKG + " is not installed")
+            return [PKG, ACTIVITY]
+        else:
+            for line in packages:
+                if CALCULATOR in line:
+                    pkg = line[line.index(':')+1:]
+                    self.assertTrue(pkg, "No calculator package to use for testing")
+                    return [pkg, CALC_ACTIVITY]
+            return False
 
     def testStartActivity_component(self):
-        self.__checkPackageInstalled()
-        self.adbClient.startActivity(PKG + '/.' + ACTIVITY)
+        pkg = self.__checkPackageInstalled()
+        if pkg:
+            self.adbClient.startActivity(pkg[0] + '/.' + pkg[1])
 
     def testGetWindows(self):
         self.assertIsNotNone(self.adbClient.getWindows())
         
     def testGetFocusedWindow(self):
-        self.__checkPackageInstalled()
-        self.adbClient.startActivity(PKG + '/.' + ACTIVITY)
-        time.sleep(3)
-        w = self.adbClient.getFocusedWindow()
-        self.assertIsNotNone(w)
-        self.assertEqual(PKG + '/' + PKG + '.' + ACTIVITY, w.activity)
+        pkg = self.__checkPackageInstalled()
+        if pkg:
+            self.adbClient.startActivity(pkg[0] + '/.' + pkg[1])
+            time.sleep(3)
+            w = self.adbClient.getFocusedWindow()
+            self.assertIsNotNone(w)
+            self.assertEqual(pkg[0] + '/' + pkg[0] + '.' + pkg[1], w.activity)
         
     def testGetFocusedWindowName(self):
-        self.__checkPackageInstalled()
-        self.adbClient.startActivity(PKG + '/.' + ACTIVITY)
-        time.sleep(3)
-        n = self.adbClient.getFocusedWindowName()
-        self.assertIsNotNone(n)
-        self.assertEqual(PKG + '/' + PKG + '.' + ACTIVITY, n)
+        pkg = self.__checkPackageInstalled()
+        if pkg:
+            self.adbClient.startActivity(pkg[0] + '/.' + pkg[1])
+            time.sleep(3)
+            n = self.adbClient.getFocusedWindowName()
+            self.assertIsNotNone(n)
+            self.assertEqual(pkg[0] + '/' + pkg[0] + '.' + pkg[1], n)
         
     def testStartActivity_uri(self):
         self.adbClient.startActivity(uri='http://www.google.com')
