diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-06-30 11:01:58 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-06-30 13:17:54 +0200 |
commit | 57e8d25a40d7c053fef8ecb452e159264c659604 (patch) | |
tree | 9b7ca9fc7cbe8972d1caba9e583fc77f6c5a91b1 /sc/qa/uitest/manual_tests | |
parent | adf59322c651e8e6740a8d97d963dcf0972bdc54 (diff) |
uitest: guard create_doc_in_start_center in sc
Mostly done by a script
for motivation, see 89aaa17a0a4413f07da2bc5084b0164f15dc01ac
< UITest: introduce guarded context managers >
Change-Id: I9392c56e6efccde958f0cdd497376b3939b75be4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118152
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc/qa/uitest/manual_tests')
-rw-r--r-- | sc/qa/uitest/manual_tests/calc.py | 244 | ||||
-rw-r--r-- | sc/qa/uitest/manual_tests/more_calc.py | 46 |
2 files changed, 140 insertions, 150 deletions
diff --git a/sc/qa/uitest/manual_tests/calc.py b/sc/qa/uitest/manual_tests/calc.py index 92c33e0d1803..bba77075f5bf 100644 --- a/sc/qa/uitest/manual_tests/calc.py +++ b/sc/qa/uitest/manual_tests/calc.py @@ -16,196 +16,188 @@ class ManualCalcTests(UITestCase): # http://manual-test.libreoffice.org/manage/case/189/ def test_define_database_range(self): - self.ui_test.create_doc_in_start_center("calc") + with self.ui_test.create_doc_in_start_center_guarded("calc") as document: - # Select range A1:D10 - xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") - xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:D10"})) + # Select range A1:D10 + xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") + xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:D10"})) - # Execute "Define DB Range dialog" - self.ui_test.execute_modeless_dialog_through_command(".uno:DefineDBName") + # Execute "Define DB Range dialog" + self.ui_test.execute_modeless_dialog_through_command(".uno:DefineDBName") - xDefineNameDlg = self.xUITest.getTopFocusWindow() + xDefineNameDlg = self.xUITest.getTopFocusWindow() - xEntryBox = xDefineNameDlg.getChild("entry") - type_text(xEntryBox, "my_database") + xEntryBox = xDefineNameDlg.getChild("entry") + type_text(xEntryBox, "my_database") - xOkBtn = xDefineNameDlg.getChild("ok") - self.ui_test.close_dialog_through_button(xOkBtn) + xOkBtn = xDefineNameDlg.getChild("ok") + self.ui_test.close_dialog_through_button(xOkBtn) - # Deselect range - xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) + # Deselect range + xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) - # Execute "Select DB Range dialog" - with self.ui_test.execute_dialog_through_command(".uno:SelectDB") as xSelectNameDlg: + # Execute "Select DB Range dialog" + with self.ui_test.execute_dialog_through_command(".uno:SelectDB") as xSelectNameDlg: - xListBox = xSelectNameDlg.getChild("treeview") - xListBoxState = get_state_as_dict(xListBox) - self.assertEqual(xListBoxState["SelectionCount"], "1") - self.assertEqual(xListBoxState["SelectEntryText"], "my_database") + xListBox = xSelectNameDlg.getChild("treeview") + xListBoxState = get_state_as_dict(xListBox) + self.assertEqual(xListBoxState["SelectionCount"], "1") + self.assertEqual(xListBoxState["SelectEntryText"], "my_database") - # Assert that the correct range has been selected - gridWinState = get_state_as_dict(xGridWin) - self.assertEqual(gridWinState["MarkedArea"], "Sheet1.A1:Sheet1.D10") + # Assert that the correct range has been selected + gridWinState = get_state_as_dict(xGridWin) + self.assertEqual(gridWinState["MarkedArea"], "Sheet1.A1:Sheet1.D10") - self.ui_test.close_doc() # http://manual-test.libreoffice.org/manage/case/190/ def test_sort_data(self): - self.ui_test.create_doc_in_start_center("calc") - - # Insert data - xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") - enter_text_to_cell(xGridWin, "B1", "3") - enter_text_to_cell(xGridWin, "B2", "25") - enter_text_to_cell(xGridWin, "B3", "17") - enter_text_to_cell(xGridWin, "B4", "9") - enter_text_to_cell(xGridWin, "B5", "19") - enter_text_to_cell(xGridWin, "B6", "0") - enter_text_to_cell(xGridWin, "B7", "107") - enter_text_to_cell(xGridWin, "B8", "89") - enter_text_to_cell(xGridWin, "B9", "8") - enter_text_to_cell(xGridWin, "B10", "33") - - xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "B1:B10"})) - - # Execute "Sort" dialog - with self.ui_test.execute_dialog_through_command(".uno:DataSort"): - pass - - document = self.ui_test.get_component() - - self.assertEqual(get_cell_by_position(document, 0, 1, 0).getValue(), 0) - self.assertEqual(get_cell_by_position(document, 0, 1, 1).getValue(), 3) - self.assertEqual(get_cell_by_position(document, 0, 1, 2).getValue(), 8) - self.assertEqual(get_cell_by_position(document, 0, 1, 3).getValue(), 9) - self.assertEqual(get_cell_by_position(document, 0, 1, 4).getValue(), 17) - self.assertEqual(get_cell_by_position(document, 0, 1, 5).getValue(), 19) - self.assertEqual(get_cell_by_position(document, 0, 1, 6).getValue(), 25) - self.assertEqual(get_cell_by_position(document, 0, 1, 7).getValue(), 33) - self.assertEqual(get_cell_by_position(document, 0, 1, 8).getValue(), 89) - self.assertEqual(get_cell_by_position(document, 0, 1, 9).getValue(), 107) - - self.ui_test.close_doc() + with self.ui_test.create_doc_in_start_center_guarded("calc") as document: + + # Insert data + xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") + enter_text_to_cell(xGridWin, "B1", "3") + enter_text_to_cell(xGridWin, "B2", "25") + enter_text_to_cell(xGridWin, "B3", "17") + enter_text_to_cell(xGridWin, "B4", "9") + enter_text_to_cell(xGridWin, "B5", "19") + enter_text_to_cell(xGridWin, "B6", "0") + enter_text_to_cell(xGridWin, "B7", "107") + enter_text_to_cell(xGridWin, "B8", "89") + enter_text_to_cell(xGridWin, "B9", "8") + enter_text_to_cell(xGridWin, "B10", "33") + + xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "B1:B10"})) + + # Execute "Sort" dialog + with self.ui_test.execute_dialog_through_command(".uno:DataSort"): + pass + + + self.assertEqual(get_cell_by_position(document, 0, 1, 0).getValue(), 0) + self.assertEqual(get_cell_by_position(document, 0, 1, 1).getValue(), 3) + self.assertEqual(get_cell_by_position(document, 0, 1, 2).getValue(), 8) + self.assertEqual(get_cell_by_position(document, 0, 1, 3).getValue(), 9) + self.assertEqual(get_cell_by_position(document, 0, 1, 4).getValue(), 17) + self.assertEqual(get_cell_by_position(document, 0, 1, 5).getValue(), 19) + self.assertEqual(get_cell_by_position(document, 0, 1, 6).getValue(), 25) + self.assertEqual(get_cell_by_position(document, 0, 1, 7).getValue(), 33) + self.assertEqual(get_cell_by_position(document, 0, 1, 8).getValue(), 89) + self.assertEqual(get_cell_by_position(document, 0, 1, 9).getValue(), 107) + # http://manual-test.libreoffice.org/manage/case/191/ def test_validation(self): - self.ui_test.create_doc_in_start_center("calc") + with self.ui_test.create_doc_in_start_center_guarded("calc") as document: - xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") - xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C10"})) + xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") + xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C10"})) - with self.ui_test.execute_dialog_through_command(".uno:Validation") as xValidationDlg: + with self.ui_test.execute_dialog_through_command(".uno:Validation") as xValidationDlg: - xAllowList = xValidationDlg.getChild("allow") - xAllowList.executeAction("SELECT", mkPropertyValues({"POS": "1"})) + xAllowList = xValidationDlg.getChild("allow") + xAllowList.executeAction("SELECT", mkPropertyValues({"POS": "1"})) - xData = xValidationDlg.getChild("data") - xData.executeAction("SELECT", mkPropertyValues({"POS": "5"})) + xData = xValidationDlg.getChild("data") + xData.executeAction("SELECT", mkPropertyValues({"POS": "5"})) - xVal = xValidationDlg.getChild("max") - xVal.executeAction("TYPE", mkPropertyValues({"TEXT":"0"})) + xVal = xValidationDlg.getChild("max") + xVal.executeAction("TYPE", mkPropertyValues({"TEXT":"0"})) - def enter_text(cell, text): - enter_text_to_cell(xGridWin, cell, text) + def enter_text(cell, text): + enter_text_to_cell(xGridWin, cell, text) - with self.ui_test.execute_blocking_action(enter_text, args=("A1", "abc")): - pass - with self.ui_test.execute_blocking_action(enter_text, args=("B6", "2.18")): - pass + with self.ui_test.execute_blocking_action(enter_text, args=("A1", "abc")): + pass + with self.ui_test.execute_blocking_action(enter_text, args=("B6", "2.18")): + pass - enter_text_to_cell(xGridWin, "C2", "24") + enter_text_to_cell(xGridWin, "C2", "24") - self.ui_test.close_doc() # http://manual-test.libreoffice.org/manage/case/187/ def test_transpose(self): - self.ui_test.create_doc_in_start_center("calc") + with self.ui_test.create_doc_in_start_center_guarded("calc") as document: - xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") - enter_text_to_cell(xGridWin, "B3", "abcd") - enter_text_to_cell(xGridWin, "B4", "edfg") - enter_text_to_cell(xGridWin, "C3", "35") - enter_text_to_cell(xGridWin, "C4", "5678") + xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") + enter_text_to_cell(xGridWin, "B3", "abcd") + enter_text_to_cell(xGridWin, "B4", "edfg") + enter_text_to_cell(xGridWin, "C3", "35") + enter_text_to_cell(xGridWin, "C4", "5678") - xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C10"})) + xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C10"})) - self.xUITest.executeCommand(".uno:Cut") + self.xUITest.executeCommand(".uno:Cut") - xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) + xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) - with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xPasteSpecialDlg: + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xPasteSpecialDlg: - xAllChkBox = xPasteSpecialDlg.getChild("paste_all") - xAllChkBox.executeAction("CLICK", tuple()) + xAllChkBox = xPasteSpecialDlg.getChild("paste_all") + xAllChkBox.executeAction("CLICK", tuple()) - xTransposeChkBox = xPasteSpecialDlg.getChild("transpose") - xTransposeChkBox.executeAction("CLICK", tuple()) + xTransposeChkBox = xPasteSpecialDlg.getChild("transpose") + xTransposeChkBox.executeAction("CLICK", tuple()) - document = self.ui_test.get_component() - self.assertEqual(get_cell_by_position(document, 0, 2, 1).getString(), "abcd") - self.assertEqual(get_cell_by_position(document, 0, 2, 2).getValue(), 35) - self.assertEqual(get_cell_by_position(document, 0, 3, 1).getString(), "edfg") - self.assertEqual(get_cell_by_position(document, 0, 3, 2).getValue(), 5678) + self.assertEqual(get_cell_by_position(document, 0, 2, 1).getString(), "abcd") + self.assertEqual(get_cell_by_position(document, 0, 2, 2).getValue(), 35) + self.assertEqual(get_cell_by_position(document, 0, 3, 1).getString(), "edfg") + self.assertEqual(get_cell_by_position(document, 0, 3, 2).getValue(), 5678) - self.ui_test.close_doc() # http://manual-test.libreoffice.org/manage/case/151/ def test_cell_recalc(self): - with self.ui_test.load_file(get_url_for_data_file("cell_recalc.ods")) as doc: + with self.ui_test.load_file(get_url_for_data_file("cell_recalc.ods")) as document: xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "D2:D9"})) self.xUITest.executeCommand(".uno:Cut") - self.assertEqual(get_cell_by_position(doc, 0, 3, 15).getValue(), 0) + self.assertEqual(get_cell_by_position(document, 0, 3, 15).getValue(), 0) self.xUITest.executeCommand(".uno:Undo") for i in range(1, 9): - self.assertTrue(get_cell_by_position(doc, 0, 3, i).getValue() != 0) + self.assertTrue(get_cell_by_position(document, 0, 3, i).getValue() != 0) - self.assertEqual(get_cell_by_position(doc, 0, 3, 15).getValue(), 195) + self.assertEqual(get_cell_by_position(document, 0, 3, 15).getValue(), 195) # http://manual-test.libreoffice.org/manage/case/143/ def test_random_numbers(self): - self.ui_test.create_doc_in_start_center("calc") - xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") + with self.ui_test.create_doc_in_start_center_guarded("calc") as document: + xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") - xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "A2:A10"})) + xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": "A2:A10"})) - self.ui_test.execute_modeless_dialog_through_command(".uno:RandomNumberGeneratorDialog") - xRandomNumberDlg = self.xUITest.getTopFocusWindow() - xDistributionLstBox = xRandomNumberDlg.getChild("distribution-combo") - xDistributionLstBox.executeAction("SELECT", mkPropertyValues({"POS": "1"})) + self.ui_test.execute_modeless_dialog_through_command(".uno:RandomNumberGeneratorDialog") + xRandomNumberDlg = self.xUITest.getTopFocusWindow() + xDistributionLstBox = xRandomNumberDlg.getChild("distribution-combo") + xDistributionLstBox.executeAction("SELECT", mkPropertyValues({"POS": "1"})) - xMin = xRandomNumberDlg.getChild("parameter1-spin") - xMin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "CTRL+A"})) - xMin.executeAction("TYPE", mkPropertyValues({"TEXT": "-2"})) - xMax = xRandomNumberDlg.getChild("parameter2-spin") - xMax.executeAction("TYPE", mkPropertyValues({"KEYCODE": "CTRL+A"})) - xMax.executeAction("TYPE", mkPropertyValues({"TEXT": "10"})) + xMin = xRandomNumberDlg.getChild("parameter1-spin") + xMin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "CTRL+A"})) + xMin.executeAction("TYPE", mkPropertyValues({"TEXT": "-2"})) + xMax = xRandomNumberDlg.getChild("parameter2-spin") + xMax.executeAction("TYPE", mkPropertyValues({"KEYCODE": "CTRL+A"})) + xMax.executeAction("TYPE", mkPropertyValues({"TEXT": "10"})) - xApplyBtn = xRandomNumberDlg.getChild("apply") - xApplyBtn.executeAction("CLICK", tuple()) + xApplyBtn = xRandomNumberDlg.getChild("apply") + xApplyBtn.executeAction("CLICK", tuple()) - doc = self.ui_test.get_component() - def check_random_values(): - for i in range(1, 9): - val = get_cell_by_position(doc, 0, 0, i).getValue() - self.assertTrue(val <= 10 and val >= -2) + def check_random_values(): + for i in range(1, 9): + val = get_cell_by_position(document, 0, 0, i).getValue() + self.assertTrue(val <= 10 and val >= -2) - check_random_values() + check_random_values() - xOkBtn = xRandomNumberDlg.getChild("ok") - self.ui_test.close_dialog_through_button(xOkBtn) + xOkBtn = xRandomNumberDlg.getChild("ok") + self.ui_test.close_dialog_through_button(xOkBtn) - # we might want to check that clicking 'ok' actually changes the values - check_random_values() + # we might want to check that clicking 'ok' actually changes the values + check_random_values() - self.ui_test.close_doc() # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sc/qa/uitest/manual_tests/more_calc.py b/sc/qa/uitest/manual_tests/more_calc.py index 9212c2606e0e..71d913c68f37 100644 --- a/sc/qa/uitest/manual_tests/more_calc.py +++ b/sc/qa/uitest/manual_tests/more_calc.py @@ -21,29 +21,27 @@ class ManualCalcTests(UITestCase): # This test is to check that paste special combined with some options and link is ok. # Refers to tdf#84810 - self.ui_test.create_doc_in_start_center("calc") - - # Write text to cell A1 - xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") - enter_text_to_cell(xGridWin, "A1", "abcd") - - # Copy cell A1 to clipboard - xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) - self.xUITest.executeCommand(".uno:Copy") - - # Set cursor to cell A3 - xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"})) - - # Choose Paste Special Options and paste data - with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xPasteSpecialDlg: - xAllChkBox = xPasteSpecialDlg.getChild("paste_all") - xAllChkBox.executeAction("CLICK", tuple()) - xLinkChkBox = xPasteSpecialDlg.getChild("link") - xLinkChkBox.executeAction("CLICK", tuple()) - - # Assert successful paste - document = self.ui_test.get_component() - self.assertEqual(get_cell_by_position(document, 0, 0, 2).getString(), "abcd") - self.ui_test.close_doc() + with self.ui_test.create_doc_in_start_center_guarded("calc") as document: + + # Write text to cell A1 + xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") + enter_text_to_cell(xGridWin, "A1", "abcd") + + # Copy cell A1 to clipboard + xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) + self.xUITest.executeCommand(".uno:Copy") + + # Set cursor to cell A3 + xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"})) + + # Choose Paste Special Options and paste data + with self.ui_test.execute_dialog_through_command(".uno:PasteSpecial") as xPasteSpecialDlg: + xAllChkBox = xPasteSpecialDlg.getChild("paste_all") + xAllChkBox.executeAction("CLICK", tuple()) + xLinkChkBox = xPasteSpecialDlg.getChild("link") + xLinkChkBox.executeAction("CLICK", tuple()) + + # Assert successful paste + self.assertEqual(get_cell_by_position(document, 0, 0, 2).getString(), "abcd") # vim: set shiftwidth=4 softtabstop=4 expandtab: |