sc/qa/uitest/calc_tests/columns.py | 15 ++++++++-------
sc/qa/uitest/calc_tests/rows.py | 16 +++++++++-------
2 files changed, 17 insertions(+), 14 deletions(-)
New commits:
commit 1d98c34e647edb44457bcc4ac2d6ff7ec237f556
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Nov 17 12:06:10 2021 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Nov 17 17:11:07 2021 +0100
tdf#144247: sc: Add UItest
Change-Id: I0e05c9e13bda04ebbbef3f2cf99c86697de5a4d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125382
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/qa/uitest/calc_tests/columns.py
b/sc/qa/uitest/calc_tests/columns.py
index bae551b4ed27..dafd825c76c8 100644
--- a/sc/qa/uitest/calc_tests/columns.py
+++ b/sc/qa/uitest/calc_tests/columns.py
@@ -24,15 +24,16 @@ class CalcColumns(UITestCase):
xvalue = xDialog.getChild("value")
xdefault = xDialog.getChild("default")
self.assertEqual(get_state_as_dict(xdefault)["Selected"],
"true") #default selected
- heightStrOrig = get_state_as_dict(xvalue)["Text"]
- heightVal = heightStrOrig[:4] #default 2.26 cm
- xvalue.executeAction("UP", tuple()) #2.36 cm
- heightStr = get_state_as_dict(xvalue)["Text"]
- heightValNew = heightStr[:4]
+
+ # tdf#144247: Without the fix in place, this test would have
failed with
+ # AssertionError: '2.26 cm' != '2.2578 cm'
+ self.assertEqual("2.26 cm", get_state_as_dict(xvalue)["Text"])
+ xvalue.executeAction("UP", tuple())
+ self.assertEqual("2.30 cm", get_state_as_dict(xvalue)["Text"])
self.assertEqual(get_state_as_dict(xdefault)["Selected"],
"false") #default not selected
- self.assertEqual(heightValNew > heightVal, True) #new value
is bigger
xdefault.executeAction("CLICK", tuple()) #click default
- self.assertEqual(get_state_as_dict(xvalue)["Text"] ==
heightStrOrig, True) #default value set
+ self.assertEqual("2.26 cm", get_state_as_dict(xvalue)["Text"])
+
#write your own value
xvalue.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"CTRL+A"}))
xvalue.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
diff --git a/sc/qa/uitest/calc_tests/rows.py b/sc/qa/uitest/calc_tests/rows.py
index bdc9a1a102d4..1e426623aaaa 100644
--- a/sc/qa/uitest/calc_tests/rows.py
+++ b/sc/qa/uitest/calc_tests/rows.py
@@ -24,15 +24,17 @@ class CalcRows(UITestCase):
xvalue = xDialog.getChild("value")
xdefault = xDialog.getChild("default")
self.assertEqual(get_state_as_dict(xdefault)["Selected"],
"true") #default selected
- heightStrOrig = get_state_as_dict(xvalue)["Text"]
- heightVal = heightStrOrig[:4] #default 0.45 cm
- xvalue.executeAction("UP", tuple()) #0.50 cm
- heightStr = get_state_as_dict(xvalue)["Text"]
- heightValNew = heightStr[:4]
+
+ # tdf#144247: Without the fix in place, this test would have
failed with
+ # AssertionError: '0.45 cm' != '0.4516 cm'
+ self.assertEqual("0.45 cm", get_state_as_dict(xvalue)["Text"])
+ xvalue.executeAction("UP", tuple())
+ self.assertEqual("0.50 cm", get_state_as_dict(xvalue)["Text"])
+
self.assertEqual(get_state_as_dict(xdefault)["Selected"],
"false") #default not selected
- self.assertEqual(heightValNew > heightVal, True) #new value
is bigger
xdefault.executeAction("CLICK", tuple()) #click default
- self.assertEqual(get_state_as_dict(xvalue)["Text"] ==
heightStrOrig, True) #default value set
+ self.assertEqual("0.45 cm", get_state_as_dict(xvalue)["Text"])
+
#write your own value
xvalue.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"CTRL+A"}))
xvalue.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
