uitest/impress_tests/drawinglayer.py | 81 +++++++++++++----------------------
1 file changed, 31 insertions(+), 50 deletions(-)
New commits:
commit 0454414c66be69903b8abf6bd9f7a27e61ec6021
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Feb 28 20:00:53 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Mar 7 12:52:26 2022 +0100
uitest: fix sporadic UITest_impress_demo failures
Revert 9158d2d2f19cf7bccba12d2ad4cb340e882b51cc
< blind fix for UITest_impress_demo failed >
and 99d2ee15ad6fae7073a53f7df8868300328a36e7
< blind fix for UITest_impress_demo failures >
Instead of asserting the shapes' properties directly,
Use the Position and Size dialog
Change-Id: Ie9aec0dbd1f1fc2ccab0993b428c8ac17938b3b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130724
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit 30c302cf489571ef13579c1ecd27c276945138d0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131022
diff --git a/uitest/impress_tests/drawinglayer.py
b/uitest/impress_tests/drawinglayer.py
index 18cdce5cf57d..9162793b1ae5 100644
--- a/uitest/impress_tests/drawinglayer.py
+++ b/uitest/impress_tests/drawinglayer.py
@@ -23,29 +23,22 @@ class ImpressDrawinglayerTest(UITestCase):
xImpressDoc = self.xUITest.getTopFocusWindow()
- self.assertEqual(1400,
document.DrawPages[0].getByIndex(0).Position.X)
- self.assertEqual(628,
document.DrawPages[0].getByIndex(0).Position.Y)
- self.assertEqual(1400,
document.DrawPages[0].getByIndex(1).Position.X)
- self.assertEqual(3685,
document.DrawPages[0].getByIndex(1).Position.Y)
-
-
- xEditWin = xImpressDoc.getChild("impress_win")
- xDrawinglayerObject = xEditWin.getChild("Unnamed Drawinglayer
object 1")
- xDrawinglayerObject.executeAction("MOVE", mkPropertyValues({"X":
"1000", "Y":"1000"}))
-
- xToolkit =
self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
- xToolkit.processEventsToIdle()
-
- self.assertEqual(1400,
document.DrawPages[0].getByIndex(0).Position.X)
- self.assertEqual(628,
document.DrawPages[0].getByIndex(0).Position.Y)
- self.assertEqual(2400,
document.DrawPages[0].getByIndex(1).Position.X)
- self.assertEqual(4685,
document.DrawPages[0].getByIndex(1).Position.Y)
-
self.assertIsNone(document.CurrentSelection)
+ xEditWin = xImpressDoc.getChild("impress_win")
xEditWin.executeAction("SELECT",
mkPropertyValues({"OBJECT":"Unnamed Drawinglayer object 1"}))
self.assertEqual("com.sun.star.drawing.SvxShapeCollection",
document.CurrentSelection.getImplementationName())
+ with self.ui_test.execute_dialog_through_command(".uno:Size") as
xDialog:
+ self.assertEqual('25.2',
get_state_as_dict(xDialog.getChild('MTR_FLD_WIDTH'))['Value'])
+ self.assertEqual('9.13',
get_state_as_dict(xDialog.getChild('MTR_FLD_HEIGHT'))['Value'])
+ self.assertEqual('1.4',
get_state_as_dict(xDialog.getChild('MTR_FLD_POS_X'))['Value'])
+ self.assertEqual('3.69',
get_state_as_dict(xDialog.getChild('MTR_FLD_POS_Y'))['Value'])
+ self.assertEqual('0',
get_state_as_dict(xDialog.getChild('NF_ANGLE'))['Value'])
+
+ xDrawinglayerObject = xEditWin.getChild("Unnamed Drawinglayer
object 1")
+ xDrawinglayerObject.executeAction("MOVE", mkPropertyValues({"X":
"1000", "Y":"1000"}))
+
with self.ui_test.execute_dialog_through_command(".uno:Size") as
xDialog:
self.assertEqual('25.2',
get_state_as_dict(xDialog.getChild('MTR_FLD_WIDTH'))['Value'])
self.assertEqual('9.13',
get_state_as_dict(xDialog.getChild('MTR_FLD_HEIGHT'))['Value'])
@@ -57,7 +50,6 @@ class ImpressDrawinglayerTest(UITestCase):
xEditWin.executeAction("DESELECT", tuple())
self.assertIsNone(document.CurrentSelection)
-
def test_resize_object(self):
with self.ui_test.create_doc_in_start_center("impress") as document:
@@ -69,26 +61,22 @@ class ImpressDrawinglayerTest(UITestCase):
xImpressDoc = self.xUITest.getTopFocusWindow()
- self.assertEqual(25199,
document.DrawPages[0].getByIndex(0).Size.Width)
- self.assertEqual(2629,
document.DrawPages[0].getByIndex(0).Size.Height)
- self.assertEqual(25199,
document.DrawPages[0].getByIndex(1).Size.Width)
- self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
+ self.assertIsNone(document.CurrentSelection)
xEditWin = xImpressDoc.getChild("impress_win")
+ xEditWin.executeAction("SELECT",
mkPropertyValues({"OBJECT":"Unnamed Drawinglayer object 1"}))
+ self.assertEqual("com.sun.star.drawing.SvxShapeCollection",
document.CurrentSelection.getImplementationName())
+
+ with self.ui_test.execute_dialog_through_command(".uno:Size") as
xDialog:
+ self.assertEqual('25.2',
get_state_as_dict(xDialog.getChild('MTR_FLD_WIDTH'))['Value'])
+ self.assertEqual('9.13',
get_state_as_dict(xDialog.getChild('MTR_FLD_HEIGHT'))['Value'])
+ self.assertEqual('1.4',
get_state_as_dict(xDialog.getChild('MTR_FLD_POS_X'))['Value'])
+ self.assertEqual('3.69',
get_state_as_dict(xDialog.getChild('MTR_FLD_POS_Y'))['Value'])
+ self.assertEqual('0',
get_state_as_dict(xDialog.getChild('NF_ANGLE'))['Value'])
xDrawinglayerObject = xEditWin.getChild("Unnamed Drawinglayer
object 1")
xDrawinglayerObject.executeAction("RESIZE", mkPropertyValues({"X":
"500", "Y":"4000", "FRAC_X": "0.5", "FRAC_Y": "0.5"}))
- xToolkit =
self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
- xToolkit.processEventsToIdle()
-
- self.assertEqual(25199,
document.DrawPages[0].getByIndex(0).Size.Width)
- self.assertEqual(2629,
document.DrawPages[0].getByIndex(0).Size.Height)
- self.assertEqual(12600,
document.DrawPages[0].getByIndex(1).Size.Width)
- self.assertAlmostEqual(4568,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
-
- self.assertIsNone(document.CurrentSelection)
-
xEditWin.executeAction("SELECT",
mkPropertyValues({"OBJECT":"Unnamed Drawinglayer object 1"}))
self.assertEqual("com.sun.star.drawing.SvxShapeCollection",
document.CurrentSelection.getImplementationName())
@@ -103,7 +91,6 @@ class ImpressDrawinglayerTest(UITestCase):
xEditWin.executeAction("DESELECT", tuple())
self.assertIsNone(document.CurrentSelection)
-
def test_rotate_object(self):
with self.ui_test.create_doc_in_start_center("impress") as document:
@@ -113,28 +100,22 @@ class ImpressDrawinglayerTest(UITestCase):
xImpressDoc = self.xUITest.getTopFocusWindow()
- self.assertEqual(25199,
document.DrawPages[0].getByIndex(0).Size.Width)
- self.assertEqual(2629,
document.DrawPages[0].getByIndex(0).Size.Height)
- self.assertEqual(25199,
document.DrawPages[0].getByIndex(1).Size.Width)
- self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
- self.assertEqual(0,
document.DrawPages[0].getByIndex(1).RotateAngle)
+ self.assertIsNone(document.CurrentSelection)
xEditWin = xImpressDoc.getChild("impress_win")
+ xEditWin.executeAction("SELECT",
mkPropertyValues({"OBJECT":"Unnamed Drawinglayer object 1"}))
+ self.assertEqual("com.sun.star.drawing.SvxShapeCollection",
document.CurrentSelection.getImplementationName())
+
+ with self.ui_test.execute_dialog_through_command(".uno:Size") as
xDialog:
+ self.assertEqual('25.2',
get_state_as_dict(xDialog.getChild('MTR_FLD_WIDTH'))['Value'])
+ self.assertEqual('9.13',
get_state_as_dict(xDialog.getChild('MTR_FLD_HEIGHT'))['Value'])
+ self.assertEqual('1.4',
get_state_as_dict(xDialog.getChild('MTR_FLD_POS_X'))['Value'])
+ self.assertEqual('3.69',
get_state_as_dict(xDialog.getChild('MTR_FLD_POS_Y'))['Value'])
+ self.assertEqual('0',
get_state_as_dict(xDialog.getChild('NF_ANGLE'))['Value'])
xDrawinglayerObject = xEditWin.getChild("Unnamed Drawinglayer
object 1")
xDrawinglayerObject.executeAction("ROTATE", mkPropertyValues({"X":
"500", "Y":"4000", "ANGLE": "3000"}))
- xToolkit =
self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
- xToolkit.processEventsToIdle()
-
- self.assertEqual(25199,
document.DrawPages[0].getByIndex(0).Size.Width)
- self.assertEqual(2629,
document.DrawPages[0].getByIndex(0).Size.Height)
- self.assertEqual(25199,
document.DrawPages[0].getByIndex(1).Size.Width)
- self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
- self.assertEqual(3000,
document.DrawPages[0].getByIndex(1).RotateAngle)
-
- self.assertIsNone(document.CurrentSelection)
-
xEditWin.executeAction("SELECT",
mkPropertyValues({"OBJECT":"Unnamed Drawinglayer object 1"}))
self.assertEqual("com.sun.star.drawing.SvxShapeCollection",
document.CurrentSelection.getImplementationName())
