uitest: reset value when changing the measurement unit

Otherwise, changing it in one test might affect other tests
Use @contextmanager decorator to change it back to default 'Inch'
at the end of the test even if the test hits an assert

Change-Id: I1e7b35019cd19b490aa619c0a866bb9f93820950
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146583
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

2 files changed, 79 insertions, 68 deletions

diff --git a/uitest/impress_tests/drawinglayer.py b/uitest/impress_tests/drawinglayer.py
index 063211d413c6..ca9d84bb16aa 100644
--- a/uitest/impress_tests/drawinglayer.py
+++ b/uitest/impress_tests/drawinglayer.py
@@ -21,36 +21,36 @@ class ImpressDrawinglayerTest(UITestCase):
             xCancelBtn = xTemplateDlg.getChild("close")
             self.ui_test.close_dialog_through_button(xCancelBtn)
 
-            change_measurement_unit(self, 'Centimeter')
+            with change_measurement_unit(self, 'Centimeter'):
 
-            xImpressDoc = self.xUITest.getTopFocusWindow()
+                xImpressDoc = self.xUITest.getTopFocusWindow()
 
-            self.assertIsNone(document.CurrentSelection)
+                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())
+                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'])
+                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"}))
+                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'])
-                self.assertEqual('2.4', get_state_as_dict(xDialog.getChild('MTR_FLD_POS_X'))['Value'])
-                self.assertEqual('4.69', get_state_as_dict(xDialog.getChild('MTR_FLD_POS_Y'))['Value'])
-                self.assertEqual('0', get_state_as_dict(xDialog.getChild('NF_ANGLE'))['Value'])
+                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('2.4', get_state_as_dict(xDialog.getChild('MTR_FLD_POS_X'))['Value'])
+                    self.assertEqual('4.69', get_state_as_dict(xDialog.getChild('MTR_FLD_POS_Y'))['Value'])
+                    self.assertEqual('0', get_state_as_dict(xDialog.getChild('NF_ANGLE'))['Value'])
 
-            self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName())
-            xEditWin.executeAction("DESELECT", tuple())
-            self.assertIsNone(document.CurrentSelection)
+                self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName())
+                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:
@@ -59,39 +59,39 @@ class ImpressDrawinglayerTest(UITestCase):
             xCancelBtn = xTemplateDlg.getChild("close")
             self.ui_test.close_dialog_through_button(xCancelBtn)
 
-            change_measurement_unit(self, 'Centimeter')
+            with change_measurement_unit(self, 'Centimeter'):
 
-            xImpressDoc = self.xUITest.getTopFocusWindow()
+                xImpressDoc = self.xUITest.getTopFocusWindow()
 
-            self.assertIsNone(document.CurrentSelection)
+                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())
+                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'])
+                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"}))
+                xDrawinglayerObject = xEditWin.getChild("Unnamed Drawinglayer object 1")
+                xDrawinglayerObject.executeAction("RESIZE", mkPropertyValues({"X": "500", "Y":"4000", "FRAC_X": "0.5", "FRAC_Y": "0.5"}))
 
-            xEditWin.executeAction("SELECT", mkPropertyValues({"OBJECT":"Unnamed Drawinglayer object 1"}))
-            self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName())
+                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('12.6', get_state_as_dict(xDialog.getChild('MTR_FLD_WIDTH'))['Value'])
-                self.assertEqual('4.57', get_state_as_dict(xDialog.getChild('MTR_FLD_HEIGHT'))['Value'])
-                self.assertEqual('0.95', get_state_as_dict(xDialog.getChild('MTR_FLD_POS_X'))['Value'])
-                self.assertEqual('3.84', get_state_as_dict(xDialog.getChild('MTR_FLD_POS_Y'))['Value'])
-                self.assertEqual('0', get_state_as_dict(xDialog.getChild('NF_ANGLE'))['Value'])
+                with self.ui_test.execute_dialog_through_command(".uno:Size") as xDialog:
+                    self.assertEqual('12.6', get_state_as_dict(xDialog.getChild('MTR_FLD_WIDTH'))['Value'])
+                    self.assertEqual('4.57', get_state_as_dict(xDialog.getChild('MTR_FLD_HEIGHT'))['Value'])
+                    self.assertEqual('0.95', get_state_as_dict(xDialog.getChild('MTR_FLD_POS_X'))['Value'])
+                    self.assertEqual('3.84', get_state_as_dict(xDialog.getChild('MTR_FLD_POS_Y'))['Value'])
+                    self.assertEqual('0', get_state_as_dict(xDialog.getChild('NF_ANGLE'))['Value'])
 
-            self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName())
-            xEditWin.executeAction("DESELECT", tuple())
-            self.assertIsNone(document.CurrentSelection)
+                self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName())
+                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:
@@ -100,33 +100,34 @@ class ImpressDrawinglayerTest(UITestCase):
             xCancelBtn = xTemplateDlg.getChild("close")
             self.ui_test.close_dialog_through_button(xCancelBtn)
 
-            xImpressDoc = self.xUITest.getTopFocusWindow()
+            with change_measurement_unit(self, 'Centimeter'):
+                xImpressDoc = self.xUITest.getTopFocusWindow()
 
-            self.assertIsNone(document.CurrentSelection)
+                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())
+                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'])
+                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"}))
+                xDrawinglayerObject = xEditWin.getChild("Unnamed Drawinglayer object 1")
+                xDrawinglayerObject.executeAction("ROTATE", mkPropertyValues({"X": "500", "Y":"4000", "ANGLE": "3000"}))
 
-            xEditWin.executeAction("SELECT", mkPropertyValues({"OBJECT":"Unnamed Drawinglayer object 1"}))
-            self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName())
+                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('30', get_state_as_dict(xDialog.getChild('NF_ANGLE'))['Value'])
+                with self.ui_test.execute_dialog_through_command(".uno:Size") as xDialog:
+                    self.assertEqual('30', get_state_as_dict(xDialog.getChild('NF_ANGLE'))['Value'])
 
-            self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName())
-            xEditWin.executeAction("DESELECT", tuple())
-            self.assertIsNone(document.CurrentSelection)
+                self.assertEqual("com.sun.star.drawing.SvxShapeCollection", document.CurrentSelection.getImplementationName())
+                xEditWin.executeAction("DESELECT", tuple())
+                self.assertIsNone(document.CurrentSelection)
 
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/uitest/uihelper/common.py b/uitest/uitest/uihelper/common.py
index ffdf90d48db8..17b682b0e0eb 100644
--- a/uitest/uitest/uihelper/common.py
+++ b/uitest/uitest/uihelper/common.py
@@ -6,6 +6,7 @@
 #
 
 from libreoffice.uno.propertyvalue import convert_property_values_to_dict, mkPropertyValues
+from contextlib import contextmanager
 import org.libreoffice.unotest
 import pathlib
 
@@ -28,7 +29,16 @@ def select_text(ui_object, from_pos, to):
 def get_url_for_data_file(file_name):
     return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
+@contextmanager
 def change_measurement_unit(UITestCase, unit):
+    try:
+        launch_option_dialog(UITestCase, unit)
+        yield
+    finally:
+        # change to default value
+        launch_option_dialog(UITestCase, 'Inch')
+
+def launch_option_dialog(UITestCase, unit):
     with UITestCase.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialogOpt:
         xPages = xDialogOpt.getChild("pages")
         xAppEntry = xPages.getChild('3')