View clone()

dtmilano · dtmilano · commit be31f6eccc05 · 2018-07-04T23:17:55.000-04:00
- cast Views
 - added getAndroidClassName() to return widget class
diff --git a/src/com/dtmilano/android/viewclient.py b/src/com/dtmilano/android/viewclient.py
@@ -18,7 +18,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '15.3.1'
+__version__ = '15.4.0'
 
 import sys
 import warnings
@@ -209,6 +209,17 @@ def __copy(cls, view):
 
         return cls(view.map, view.device, view.version, view.forceviewserveruse, view.windowId, view.uiAutomatorHelper)
 
+    @classmethod
+    def clone(cls, view):
+        _map = view.map.copy()
+        # enforce the correct class in the map
+        _map['class'] = cls.getAndroidClassName()
+        return cls(_map, view.device, view.version, view.forceviewserveruse, view.windowId, view.uiAutomatorHelper)
+
+    @classmethod
+    def getAndroidClassName(cls):
+        return 'android.widget.View'
+
     def __init__(self, _map, device, version=-1, forceviewserveruse=False, windowId=None, uiAutomatorHelper=None):
         '''
         Constructor
@@ -1158,13 +1169,19 @@ class TextView(View):
     TextView class.
     '''
 
-    pass
+    @classmethod
+    def getAndroidClassName(cls):
+        return 'android.widget.TextView'
 
 class EditText(TextView):
     '''
     EditText class.
     '''
 
+    @classmethod
+    def getAndroidClassName(cls):
+        return 'android.widget.EditText'
+
     def type(self, text, alreadyTouched=False):
         if not text:
             return
diff --git a/tests/com/dtmilano/android/mocks.py b/tests/com/dtmilano/android/mocks.py
@@ -752,6 +752,15 @@ def shutdownMockViewServer(self):
             self.viewServer.shutdown()
             #del(self.viewServer)
 
+    def touch(self, x, y, eventType):
+        pass
+
+    def press(self, k, e, repeat=1):
+        pass
+
+    def type(self, text):
+        pass
+
 import sys
 import time
 import select
diff --git a/tests/com/dtmilano/android/viewclienttests.py b/tests/com/dtmilano/android/viewclienttests.py
@@ -7,13 +7,9 @@
 @author: diego
 '''
 
-import sys
-import os
-import time
-import StringIO
-import unittest
 import exceptions
-import platform
+import os
+import sys
 
 # PyDev sets PYTHONPATH, use it
 try:
@@ -29,7 +25,7 @@
     pass
 
 from com.dtmilano.android.viewclient import *
-from mocks import MockDevice, MockViewServer
+from mocks import MockDevice
 from mocks import DUMP, DUMP_SAMPLE_UI, VIEW_MAP, VIEW_MAP_API_8, VIEW_MAP_API_17, RUNNING, STOPPED, WINDOWS
 
 os_name = platform.system()
@@ -276,6 +272,42 @@ def testIsClickable_api17(self):
         v = View(VIEW_MAP_API_17, MockDevice(), 17)
         self.assertTrue(v.isClickable())
 
+    def testCopyConstructor(self):
+        device = MockDevice()
+        mv = VIEW_MAP_API_17.copy()
+        mv['class'] = u'android.widget.View'
+        v = View(mv, device, 17)
+        self.assertEqual(v.getClass(), u'android.widget.View')
+
+        mt = VIEW_MAP_API_17.copy()
+        mt['class'] = u'android.widget.TextView'
+        t = TextView(mt, device, 17)
+        self.assertEqual(t.getClass(), u'android.widget.TextView')
+
+        me = VIEW_MAP_API_17.copy()
+        me['class'] = u'android.widget.EditText'
+        e = TextView(me, device, 17)
+        self.assertEqual(e.getClass(), u'android.widget.EditText')
+
+        v1 = View.clone(v)
+        self.assertEqual(u'android.widget.View', v1.getClass())
+
+        t1 = TextView.clone(t)
+        self.assertEqual(u'android.widget.TextView', t1.getClass())
+
+        e1 = EditText.clone(e)
+        self.assertEqual(u'android.widget.EditText', e1.getClass())
+
+        t2 = TextView.clone(v)
+        self.assertEqual(u'android.widget.TextView', t2.getClass())
+
+        e2 = EditText.clone(v)
+        self.assertEqual(u'android.widget.EditText', e2.getClass())
+
+        e2.setText("hello")
+
+
+
 class ViewClientTest(unittest.TestCase):
 
     def setUp(self):
