Issue #41: Fixed

- No getprop('display.height') or getprop('display.width') on 4.3 Nexus 7 for AndroidViewClient 4.0
- Version 4.1.0
- Added property map
- Added tests

Author: dtmilano

AndroidViewClient/src/com/dtmilano/android/adb/adbclient.py

@@ -9,6 +9,7 @@
 import re
 import signal
 import os
+import types
 import platform
 
 DEBUG = False
@@ -218,16 +219,49 @@ def shell(self, cmd=None):
             #return (sin, sin)
             sout = adbClient.socket.makefile("r")
             return sout
+   
+    def __getRestrictedScreen(self):
+        ''' Gets mRestrictedScreen values from dumpsys. This is a method to obtain display dimensions '''
+        rsRE = re.compile('\s*mRestrictedScreen=\((?P<x>\d+),(?P<y>\d+)\) (?P<w>\d+)x(?P<h>\d+)')
+        for line in self.shell('dumpsys window').splitlines():
+            m = rsRE.match(line)
+            if m:
+                return m.groups()
+        raise RuntimeError("Couldn't find mRestrictedScreen in dumpsys")
 
-    def getSystemProperty(self, key, strip=True):
-        return self.getProperty(key, strip)
-    
-    def getProperty(self, key, strip=True):
+    def __getProp(self, key, strip=True):
         prop = self.shell('getprop %s' % key)
         if strip:
             prop = prop.rstrip('\r\n')
         return prop
 
+    def __getDisplayWidth(self, key, strip=True):
+        (x, y, w, h) = self.__getRestrictedScreen()
+        return int(w)
+ 
+    def __getDisplayHeight(self, key, strip=True):
+        (x, y, w, h) = self.__getRestrictedScreen()
+        return int(h)
+    
+    def getSystemProperty(self, key, strip=True):
+        return self.getProperty(key, strip)
+    
+    def getProperty(self, key, strip=True):
+        ''' Gets the property value for key '''
+        
+        import collections
+        MAP_KEYS = collections.OrderedDict([
+                          (re.compile('display.width'), self.__getDisplayWidth),
+                          (re.compile('display.height'), self.__getDisplayHeight),
+                          (re.compile('.*'), self.__getProp),
+                          ])
+        '''Maps properties key values (as regexps) to instance methods to obtain its values.'''
+
+        for kre in MAP_KEYS.keys():
+            if kre.match(key):
+                return MAP_KEYS[kre](key=key, strip=strip)
+        raise ValueError("key='%s' does not match any map entry")
+    
     def press(self, name, eventType=DOWN_AND_UP):
         cmd = 'input keyevent %s' % name
         if DEBUG:

AndroidViewClient/src/com/dtmilano/android/viewclient.py

@@ -18,7 +18,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '4.0.0'
+__version__ = '4.1.0'
 
 import sys
 import subprocess

AndroidViewClient/tests/com/dtmilano/android/mocks.py

@@ -130,6 +130,32 @@
 
 VIEW_MAP_API_17 = {u'clickable': u'true', u'bounds': ((323, 725), (475, 881)), u'enabled': u'true', 'uniqueId': 'id/no_id/33', u'text': u'6', u'selected': u'false', u'scrollable': u'false', u'focused': u'false', u'long-clickable': u'false', u'class': u'android.widget.Button', u'focusable': u'true', u'content-desc': u'', u'package': u'com.android.calculator2', u'checked': u'false', u'password': u'false', u'checkable': u'false', u'index': u'2'}
 
+DUMPSYS_WINDOW_PARTIAL = '''
+
+WINDOW MANAGER LAST ANR (dumpsys window lastanr)
+  <no ANR has occurred since boot>
+
+WINDOW MANAGER POLICY STATE (dumpsys window policy)
+    mSafeMode=false mSystemReady=true mSystemBooted=true
+    mLidState=-1 mLidOpenRotation=-1 mHdmiPlugged=false
+    mLastSystemUiFlags=0x400 mResettingSystemUiFlags=0x0 mForceClearedSystemUiFlags=0x0
+    mUiMode=1 mDockMode=0 mCarDockRotation=-1 mDeskDockRotation=-1
+    mUserRotationMode=0 mUserRotation=0 mAllowAllRotations=0
+    mCurrentAppOrientation=5
+    mCarDockEnablesAccelerometer=true mDeskDockEnablesAccelerometer=true
+    mLidKeyboardAccessibility=0 mLidNavigationAccessibility=0 mLidControlsSleep=false
+    mLongPressOnPowerBehavior=-1 mHasSoftInput=true
+    mScreenOnEarly=true mScreenOnFully=true mOrientationSensorEnabled=true
+    mOverscanScreen=(0,0) 768x1280
+    mRestrictedOverscanScreen=(0,0) 768x1184
+    mUnrestrictedScreen=(0,0) 768x1280
+    mRestrictedScreen=(0,0) 768x1184
+    mStableFullscreen=(0,0)-(768,1184)
+    mStable=(0,50)-(768,1184)
+    mSystem=(0,50)-(768,1184)
+
+'''
+
 DUMPSYS_WINDOW_WINDOWS = """
 mock data
 mock data
@@ -681,6 +707,8 @@ def shell(self, cmd):
         elif re.compile('service call window 2').match(cmd):
             self.service = STOPPED
             return TRUE_PARCEL
+        elif cmd == 'dumpsys window':
+            return DUMPSYS_WINDOW_PARTIAL
         elif cmd == 'dumpsys window windows':
             return DUMPSYS_WINDOW_WINDOWS
 
@@ -705,6 +733,10 @@ def getProperty(self, property):
             return self.serialno
         elif property == 'build.version.sdk' or property == 'ro.build.version.sdk':
             return self.version
+        elif property == 'display.width':
+            return 768
+        elif property == 'display.height':
+            return 1184
         return None
 
     def shutdownMockViewServer(self):

AndroidViewClient/tests/com/dtmilano/android/viewclient.py

@@ -102,7 +102,7 @@ def testGetClass(self):
 
     def testGetId(self):
         self.assertEqual('id/button_with_id', self.view.getId())
-    
+
     def testTextPropertyForDifferentSdkVersions(self):
         VP = { -1:TEXT_PROPERTY, 8:TEXT_PROPERTY_API_10, 10:TEXT_PROPERTY_API_10, 15:TEXT_PROPERTY, 16:TEXT_PROPERTY_UI_AUTOMATOR, 17:TEXT_PROPERTY_UI_AUTOMATOR}
         for version, textProperty in VP.items():
@@ -361,7 +361,15 @@ def testMapSerialNo_None(self):
             self.fail()
         except ValueError:
             pass
-        
+    
+    def testGetProperty_displayWidth(self):
+        device = MockDevice()
+        self.assertEqual(768, device.getProperty('display.width'))
+    
+    def testGetProperty_displayHeight(self):
+        device = MockDevice()
+        self.assertEqual(1184, device.getProperty('display.height'))
+           
     def __mockTree(self, dump=DUMP, version=15, language='en'):
         device = MockDevice(version=version, language=language)
         vc = ViewClient(device, serialno=device.serialno, adb=TRUE, autodump=False)

AndroidViewClient/tools/culebra

@@ -18,7 +18,7 @@ ___________________/  /__/  /__/  /__/  /________________________________
 
 '''
 
-__version__ = '4.0.0'
+__version__ = '4.1.0'
 
 import re
 import sys

AndroidViewClient/tools/dump

@@ -6,7 +6,7 @@ Created on Feb 3, 2012
 @author: diego
 '''
 
-__version__ = '4.0.0'
+__version__ = '4.1.0'
 
 import sys
 import os