[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/qa

[Tor Lillqvist (via logerrit)]

 sw/qa/uitest/writer_tests6/tdf125104.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e99caca4301fc829ae31b02a51202ad046ee9a37
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Jun 11 13:46:08 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Jun 11 13:52:52 2020 +0200

    Revert "Comment out a few page numbering tests that don't work in this branch"
    
    The issue was caused by the --disable-libnumbertext that I was using
    for no good reason.
    
    This reverts commit 9408b42881f0b645151f96048f86f90924a58a67.
    
    Change-Id: I95a685d9aa6c75135aa5abda82e1f79e4c1cb56f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96114
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sw/qa/uitest/writer_tests6/tdf125104.py b/sw/qa/uitest/writer_tests6/tdf125104.py
index e0693ba08c6e..cf38208c0fd8 100644
--- a/sw/qa/uitest/writer_tests6/tdf125104.py
+++ b/sw/qa/uitest/writer_tests6/tdf125104.py
@@ -36,14 +36,14 @@ class tdf125104(UITestCase):
         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")
+        # 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, ...")
+        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)