[Libreoffice-commits] core.git: sw/qa

[Artur Neumann (via logerrit)]

 sw/qa/uitest/writer_tests6/tdf125104.py |   48 ++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 15 deletions(-)

New commits:
commit df82473f320d3c703357b6ded31f519f271a9788
Author:     Artur Neumann <artur at jankaritech.com>
AuthorDate: Thu Jul 25 16:22:53 2019 +0545
Commit:     Zdenek Crhonek <zcrhonek at gmail.com>
CommitDate: Fri Jul 26 11:18:17 2019 +0200

    improve UITest to check result in doc when changing number format
    
    not only check in the dialog crashes writer but also check if the
    changes has an effect on the page itself and if the correct format
    is used
    trying also two non-latin formats
    
    Change-Id: I71fd17c8ed50fd043187e1006223ef462f2a56e9
    Reviewed-on: https://gerrit.libreoffice.org/76295
    Tested-by: Jenkins
    Reviewed-by: Zdenek Crhonek <zcrhonek at gmail.com>

diff --git a/sw/qa/uitest/writer_tests6/tdf125104.py b/sw/qa/uitest/writer_tests6/tdf125104.py
index 4414ec1f41e8..cf38208c0fd8 100644
--- a/sw/qa/uitest/writer_tests6/tdf125104.py
+++ b/sw/qa/uitest/writer_tests6/tdf125104.py
@@ -6,39 +6,57 @@
 
 from uitest.framework import UITestCase
 from uitest.uihelper.common import select_pos, get_state_as_dict
-from com.sun.star.uno import RuntimeException
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
-#Bug 125104 - Changing page numbering to "1st, 2nd, 3rd,..." causes crashes when trying to change Page settings later
-
 class tdf125104(UITestCase):
 
-    def test_tdf125104_pageFormat_numbering(self):
-        self.ui_test.create_doc_in_start_center("writer")
-        document = self.ui_test.get_component()
-
+    def open_page_style_dialog(self):
         self.ui_test.execute_dialog_through_command(".uno:PageDialog")
         xDialog = self.xUITest.getTopFocusWindow()
         tabcontrol = xDialog.getChild("tabcontrol")
         select_pos(tabcontrol, "1")
+        return xDialog.getChild("comboLayoutFormat")
 
-        comboLayoutFormat = xDialog.getChild("comboLayoutFormat")
-        props = {"TEXT": "1st, 2nd, 3rd, ..."}
+    def set_combo_layout_format(self, dialog, format):
+        comboLayoutFormat = dialog.getChild("comboLayoutFormat")
+        props = {"TEXT": format}
         actionProps = mkPropertyValues(props)
         comboLayoutFormat.executeAction("SELECT", actionProps)
-
-        okBtn = xDialog.getChild("ok")
+        okBtn = dialog.getChild("ok")
         self.ui_test.close_dialog_through_button(okBtn)
 
-        self.ui_test.execute_dialog_through_command(".uno:PageDialog")
-        xDialog = self.xUITest.getTopFocusWindow()
-        tabcontrol = xDialog.getChild("tabcontrol")
-        select_pos(tabcontrol, "1")
+    def test_tdf125104_pageFormat_numbering(self):
+        self.ui_test.create_doc_in_start_center("writer")
+        document = self.ui_test.get_component()
+
+        # insert page numbers on multiple pages
+        self.xUITest.executeCommand(".uno:InsertPageNumberField")
+        self.xUITest.executeCommand(".uno:InsertPagebreak")
+        self.xUITest.executeCommand(".uno:InsertPageNumberField")
+        self.assertEqual(document.Text.String[0:1], "1")
+        self.assertEqual(document.Text.String[2:3], "2")
+
+        # Bug 125104 - Changing page numbering to "1st, 2nd, 3rd,..." causes crashes when trying to change Page settings later
+        self.set_combo_layout_format(self.open_page_style_dialog(), "1st, 2nd, 3rd, ...")
+        self.assertEqual(document.Text.String[0:3], "1st")
+        self.assertEqual(document.Text.String[4:7], "2nd")
+
+        xDialog = self.open_page_style_dialog()
         comboLayoutFormat = xDialog.getChild("comboLayoutFormat")
         self.assertEqual(get_state_as_dict(comboLayoutFormat)["SelectEntryText"], "1st, 2nd, 3rd, ...")
         cancelBtn = xDialog.getChild("cancel")
         self.ui_test.close_dialog_through_button(cancelBtn)
 
+        # change to devanagari alphabet format
+        self.set_combo_layout_format(self.open_page_style_dialog(), "क, ख, ग, ...")
+        self.assertEqual(document.Text.String[0:1], "क")
+        self.assertEqual(document.Text.String[2:3], "ख")
+
+        # change to devanagari number format
+        self.set_combo_layout_format(self.open_page_style_dialog(), "१, २, ३, ...")
+        self.assertEqual(document.Text.String[0:1], "१")
+        self.assertEqual(document.Text.String[2:3], "२")
+
         self.ui_test.close_doc()
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab: