1 files changed, 29 insertions, 83 deletions
diff --git a/sw/qa/uitest/writer_tests3/insertSignatureLine.py b/sw/qa/uitest/writer_tests3/insertSignatureLine.py
index eb75b6cc89b2..80d1b4edc4dd 100644
--- a/sw/qa/uitest/writer_tests3/insertSignatureLine.py
+++ b/sw/qa/uitest/writer_tests3/insertSignatureLine.py
@@ -1,97 +1,43 @@
 # -*- 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 libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import get_state_as_dict, type_text
-from libreoffice.uno.propertyvalue import mkPropertyValues
-from com.sun.star.lang import IndexOutOfBoundsException
 
 class insertSignatureLine(UITestCase):
 
    def test_insert_signature_line(self):
-        self.ui_test.create_doc_in_start_center("writer")
-        document = self.ui_test.get_component()
-        xWriterDoc = self.xUITest.getTopFocusWindow()
-
-        # cancel the dialog without doing anything
-        self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine")
-        xDialog = self.xUITest.getTopFocusWindow()
-
-        xName = xDialog.getChild("edit_name")
-        xName.executeAction("TYPE", mkPropertyValues({"TEXT":"Name"})) #set the signature line
-
-        xCloseBtn = xDialog.getChild("cancel")
-        self.ui_test.close_dialog_through_button(xCloseBtn)
-        with self.assertRaises(IndexOutOfBoundsException):
-            document.DrawPage.getByIndex(0)
-
-        # set the signature line
-        self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine")
-        xDialog = self.xUITest.getTopFocusWindow()
-
-        xName = xDialog.getChild("edit_name")
-        xTitle = xDialog.getChild("edit_title")
-        xEmail = xDialog.getChild("edit_email")
-        xComment = xDialog.getChild("checkbox_can_add_comments")
-        xInstructions = xDialog.getChild("edit_instructions")
-
-        xName.executeAction("TYPE", mkPropertyValues({"TEXT":"Name"})) #set the signature line
-        xTitle.executeAction("TYPE", mkPropertyValues({"TEXT":"Title"}))
-        xEmail.executeAction("TYPE", mkPropertyValues({"TEXT":"Email"}))
-        xComment.executeAction("CLICK", tuple())
-        xInstructions.executeAction("TYPE", mkPropertyValues({"TEXT":"Instructions"}))
-        xOKBtn = xDialog.getChild("ok")
-        xOKBtn.executeAction("CLICK", tuple())
-
-        #check the signature Line in the document
-        element = document.DrawPage.getByIndex(0)
-        self.assertEqual(element.SignatureLineSuggestedSignerName, "Name")
-        self.assertEqual(element.SignatureLineSuggestedSignerTitle, "Title")
-        self.assertEqual(element.SignatureLineSuggestedSignerEmail, "Email")
-        self.assertEqual(element.SignatureLineSuggestedSignerTitle, "Title")
-        self.assertEqual(element.SignatureLineCanAddComment, False)
-        self.assertEqual(element.SignatureLineShowSignDate, True)
-        self.assertEqual(element.SignatureLineSigningInstructions, "Instructions")
-
-        self.ui_test.close_doc()
-
-   def test_insert_signature_line2(self):
-        self.ui_test.create_doc_in_start_center("writer")
-        document = self.ui_test.get_component()
-        xWriterDoc = self.xUITest.getTopFocusWindow()
-
-        self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine")
-        xDialog = self.xUITest.getTopFocusWindow()
-
-        xName = xDialog.getChild("edit_name")
-        xTitle = xDialog.getChild("edit_title")
-        xEmail = xDialog.getChild("edit_email")
-        xComment = xDialog.getChild("checkbox_can_add_comments")
-        xDate = xDialog.getChild("checkbox_show_sign_date")
-        xInstructions = xDialog.getChild("edit_instructions")
-
-        xName.executeAction("TYPE", mkPropertyValues({"TEXT":"Name"})) #set the signature line
-        xTitle.executeAction("TYPE", mkPropertyValues({"TEXT":"Title"}))
-        xEmail.executeAction("TYPE", mkPropertyValues({"TEXT":"Email"}))
-        xDate.executeAction("CLICK", tuple())
-        xComment.executeAction("CLICK", tuple())
-        xInstructions.executeAction("TYPE", mkPropertyValues({"TEXT":"Instructions"}))
-        xOKBtn = xDialog.getChild("ok")
-        xOKBtn.executeAction("CLICK", tuple())
-
-        #check the signature Line in the document
-        element = document.DrawPage.getByIndex(0)
-        self.assertEqual(element.SignatureLineSuggestedSignerName, "Name")
-        self.assertEqual(element.SignatureLineSuggestedSignerTitle, "Title")
-        self.assertEqual(element.SignatureLineSuggestedSignerEmail, "Email")
-        self.assertEqual(element.SignatureLineSuggestedSignerTitle, "Title")
-        self.assertEqual(element.SignatureLineCanAddComment, False)
-        self.assertEqual(element.SignatureLineShowSignDate, False)
-        self.assertEqual(element.SignatureLineSigningInstructions, "Instructions")
+        with self.ui_test.create_doc_in_start_center("writer") as document:
+
+            # set the signature line
+            with self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine") as xDialog:
+
+                xName = xDialog.getChild("edit_name")
+                xTitle = xDialog.getChild("edit_title")
+                xEmail = xDialog.getChild("edit_email")
+                xComment = xDialog.getChild("checkbox_can_add_comments")
+                xInstructions = xDialog.getChild("edit_instructions")
+
+                xName.executeAction("TYPE", mkPropertyValues({"TEXT":"Name"})) #set the signature line
+                xTitle.executeAction("TYPE", mkPropertyValues({"TEXT":"Title"}))
+                xEmail.executeAction("TYPE", mkPropertyValues({"TEXT":"Email"}))
+                xComment.executeAction("CLICK", tuple())
+                xInstructions.executeAction("TYPE", mkPropertyValues({"TEXT":"Instructions"}))
+
+            #check the signature Line in the document
+            element = document.DrawPage[0]
+            self.assertEqual(element.SignatureLineSuggestedSignerName, "Name")
+            self.assertEqual(element.SignatureLineSuggestedSignerTitle, "Title")
+            self.assertEqual(element.SignatureLineSuggestedSignerEmail, "Email")
+            self.assertEqual(element.SignatureLineSuggestedSignerTitle, "Title")
+            self.assertEqual(element.SignatureLineCanAddComment, False)
+            self.assertEqual(element.SignatureLineShowSignDate, True)
+            self.assertEqual(element.SignatureLineSigningInstructions, "Instructions")
 
-        self.ui_test.close_doc()
 # vim: set shiftwidth=4 softtabstop=4 expandtab: