[Libreoffice-commits] core.git: uitest/impress_tests

[Xisco Fauli (via logerrit)]

 uitest/impress_tests/drawinglayer.py |   29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

New commits:
commit 6cc7314dcc9dcdb4829c5ed28829c57572e6aa38
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Wed Dec 16 13:57:14 2020 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Dec 16 15:16:02 2020 +0100

    uitest: sd: Add asserts to existing tests
    
    Change-Id: Ie95d5f1074c9431063e97ffffa521e17e97192b1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107834
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/uitest/impress_tests/drawinglayer.py b/uitest/impress_tests/drawinglayer.py
index d6a8920e7cff..e24d98b9571e 100644
--- a/uitest/impress_tests/drawinglayer.py
+++ b/uitest/impress_tests/drawinglayer.py
@@ -6,13 +6,9 @@
 #
 
 from uitest.uihelper.common import get_state_as_dict
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
-
 from uitest.framework import UITestCase
 
-from uitest.debug import time
-
 class ImpressDrawinglayerTest(UITestCase):
 
     def test_move_object(self):
@@ -24,12 +20,21 @@ class ImpressDrawinglayerTest(UITestCase):
 
         xImpressDoc = self.xUITest.getTopFocusWindow()
 
-        xEditWin = xImpressDoc.getChild("impress_win")
+        document = self.ui_test.get_component()
+        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")
-        print(get_state_as_dict(xDrawinglayerObject))
         xDrawinglayerObject.executeAction("MOVE", mkPropertyValues({"X": "1000", "Y":"1000"}))
 
+        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.ui_test.close_doc()
 
     def test_resize_object(self):
@@ -41,12 +46,22 @@ class ImpressDrawinglayerTest(UITestCase):
 
         xImpressDoc = self.xUITest.getTopFocusWindow()
 
+        document = self.ui_test.get_component()
+        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.assertEqual(9134, document.DrawPages[0].getByIndex(1).Size.Height)
+
         xEditWin = xImpressDoc.getChild("impress_win")
 
         xDrawinglayerObject = xEditWin.getChild("Unnamed Drawinglayer object 1")
-        print(get_state_as_dict(xDrawinglayerObject))
         xDrawinglayerObject.executeAction("RESIZE", mkPropertyValues({"X": "500", "Y":"4000", "FRAC_X": "0.5", "FRAC_Y": "0.5"}))
 
+        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.assertEqual(4568, document.DrawPages[0].getByIndex(1).Size.Height)
+
         self.ui_test.close_doc()
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab: