Added setText() support (besides type) for Views

dtmilano · dtmilano · commit 5fe54d84d0b3 · 2016-06-10T15:50:25.000-04:00
diff --git a/.idea/AndroidViewClient.iml b/.idea/AndroidViewClient.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='androidviewclient',
-    version='11.5.7',
+    version='11.5.8',
     description='''AndroidViewClient is a 100% pure python library and tools
         that simplifies test script creation providing higher level
         operations and the ability of obtaining the tree of Views present at
diff --git a/src/com/dtmilano/android/adb/adbclient.py b/src/com/dtmilano/android/adb/adbclient.py
@@ -18,7 +18,7 @@
 '''
 import threading
 
-__version__ = '11.5.7'
+__version__ = '11.5.8'
 
 import sys
 import warnings
diff --git a/src/com/dtmilano/android/concertina.py b/src/com/dtmilano/android/concertina.py
@@ -25,7 +25,7 @@
 import time
 
 __author__ = 'diego'
-__version__ = '11.5.7'
+__version__ = '11.5.8'
 
 DEBUG = True
 
diff --git a/src/com/dtmilano/android/controlpanel.py b/src/com/dtmilano/android/controlpanel.py
@@ -19,7 +19,7 @@
     @author: Ahmed Kasem
     '''
 
-__version__ = '11.5.7'
+__version__ = '11.5.8'
 
 import sys, os
 import Tkinter, tkFileDialog, ttk
diff --git a/src/com/dtmilano/android/culebron.py b/src/com/dtmilano/android/culebron.py
@@ -26,7 +26,7 @@
 from com.dtmilano.android.common import profileEnd
 from com.dtmilano.android.concertina import Concertina
 
-__version__ = '11.5.7'
+__version__ = '11.5.8'
 
 import sys
 import threading
@@ -117,6 +117,7 @@ class Operation:
     PRESS_HOME_UI_AUTOMATOR_HELPER = 'press_home_ui_automator_helper'
     PRESS_RECENT_APPS = 'press_recent_apps'
     PRESS_RECENT_APPS_UI_AUTOMATOR_HELPER = 'press_recent_apps_ui_automator_helper'
+    SET_TEXT = 'set_text'
     SNAPSHOT = 'snapshot'
     START_ACTIVITY = 'start_activity'
     SLEEP = 'sleep'
@@ -680,6 +681,7 @@ def getViewContainingPointAndTouch(self, x, y):
                 self.canvas.focus_set()
                 if text:
                     self.vc.setText(v, text)
+                    self.printOperation(v, Operation.SET_TEXT, text)
                 else:
                     self.hideVignette()
                     return
diff --git a/src/com/dtmilano/android/robotframework/viewclientwrapper.py b/src/com/dtmilano/android/robotframework/viewclientwrapper.py
@@ -18,7 +18,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '11.5.7'
+__version__ = '11.5.8'
 __author__ = 'diego'
 
 import sys
diff --git a/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py b/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py
@@ -18,7 +18,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '11.5.7'
+__version__ = '11.5.8'
 
 import os
 import subprocess
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__ = '11.5.7'
+__version__ = '11.5.8'
 
 import sys
 import warnings
diff --git a/tools/culebra b/tools/culebra
@@ -20,7 +20,7 @@ ___________________/  /__/  /__/  /__/  /________________________________
 
 ''' 
 
-__version__ = '11.5.7'
+__version__ = '11.5.8'
 
 import re
 import sys
@@ -289,6 +289,11 @@ You have to set PYTHONIOENCODING environment variable. For example:
                 warnings.warn('Multi-device not implemented yet for this case')
             else:
                 print '%s%svc.findViewWithTextOrRaise("%s").type(u"%s")' % (indent, prefix, text, arg)
+        elif op == Operation.SET_TEXT:
+            if options[CulebraOptions.MULTI_DEVICE]:
+                warnings.warn('Multi-device not implemented yet for this case')
+            else:
+                print '%s%svc.findViewWithTextOrRaise(%s).setText(u"%s")' % (indent, prefix, text, arg)
         elif op in [Operation.FLING_BACKWARD, Operation.FLING_FORWARD, Operation.FLING_TO_BEGINNING, Operation.FLING_TO_END]:
             if options[CulebraOptions.MULTI_DEVICE]:
                 warnings.warn('Multi-device not implemented yet for this case')
@@ -353,6 +358,11 @@ def printFindViewWithContentDescription(view, useregexp, op=Operation.ASSIGN, ar
                 warnings.warn('Multi-device not implemented yet for this case')
             else:
                 print '%s%svc.findViewWithContentDescriptionOrRaise(%s).type(u"%s")' % (indent, prefix, contentDescription, arg)
+        elif op == Operation.SET_TEXT:
+            if options[CulebraOptions.MULTI_DEVICE]:
+                warnings.warn('Multi-device not implemented yet for this case')
+            else:
+                print '%s%svc.findViewWithContentDescriptionOrRaise(%s).setText(u"%s")' % (indent, prefix, contentDescription, arg)
         elif op == Operation.TEST:
             if options[CulebraOptions.MULTI_DEVICE]:
                 warnings.warn('Multi-device not implemented yet for this case')
@@ -408,6 +418,12 @@ def printFindViewById(view, op=Operation.ASSIGN, arg=None):
         else:
             logAction('typing "%s" on view with id=%s' % (arg, _id))
             print '%s%svc.findViewByIdOrRaise("%s").type(u"%s")' % (indent, prefix, _id, arg)
+    elif op == Operation.SET_TEXT:
+        if options[CulebraOptions.MULTI_DEVICE]:
+            warnings.warn('Multi-device not implemented yet for this case')
+        else:
+            logAction('setting text "%s" on view with id=%s' % (arg, _id))
+            print '%s%svc.findViewByIdOrRaise("%s").setText(u"%s")' % (indent, prefix, _id, arg)
     elif op == Operation.TEST:
         if options[CulebraOptions.MULTI_DEVICE]:
             warnings.warn('Multi-device not implemented yet for this case')
diff --git a/tools/dump b/tools/dump
@@ -6,7 +6,7 @@ Created on Feb 3, 2012
 @author: diego
 '''
 
-__version__ = '11.5.7'
+__version__ = '11.5.8'
 
 import sys
 import os
