sc/qa/uitest/calc_tests3/insertQrCodeGen.py | 25 ---------------- sc/qa/uitest/signatureLine/insertSignatureLine.py | 34 ---------------------- sw/qa/uitest/writer_tests3/insertQrCodeGen.py | 24 --------------- sw/qa/uitest/writer_tests3/insertSignatureLine.py | 34 ---------------------- 4 files changed, 117 deletions(-)
New commits: commit 6439ee65bdfc4151d96ff2aeb3958949996cbc77 Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Mon Feb 28 18:28:30 2022 +0100 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Mon Mar 7 14:11:34 2022 +0100 uitest: remove duplicated tests They are pretty much the same as the other one in the same file Besides, the 'with self.assertRaises(IndexOutOfBoundsException)' nonsense Change-Id: I0ad9aaf80721eb49080d94a34deb43b0bc39724c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130718 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131101 diff --git a/sc/qa/uitest/calc_tests3/insertQrCodeGen.py b/sc/qa/uitest/calc_tests3/insertQrCodeGen.py index ffc2dd37047f..50cb75641027 100644 --- a/sc/qa/uitest/calc_tests3/insertQrCodeGen.py +++ b/sc/qa/uitest/calc_tests3/insertQrCodeGen.py @@ -21,9 +21,6 @@ class insertQrCode(UITestCase): xURL = xDialog.getChild("edit_text") type_text(xURL, "www.libreoffice.org") - with self.assertRaises(IndexOutOfBoundsException): - document.Sheets.getByIndex(0).DrawPage.getByIndex(0) - # Reopen the dialog box with self.ui_test.execute_dialog_through_command(".uno:InsertQrCode") as xDialog: @@ -42,26 +39,4 @@ class insertQrCode(UITestCase): self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).BarCodeProperties.ErrorCorrection, 1) self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).BarCodeProperties.Border, 1) - - def test_insert_qr_code_gen2(self): - with self.ui_test.create_doc_in_start_center("calc") as document: - xCalcDoc = self.xUITest.getTopFocusWindow() - gridwin = xCalcDoc.getChild("grid_window") - - with self.ui_test.execute_dialog_through_command(".uno:InsertQrCode") as xDialog: - - xURL = xDialog.getChild("edit_text") - xECC_Low = xDialog.getChild("button_low") - xBorder = xDialog.getChild("edit_margin") - - type_text(xURL, "www.libreoffice.org") #set the QR code - xECC_Low.executeAction("CLICK", tuple()) - xBorder.executeAction("UP", tuple()) - xBorder.executeAction("DOWN", tuple()) - - #check the QR Code in the document - self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).BarCodeProperties.Payload, "www.libreoffice.org") - self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).BarCodeProperties.ErrorCorrection, 1) - self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).BarCodeProperties.Border, 1) - # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sc/qa/uitest/signatureLine/insertSignatureLine.py b/sc/qa/uitest/signatureLine/insertSignatureLine.py index 26e259a5d2f1..28d9c4e29fcc 100644 --- a/sc/qa/uitest/signatureLine/insertSignatureLine.py +++ b/sc/qa/uitest/signatureLine/insertSignatureLine.py @@ -25,9 +25,6 @@ class insertSignatureLineCalc(UITestCase): xName = xDialog.getChild("edit_name") xName.executeAction("TYPE", mkPropertyValues({"TEXT":"Name"})) #set the signature line - with self.assertRaises(IndexOutOfBoundsException): - document.Sheets.getByIndex(0).DrawPage.getByIndex(0) - # set the signature line with self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine") as xDialog: @@ -52,35 +49,4 @@ class insertSignatureLineCalc(UITestCase): self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).SignatureLineShowSignDate, True) self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).SignatureLineSigningInstructions, "Instructions") - - def test_insert_signature_line2_calc(self): - with self.ui_test.create_doc_in_start_center("calc") as document: - xCalcDoc = self.xUITest.getTopFocusWindow() - gridwin = xCalcDoc.getChild("grid_window") - - 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") - 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"})) - - #check the signature Line in the document - self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).SignatureLineSuggestedSignerName, "Name") - self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).SignatureLineSuggestedSignerTitle, "Title") - self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).SignatureLineSuggestedSignerEmail, "Email") - self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).SignatureLineSuggestedSignerTitle, "Title") - self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).SignatureLineCanAddComment, False) - self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).SignatureLineShowSignDate, False) - self.assertEqual(document.Sheets.getByIndex(0).DrawPage.getByIndex(0).SignatureLineSigningInstructions, "Instructions") - # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sw/qa/uitest/writer_tests3/insertQrCodeGen.py b/sw/qa/uitest/writer_tests3/insertQrCodeGen.py index 761fd0f2d790..5083703926e8 100644 --- a/sw/qa/uitest/writer_tests3/insertQrCodeGen.py +++ b/sw/qa/uitest/writer_tests3/insertQrCodeGen.py @@ -20,9 +20,6 @@ class insertQrCode(UITestCase): xURL = xDialog.getChild("edit_text") type_text(xURL, "www.libreoffice.org") - with self.assertRaises(IndexOutOfBoundsException): - document.DrawPage.getByIndex(0) - # Reopen the dialog box with self.ui_test.execute_dialog_through_command(".uno:InsertQrCode") as xDialog: @@ -41,25 +38,4 @@ class insertQrCode(UITestCase): self.assertEqual(document.DrawPage.getByIndex(0).BarCodeProperties.ErrorCorrection, 1) self.assertEqual(document.DrawPage.getByIndex(0).BarCodeProperties.Border, 1) - - def test_insert_qr_code_gen2(self): - with self.ui_test.create_doc_in_start_center("writer") as document: - xWriterDoc = self.xUITest.getTopFocusWindow() - - with self.ui_test.execute_dialog_through_command(".uno:InsertQrCode") as xDialog: - - xURL = xDialog.getChild("edit_text") - xECC_Low = xDialog.getChild("button_low") - xBorder = xDialog.getChild("edit_margin") - - type_text(xURL, "www.libreoffice.org") #set the QR code - xECC_Low.executeAction("CLICK", tuple()) - xBorder.executeAction("UP", tuple()) - xBorder.executeAction("DOWN", tuple()) - - #check the QR Code in the document - self.assertEqual(document.DrawPage.getByIndex(0).BarCodeProperties.Payload, "www.libreoffice.org") - self.assertEqual(document.DrawPage.getByIndex(0).BarCodeProperties.ErrorCorrection, 1) - self.assertEqual(document.DrawPage.getByIndex(0).BarCodeProperties.Border, 1) - # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sw/qa/uitest/writer_tests3/insertSignatureLine.py b/sw/qa/uitest/writer_tests3/insertSignatureLine.py index 6f7642826fff..74ba342006da 100644 --- a/sw/qa/uitest/writer_tests3/insertSignatureLine.py +++ b/sw/qa/uitest/writer_tests3/insertSignatureLine.py @@ -20,9 +20,6 @@ class insertSignatureLine(UITestCase): xName = xDialog.getChild("edit_name") xName.executeAction("TYPE", mkPropertyValues({"TEXT":"Name"})) #set the signature line - with self.assertRaises(IndexOutOfBoundsException): - document.DrawPage.getByIndex(0) - # set the signature line with self.ui_test.execute_dialog_through_command(".uno:InsertSignatureLine") as xDialog: @@ -48,35 +45,4 @@ class insertSignatureLine(UITestCase): self.assertEqual(element.SignatureLineShowSignDate, True) self.assertEqual(element.SignatureLineSigningInstructions, "Instructions") - - def test_insert_signature_line2(self): - with self.ui_test.create_doc_in_start_center("writer") as document: - xWriterDoc = self.xUITest.getTopFocusWindow() - - 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") - 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"})) - - #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") - # vim: set shiftwidth=4 softtabstop=4 expandtab: