summaryrefslogtreecommitdiff
path: root/sw/qa/uitest
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2020-10-01 12:40:04 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2020-10-01 18:35:11 +0200
commita2d3b5721fc723608cea13a78ce09f959d0b9b9f (patch)
tree443e9e9764537eedb2ea478016bdb1e2fa7c7d9d /sw/qa/uitest
parent46abe9243091c72b271f0f316796947527eeb562 (diff)
uitest: factor out common duplicated code
Change-Id: Ib6d4edaf3bd1b0a4078c277d1139d7b0db479e2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103757 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw/qa/uitest')
-rw-r--r--sw/qa/uitest/chapterNumbering/chapterNumbering.py15
-rw-r--r--sw/qa/uitest/table/tableProperties.py16
-rw-r--r--sw/qa/uitest/writer_tests2/formatBulletsNumbering.py43
-rw-r--r--sw/qa/uitest/writer_tests2/formatParagraph.py29
-rw-r--r--sw/qa/uitest/writer_tests3/lineNumbering.py15
-rw-r--r--sw/qa/uitest/writer_tests5/columns.py17
-rw-r--r--sw/qa/uitest/writer_tests6/tdf128431.py17
-rw-r--r--sw/qa/uitest/writer_tests7/tdf132169.py15
-rw-r--r--sw/qa/uitest/writer_tests7/tdf133189.py20
-rw-r--r--sw/qa/uitest/writer_tests7/tdf99711.py15
10 files changed, 24 insertions, 178 deletions
diff --git a/sw/qa/uitest/chapterNumbering/chapterNumbering.py b/sw/qa/uitest/chapterNumbering/chapterNumbering.py
index 02e4c39531a1..d7df9062f32d 100644
--- a/sw/qa/uitest/chapterNumbering/chapterNumbering.py
+++ b/sw/qa/uitest/chapterNumbering/chapterNumbering.py
@@ -11,6 +11,7 @@ from uitest.path import get_srcdir_url
from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.uihelper.common import get_state_as_dict, type_text
from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import change_measurement_unit
#Outline Numbering is now Chapter Numbering
@@ -20,19 +21,7 @@ class WriterChapterNumbering(UITestCase):
self.ui_test.create_doc_in_start_center("writer")
document = self.ui_test.get_component()
- self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog
- xDialog = self.xUITest.getTopFocusWindow()
- xPages = xDialog.getChild("pages")
- xWriterEntry = xPages.getChild('3') # Writer
- xWriterEntry.executeAction("EXPAND", tuple())
- xWriterGeneralEntry = xWriterEntry.getChild('0')
- xWriterGeneralEntry.executeAction("SELECT", tuple()) #General - set millimeters
- xMetric = xDialog.getChild("metric")
- props = {"TEXT": "Millimeter"}
- actionProps = mkPropertyValues(props)
- xMetric.executeAction("SELECT", actionProps)
- xOKBtn = xDialog.getChild("ok")
- self.ui_test.close_dialog_through_button(xOKBtn)
+ change_measurement_unit(self, "Millimeter")
self.ui_test.execute_dialog_through_command(".uno:ChapterNumberingDialog")
xDialog = self.xUITest.getTopFocusWindow()
diff --git a/sw/qa/uitest/table/tableProperties.py b/sw/qa/uitest/table/tableProperties.py
index c0c1cd9de898..962c78384be4 100644
--- a/sw/qa/uitest/table/tableProperties.py
+++ b/sw/qa/uitest/table/tableProperties.py
@@ -11,6 +11,7 @@ from uitest.uihelper.calc import enter_text_to_cell
from libreoffice.calc.document import get_cell_by_position
from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.uihelper.common import get_state_as_dict, type_text
+from uitest.uihelper.common import change_measurement_unit
from uitest.debug import sleep
import org.libreoffice.unotest
import pathlib
@@ -24,21 +25,8 @@ class tableProperties(UITestCase):
writer_doc = self.ui_test.load_file(get_url_for_data_file("tableToText.odt"))
document = self.ui_test.get_component()
xWriterDoc = self.xUITest.getTopFocusWindow()
- #set cm
- self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog
- xDialog = self.xUITest.getTopFocusWindow()
- xPages = xDialog.getChild("pages")
- xWriterEntry = xPages.getChild('3') # Writer
- xWriterEntry.executeAction("EXPAND", tuple())
- xWriterGeneralEntry = xWriterEntry.getChild('0')
- xWriterGeneralEntry.executeAction("SELECT", tuple()) #General
- xMetric = xDialog.getChild("metric")
- props = {"TEXT": "Centimeter"}
- actionProps = mkPropertyValues(props)
- xMetric.executeAction("SELECT", actionProps)
- xOKBtn = xDialog.getChild("ok")
- self.ui_test.close_dialog_through_button(xOKBtn)
+ change_measurement_unit(self, "Centimeter")
#dialog Table Properties - Table
self.ui_test.execute_dialog_through_command(".uno:TableDialog")
diff --git a/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py b/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py
index a7e3421e267e..9373101a3fd8 100644
--- a/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py
+++ b/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py
@@ -12,6 +12,7 @@ import time
from uitest.debug import sleep
from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import change_measurement_unit
class formatBulletsNumbering(UITestCase):
@@ -20,19 +21,7 @@ class formatBulletsNumbering(UITestCase):
document = self.ui_test.get_component()
xWriterDoc = self.xUITest.getTopFocusWindow()
- self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog
- xDialog = self.xUITest.getTopFocusWindow()
- xPages = xDialog.getChild("pages")
- xWriterEntry = xPages.getChild('3') # Writer
- xWriterEntry.executeAction("EXPAND", tuple())
- xWriterGeneralEntry = xWriterEntry.getChild('0')
- xWriterGeneralEntry.executeAction("SELECT", tuple()) #General - set millimeters
- xMetric = xDialog.getChild("metric")
- props = {"TEXT": "Millimeter"}
- actionProps = mkPropertyValues(props)
- xMetric.executeAction("SELECT", actionProps)
- xOKBtn = xDialog.getChild("ok")
- self.ui_test.close_dialog_through_button(xOKBtn)
+ change_measurement_unit(self, "Millimeter")
self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog")
xDialog = self.xUITest.getTopFocusWindow()
@@ -190,19 +179,7 @@ class formatBulletsNumbering(UITestCase):
xWriterDoc = self.xUITest.getTopFocusWindow()
xWriterEdit = xWriterDoc.getChild("writer_edit")
- self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog
- xDialog = self.xUITest.getTopFocusWindow()
- xPages = xDialog.getChild("pages")
- xWriterEntry = xPages.getChild('3') # Writer
- xWriterEntry.executeAction("EXPAND", tuple())
- xWriterGeneralEntry = xWriterEntry.getChild('0')
- xWriterGeneralEntry.executeAction("SELECT", tuple()) #General - set millimeters
- xMetric = xDialog.getChild("metric")
- props = {"TEXT": "Millimeter"}
- actionProps = mkPropertyValues(props)
- xMetric.executeAction("SELECT", actionProps)
- xOKBtn = xDialog.getChild("ok")
- self.ui_test.close_dialog_through_button(xOKBtn)
+ change_measurement_unit(self, "Millimeter")
self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog")
xDialog = self.xUITest.getTopFocusWindow()
@@ -243,19 +220,7 @@ class formatBulletsNumbering(UITestCase):
document = self.ui_test.get_component()
xWriterDoc = self.xUITest.getTopFocusWindow()
- self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog
- xDialog = self.xUITest.getTopFocusWindow()
- xPages = xDialog.getChild("pages")
- xWriterEntry = xPages.getChild('3') # Writer
- xWriterEntry.executeAction("EXPAND", tuple())
- xWriterGeneralEntry = xWriterEntry.getChild('0')
- xWriterGeneralEntry.executeAction("SELECT", tuple()) #General - set millimeters
- xMetric = xDialog.getChild("metric")
- props = {"TEXT": "Millimeter"}
- actionProps = mkPropertyValues(props)
- xMetric.executeAction("SELECT", actionProps)
- xOKBtn = xDialog.getChild("ok")
- self.ui_test.close_dialog_through_button(xOKBtn)
+ change_measurement_unit(self, "Millimeter")
self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog")
xDialog = self.xUITest.getTopFocusWindow()
diff --git a/sw/qa/uitest/writer_tests2/formatParagraph.py b/sw/qa/uitest/writer_tests2/formatParagraph.py
index cd07db9a12a5..7d2120f10320 100644
--- a/sw/qa/uitest/writer_tests2/formatParagraph.py
+++ b/sw/qa/uitest/writer_tests2/formatParagraph.py
@@ -12,6 +12,7 @@ import time
from uitest.debug import sleep
from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import change_measurement_unit
class formatParagraph(UITestCase):
@@ -310,19 +311,7 @@ class formatParagraph(UITestCase):
document = self.ui_test.get_component()
xWriterDoc = self.xUITest.getTopFocusWindow()
- self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog
- xDialog = self.xUITest.getTopFocusWindow()
- xPages = xDialog.getChild("pages")
- xWriterEntry = xPages.getChild('3') # Writer
- xWriterEntry.executeAction("EXPAND", tuple())
- xWriterGeneralEntry = xWriterEntry.getChild('0')
- xWriterGeneralEntry.executeAction("SELECT", tuple()) #General
- xMetric = xDialog.getChild("metric")
- props = {"TEXT": "Centimeter"}
- actionProps = mkPropertyValues(props)
- xMetric.executeAction("SELECT", actionProps)
- xOKBtn = xDialog.getChild("ok")
- self.ui_test.close_dialog_through_button(xOKBtn)
+ change_measurement_unit(self, "Centimeter")
self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog")
xDialog = self.xUITest.getTopFocusWindow()
@@ -511,19 +500,7 @@ class formatParagraph(UITestCase):
document = self.ui_test.get_component()
xWriterDoc = self.xUITest.getTopFocusWindow()
- self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog
- xDialog = self.xUITest.getTopFocusWindow()
- xPages = xDialog.getChild("pages")
- xWriterEntry = xPages.getChild('3') # Writer
- xWriterEntry.executeAction("EXPAND", tuple())
- xWriterGeneralEntry = xWriterEntry.getChild('0')
- xWriterGeneralEntry.executeAction("SELECT", tuple()) #General - set centimeter
- xMetric = xDialog.getChild("metric")
- props = {"TEXT": "Centimeter"}
- actionProps = mkPropertyValues(props)
- xMetric.executeAction("SELECT", actionProps)
- xOKBtn = xDialog.getChild("ok")
- self.ui_test.close_dialog_through_button(xOKBtn)
+ change_measurement_unit(self, "Centimeter")
self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog")
xDialog = self.xUITest.getTopFocusWindow()
diff --git a/sw/qa/uitest/writer_tests3/lineNumbering.py b/sw/qa/uitest/writer_tests3/lineNumbering.py
index 8d1b1103657d..50e48948dade 100644
--- a/sw/qa/uitest/writer_tests3/lineNumbering.py
+++ b/sw/qa/uitest/writer_tests3/lineNumbering.py
@@ -11,6 +11,7 @@ from uitest.path import get_srcdir_url
from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.uihelper.common import get_state_as_dict, type_text
from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import change_measurement_unit
class WriterLineNumbering(UITestCase):
@@ -18,19 +19,7 @@ class WriterLineNumbering(UITestCase):
self.ui_test.create_doc_in_start_center("writer")
document = self.ui_test.get_component()
- self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog
- xDialog = self.xUITest.getTopFocusWindow()
- xPages = xDialog.getChild("pages")
- xWriterEntry = xPages.getChild('3') # Writer
- xWriterEntry.executeAction("EXPAND", tuple())
- xWriterGeneralEntry = xWriterEntry.getChild('0')
- xWriterGeneralEntry.executeAction("SELECT", tuple()) #General - set centimeters
- xMetric = xDialog.getChild("metric")
- props = {"TEXT": "Centimeter"}
- actionProps = mkPropertyValues(props)
- xMetric.executeAction("SELECT", actionProps)
- xOKBtn = xDialog.getChild("ok")
- self.ui_test.close_dialog_through_button(xOKBtn)
+ change_measurement_unit(self, "Centimeter")
self.ui_test.execute_dialog_through_command(".uno:LineNumberingDialog")
xDialog = self.xUITest.getTopFocusWindow()
diff --git a/sw/qa/uitest/writer_tests5/columns.py b/sw/qa/uitest/writer_tests5/columns.py
index f2a9fe6bc5f9..0e71c065d057 100644
--- a/sw/qa/uitest/writer_tests5/columns.py
+++ b/sw/qa/uitest/writer_tests5/columns.py
@@ -7,6 +7,7 @@
from uitest.framework import UITestCase
from uitest.uihelper.common import get_state_as_dict
from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import change_measurement_unit
from uitest.uihelper.calc import enter_text_to_cell
from libreoffice.calc.document import get_cell_by_position
from uitest.debug import sleep
@@ -19,21 +20,7 @@ class columns(UITestCase):
document = self.ui_test.get_component()
xWriterDoc = self.xUITest.getTopFocusWindow()
- #set cm
- self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog
- xDialog = self.xUITest.getTopFocusWindow()
-
- xPages = xDialog.getChild("pages")
- xWriterEntry = xPages.getChild('3') # Writer
- xWriterEntry.executeAction("EXPAND", tuple())
- xWriterGeneralEntry = xWriterEntry.getChild('0')
- xWriterGeneralEntry.executeAction("SELECT", tuple()) #General
- xMetric = xDialog.getChild("metric")
- props = {"TEXT": "Centimeter"}
- actionProps = mkPropertyValues(props)
- xMetric.executeAction("SELECT", actionProps)
- xOKBtn = xDialog.getChild("ok")
- self.ui_test.close_dialog_through_button(xOKBtn)
+ change_measurement_unit(self, "Centimeter")
#dialog Columns
self.ui_test.execute_dialog_through_command(".uno:FormatColumns")
diff --git a/sw/qa/uitest/writer_tests6/tdf128431.py b/sw/qa/uitest/writer_tests6/tdf128431.py
index 17dde483e6e5..88b140235725 100644
--- a/sw/qa/uitest/writer_tests6/tdf128431.py
+++ b/sw/qa/uitest/writer_tests6/tdf128431.py
@@ -6,6 +6,7 @@
from uitest.framework import UITestCase
from uitest.uihelper.common import select_pos, get_state_as_dict
+from uitest.uihelper.common import change_measurement_unit
from com.sun.star.uno import RuntimeException
from com.sun.star.awt.GradientStyle import LINEAR
from com.sun.star.drawing.HatchStyle import SINGLE
@@ -21,21 +22,7 @@ class tdf128431(UITestCase):
self.ui_test.create_doc_in_start_center("writer")
document = self.ui_test.get_component()
- #set cm Tools-options-StarOffice Writer-General
- self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog
- xDialog = self.xUITest.getTopFocusWindow()
-
- xPages = xDialog.getChild("pages")
- xWriterEntry = xPages.getChild('3') # Writer
- xWriterEntry.executeAction("EXPAND", tuple())
- xWriterGeneralEntry = xWriterEntry.getChild('0')
- xWriterGeneralEntry.executeAction("SELECT", tuple()) #General
- xMetric = xDialog.getChild("metric")
- props = {"TEXT": "Centimeter"}
- actionProps = mkPropertyValues(props)
- xMetric.executeAction("SELECT", actionProps)
- xOKBtn = xDialog.getChild("ok")
- self.ui_test.close_dialog_through_button(xOKBtn)
+ change_measurement_unit(self, "Centimeter")
self.ui_test.execute_dialog_through_command(".uno:PageDialog")
xDialog = self.xUITest.getTopFocusWindow()
diff --git a/sw/qa/uitest/writer_tests7/tdf132169.py b/sw/qa/uitest/writer_tests7/tdf132169.py
index 9c884e4051a9..78487a00c2f8 100644
--- a/sw/qa/uitest/writer_tests7/tdf132169.py
+++ b/sw/qa/uitest/writer_tests7/tdf132169.py
@@ -8,6 +8,7 @@ from uitest.framework import UITestCase
from uitest.path import get_srcdir_url
from uitest.uihelper.common import get_state_as_dict, type_text
from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import change_measurement_unit
def get_url_for_data_file(file_name):
return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
@@ -18,19 +19,7 @@ class tdf132169(UITestCase):
writer_doc = self.ui_test.load_file(get_url_for_data_file("shape.odt"))
#set measurement to points
- self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")
- xDialogOpt = self.xUITest.getTopFocusWindow()
- xPages = xDialogOpt.getChild("pages")
- xWriterEntry = xPages.getChild('3')
- xWriterEntry.executeAction("EXPAND", tuple())
- xWriterGeneralEntry = xWriterEntry.getChild('0')
- xWriterGeneralEntry.executeAction("SELECT", tuple())
- xMetric = xDialogOpt.getChild("metric")
- props = {"TEXT": "Point"}
- actionProps = mkPropertyValues(props)
- xMetric.executeAction("SELECT", actionProps)
- xOKBtn = xDialogOpt.getChild("ok")
- self.ui_test.close_dialog_through_button(xOKBtn)
+ change_measurement_unit(self, "Point")
xWriterDoc = self.xUITest.getTopFocusWindow()
xWriterEdit = xWriterDoc.getChild("writer_edit")
diff --git a/sw/qa/uitest/writer_tests7/tdf133189.py b/sw/qa/uitest/writer_tests7/tdf133189.py
index 8b59fcceb00b..30bd35d4c451 100644
--- a/sw/qa/uitest/writer_tests7/tdf133189.py
+++ b/sw/qa/uitest/writer_tests7/tdf133189.py
@@ -6,23 +6,9 @@
#
from uitest.framework import UITestCase
from uitest.uihelper.common import get_state_as_dict, select_pos
+from uitest.uihelper.common import change_measurement_unit
from libreoffice.uno.propertyvalue import mkPropertyValues
-def change_metric_units(self, unit):
- self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")
- xDialogOpt = self.xUITest.getTopFocusWindow()
- xPages = xDialogOpt.getChild("pages")
- xWriterEntry = xPages.getChild('3')
- xWriterEntry.executeAction("EXPAND", tuple())
- xWriterGeneralEntry = xWriterEntry.getChild('0')
- xWriterGeneralEntry.executeAction("SELECT", tuple())
- xMetric = xDialogOpt.getChild("metric")
- props = {"TEXT": unit}
- actionProps = mkPropertyValues(props)
- xMetric.executeAction("SELECT", actionProps)
- xOKBtn = xDialogOpt.getChild("ok")
- self.ui_test.close_dialog_through_button(xOKBtn)
-
class tdf133189(UITestCase):
def test_tdf133189(self):
writer_doc = self.ui_test.create_doc_in_start_center("writer")
@@ -40,7 +26,7 @@ class tdf133189(UITestCase):
xPaperMargin = xWriterEdit.getChild('marginLB')
#change measurement to Inches
- change_metric_units(self, 'Inch')
+ change_measurement_unit(self, 'Inch')
self.ui_test.execute_dialog_through_command(".uno:PageDialog")
xDialog = self.xUITest.getTopFocusWindow()
@@ -71,7 +57,7 @@ class tdf133189(UITestCase):
self.assertEqual(get_state_as_dict(xPaperHeight)['Text'], "8.00″")
#change measurement again to Centimeters
- change_metric_units(self, 'Centimeter')
+ change_measurement_unit(self, 'Centimeter')
self.ui_test.wait_until_property_is_updated(xPaperMargin, "SelectEntryText", "Normal (1.90 cm)")
# tdf#129267
diff --git a/sw/qa/uitest/writer_tests7/tdf99711.py b/sw/qa/uitest/writer_tests7/tdf99711.py
index 1a6b7f069392..e99f38cc60b1 100644
--- a/sw/qa/uitest/writer_tests7/tdf99711.py
+++ b/sw/qa/uitest/writer_tests7/tdf99711.py
@@ -8,6 +8,7 @@ from uitest.framework import UITestCase
from uitest.path import get_srcdir_url
from uitest.uihelper.common import get_state_as_dict
from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import change_measurement_unit
def get_url_for_data_file(file_name):
return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
@@ -18,19 +19,7 @@ class tdf99711(UITestCase):
writer_doc = self.ui_test.load_file(get_url_for_data_file("shape.odt"))
#set measurement to millimeters
- self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")
- xDialogOpt = self.xUITest.getTopFocusWindow()
- xPages = xDialogOpt.getChild("pages")
- xWriterEntry = xPages.getChild('3')
- xWriterEntry.executeAction("EXPAND", tuple())
- xWriterGeneralEntry = xWriterEntry.getChild('0')
- xWriterGeneralEntry.executeAction("SELECT", tuple())
- xMetric = xDialogOpt.getChild("metric")
- props = {"TEXT": "Millimeter"}
- actionProps = mkPropertyValues(props)
- xMetric.executeAction("SELECT", actionProps)
- xOKBtn = xDialogOpt.getChild("ok")
- self.ui_test.close_dialog_through_button(xOKBtn)
+ change_measurement_unit(self, "Millimeter")
xWriterDoc = self.xUITest.getTopFocusWindow()
xWriterEdit = xWriterDoc.getChild("writer_edit")