sw/qa/uitest/data/tdf137737.odt |binary
sw/qa/uitest/findReplace/findReplace.py | 12 ++++---
sw/qa/uitest/findReplace/findSimilarity.py | 11 ++++++
sw/qa/uitest/findReplace/tdf137737.py | 48 +++++++++++++++++++++++++++++
sw/qa/uitest/findReplace/tdf144089.py | 10 ++++--
5 files changed, 74 insertions(+), 7 deletions(-)
New commits:
commit 00315ee52b09cb64de268f762809c2418716f49e
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Dec 29 18:05:53 2021 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Dec 30 09:40:52 2021 +0100
tdf#137737: sw: Add UItest
Change-Id: I54c7925d9093153ba90d9aaf9a07d7729114b700
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127714
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sw/qa/uitest/data/tdf137737.odt b/sw/qa/uitest/data/tdf137737.odt
new file mode 100644
index 000000000000..dc840b179d94
Binary files /dev/null and b/sw/qa/uitest/data/tdf137737.odt differ
diff --git a/sw/qa/uitest/findReplace/findReplace.py
b/sw/qa/uitest/findReplace/findReplace.py
index 5469b9276a22..1f6f607ec5b4 100644
--- a/sw/qa/uitest/findReplace/findReplace.py
+++ b/sw/qa/uitest/findReplace/findReplace.py
@@ -100,15 +100,19 @@ class findReplace(UITestCase):
searchterm.executeAction("TYPE",
mkPropertyValues({"TEXT":"T(est|other)\\>"})) #find
replaceterm = xDialog.getChild("replaceterm")
replaceterm.executeAction("TYPE",
mkPropertyValues({"TEXT":"replaced$1"})) #replace
+
+ # Deselect similarity before selecting regex
+ xSimilarity = xDialog.getChild("similarity")
+ if get_state_as_dict(xSimilarity)['Selected'] == 'true':
+ xSimilarity.executeAction("CLICK", tuple())
+
regexp = xDialog.getChild("regexp")
- regexp.executeAction("CLICK", tuple()) #regular expressions
+ if get_state_as_dict(regexp)['Selected'] == 'false':
+ regexp.executeAction("CLICK", tuple()) #regular
expressions
replaceall = xDialog.getChild("replaceall")
replaceall.executeAction("CLICK", tuple())
#verify
self.assertEqual(document.Text.String[0:27], "replacedest
number1 testnot")
- regexp.executeAction("CLICK", tuple())
-
-
#tdf116242 ţ ț
def test_tdf116242_replace_t_with_cedilla(self):
diff --git a/sw/qa/uitest/findReplace/findSimilarity.py
b/sw/qa/uitest/findReplace/findSimilarity.py
index 1b94be86b253..741feb8b50b8 100644
--- a/sw/qa/uitest/findReplace/findSimilarity.py
+++ b/sw/qa/uitest/findReplace/findSimilarity.py
@@ -25,9 +25,18 @@ class findSimilarities(UITestCase):
searchterm = xDialog.getChild("searchterm")
searchterm.executeAction("TYPE",
mkPropertyValues({"TEXT":"seco"})) #seco
# check similarities, button similarities, set values = 1;
close dialog with OK
+
+ # Deselect regex before selecting similarity
+ xRegexp = xDialog.getChild("regexp")
+ if get_state_as_dict(xRegexp)['Selected'] == 'true':
+ xRegexp.executeAction("CLICK", tuple())
+
similarity = xDialog.getChild("similarity")
+ if get_state_as_dict(similarity)['Selected'] == 'false':
+ similarity.executeAction("CLICK", tuple())
+
similaritybtn = xDialog.getChild("similaritybtn")
- similarity.executeAction("CLICK", tuple())
+
with
self.ui_test.execute_blocking_action(similaritybtn.executeAction,
args=('CLICK', ())) as dialog:
otherfld = dialog.getChild("otherfld")
longerfld = dialog.getChild("longerfld")
diff --git a/sw/qa/uitest/findReplace/tdf137737.py
b/sw/qa/uitest/findReplace/tdf137737.py
new file mode 100644
index 000000000000..64a155834c85
--- /dev/null
+++ b/sw/qa/uitest/findReplace/tdf137737.py
@@ -0,0 +1,48 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from uitest.framework import UITestCase
+from uitest.uihelper.common import type_text, get_url_for_data_file,
get_state_as_dict
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+class tdf137737(UITestCase):
+
+ def test_tdf137737(self):
+ with self.ui_test.load_file(get_url_for_data_file("tdf137737.odt")) as
writer_doc:
+ xWriterDoc = self.xUITest.getTopFocusWindow()
+ xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+ self.assertEqual(2, writer_doc.Endnotes.Count)
+
+ with
self.ui_test.execute_modeless_dialog_through_command(".uno:SearchDialog",
close_button="close") as xDialog:
+ xSearchterm = xDialog.getChild("searchterm")
+ xSearchterm.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"CTRL+A"}))
+ xSearchterm.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+ xSearchterm.executeAction("TYPE",
mkPropertyValues({"TEXT":"[:control:]"}))
+
+ xReplaceterm = xDialog.getChild("replaceterm")
+ xReplaceterm.executeAction("TYPE",
mkPropertyValues({"TEXT":"A"}))
+
+ # Deselect similarity before selecting regex
+ xSimilarity = xDialog.getChild("similarity")
+ if get_state_as_dict(xSimilarity)['Selected'] == 'true':
+ xSimilarity.executeAction("CLICK", tuple())
+
+ xRegexp = xDialog.getChild("regexp")
+ if get_state_as_dict(xRegexp)['Selected'] == 'false':
+ xRegexp.executeAction("CLICK", tuple())
+
+ replaceall = xDialog.getChild("replaceall")
+ replaceall.executeAction("CLICK", tuple())
+
+ # Without the fix in place, this test would have failed with
+ # AssertionError: 0 != 1
+ self.assertEqual(0, writer_doc.Endnotes.Count)
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/qa/uitest/findReplace/tdf144089.py
b/sw/qa/uitest/findReplace/tdf144089.py
index 0ed361db0728..bd2c89403a96 100644
--- a/sw/qa/uitest/findReplace/tdf144089.py
+++ b/sw/qa/uitest/findReplace/tdf144089.py
@@ -8,7 +8,7 @@
#
from uitest.framework import UITestCase
-from uitest.uihelper.common import type_text
+from uitest.uihelper.common import type_text, get_state_as_dict
from libreoffice.uno.propertyvalue import mkPropertyValues
class tdf144089(UITestCase):
@@ -35,8 +35,14 @@ class tdf144089(UITestCase):
xSelectionOnly = xDialog.getChild("selection")
xSelectionOnly.executeAction("CLICK", tuple())
+ # Deselect similarity before selecting regex
+ xSimilarity = xDialog.getChild("similarity")
+ if get_state_as_dict(xSimilarity)['Selected'] == 'true':
+ xSimilarity.executeAction("CLICK", tuple())
+
xRegexp = xDialog.getChild("regexp")
- xRegexp.executeAction("CLICK", tuple())
+ if get_state_as_dict(xRegexp)['Selected'] == 'false':
+ xRegexp.executeAction("CLICK", tuple())
replaceall = xDialog.getChild("replaceall")
replaceall.executeAction("CLICK", tuple())
