uitest: add a helper method for typing text

Change-Id: If450e3f0ff1e2a8f33db05e9512a13e5771115a8
Reviewed-on: https://gerrit.libreoffice.org/32406
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

3 files changed, 18 insertions, 34 deletions

diff --git a/uitest/calc_tests/create_chart.py b/uitest/calc_tests/create_chart.py
index c43be5f2150c..d98eeffc4e67 100644
--- a/uitest/calc_tests/create_chart.py
+++ b/uitest/calc_tests/create_chart.py
@@ -8,29 +8,23 @@
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase
+from uitest.uihelper.calc import enter_text_to_cell
 
 import time
 import unittest
 
 class CalcChartUIDemo(UITestCase):
 
-    def add_content_to_cell(self, gridwin, cell, content):
-        selectProps = mkPropertyValues({"CELL": cell})
-        gridwin.executeAction("SELECT", selectProps)
-
-        contentProps = mkPropertyValues({"TEXT": content})
-        gridwin.executeAction("TYPE", contentProps)
-
     def fill_spreadsheet(self):
         xCalcDoc = self.xUITest.getTopFocusWindow()
         xGridWindow = xCalcDoc.getChild("grid_window")
 
-        self.add_content_to_cell(xGridWindow, "A1", "col1")
-        self.add_content_to_cell(xGridWindow, "B1", "col2")
-        self.add_content_to_cell(xGridWindow, "C1", "col3")
-        self.add_content_to_cell(xGridWindow, "A2", "1")
-        self.add_content_to_cell(xGridWindow, "B2", "3")
-        self.add_content_to_cell(xGridWindow, "C2", "5")
+        enter_text_to_cell(xGridWindow, "A1", "col1")
+        enter_text_to_cell(xGridWindow, "B1", "col2")
+        enter_text_to_cell(xGridWindow, "C1", "col3")
+        enter_text_to_cell(xGridWindow, "A2", "1")
+        enter_text_to_cell(xGridWindow, "B2", "3")
+        enter_text_to_cell(xGridWindow, "C2", "5")
 
         xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C2"}))
 
diff --git a/uitest/calc_tests/create_range_name.py b/uitest/calc_tests/create_range_name.py
index ee398ab6eb95..5f3b8c381d61 100644
--- a/uitest/calc_tests/create_range_name.py
+++ b/uitest/calc_tests/create_range_name.py
@@ -8,6 +8,7 @@
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase
+from uitest.uihelper.common import type_text
 
 class CreateRangeNameTest(UITestCase):
 
@@ -19,11 +20,9 @@ class CreateRangeNameTest(UITestCase):
 
         xAddNameDlg = self.xUITest.getTopFocusWindow()
 
-        props = {"TEXT": "simpleRangeName"}
-        actionProps = mkPropertyValues(props)
-
         xEdit = xAddNameDlg.getChild("edit")
-        xEdit.executeAction("TYPE", actionProps)
+        type_text(xEdit, "simpleRangeName")
+
         xAddBtn = xAddNameDlg.getChild("add")
         xAddBtn.executeAction("CLICK", tuple())
 
@@ -37,11 +36,8 @@ class CreateRangeNameTest(UITestCase):
 
         xAddNameDlg = self.xUITest.getTopFocusWindow()
 
-        props = {"TEXT": "simpleRangeName"}
-        actionProps = mkPropertyValues(props)
-
         xEdit = xAddNameDlg.getChild("edit")
-        xEdit.executeAction("TYPE", actionProps)
+        type_text(xEdit, "simpleRangeName")
 
         xScope = xAddNameDlg.getChild("scope")
         props = {"POS": "1"}
diff --git a/uitest/calc_tests/edit_chart.py b/uitest/calc_tests/edit_chart.py
index c5d85c0678ed..a8aa36e70c03 100644
--- a/uitest/calc_tests/edit_chart.py
+++ b/uitest/calc_tests/edit_chart.py
@@ -8,28 +8,22 @@
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
 from uitest.framework import UITestCase
+from uitest.uihelper.calc import enter_text_to_cell
 
 import unittest
 
 class CalcChartEditUIDemo(UITestCase):
 
-    def add_content_to_cell(self, gridwin, cell, content):
-        selectProps = mkPropertyValues({"CELL": cell})
-        gridwin.executeAction("SELECT", selectProps)
-
-        contentProps = mkPropertyValues({"TEXT": content})
-        gridwin.executeAction("TYPE", contentProps)
-
     def fill_spreadsheet(self):
         xCalcDoc = self.xUITest.getTopFocusWindow()
         xGridWindow = xCalcDoc.getChild("grid_window")
 
-        self.add_content_to_cell(xGridWindow, "A1", "col1")
-        self.add_content_to_cell(xGridWindow, "B1", "col2")
-        self.add_content_to_cell(xGridWindow, "C1", "col3")
-        self.add_content_to_cell(xGridWindow, "A2", "1")
-        self.add_content_to_cell(xGridWindow, "B2", "3")
-        self.add_content_to_cell(xGridWindow, "C2", "5")
+        enter_text_to_cell(xGridWindow, "A1", "col1")
+        enter_text_to_cell(xGridWindow, "B1", "col2")
+        enter_text_to_cell(xGridWindow, "C1", "col3")
+        enter_text_to_cell(xGridWindow, "A2", "1")
+        enter_text_to_cell(xGridWindow, "B2", "3")
+        enter_text_to_cell(xGridWindow, "C2", "5")
 
         xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C2"}))