diff options
Diffstat (limited to 'sc/qa/uitest/chart/tdf62057.py')
-rw-r--r-- | sc/qa/uitest/chart/tdf62057.py | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/sc/qa/uitest/chart/tdf62057.py b/sc/qa/uitest/chart/tdf62057.py index dc67dd8db5a5..6cb1ef8cdd21 100644 --- a/sc/qa/uitest/chart/tdf62057.py +++ b/sc/qa/uitest/chart/tdf62057.py @@ -12,48 +12,46 @@ from uitest.uihelper.common import get_url_for_data_file class tdf62057(UITestCase): def test_tdf62057(self): - calc_doc = self.ui_test.load_file(get_url_for_data_file("tdf62057.ods")) - xCalcDoc = self.xUITest.getTopFocusWindow() - gridwin = xCalcDoc.getChild("grid_window") + with self.ui_test.load_file(get_url_for_data_file("tdf62057.ods")) as calc_doc: + xCalcDoc = self.xUITest.getTopFocusWindow() + gridwin = xCalcDoc.getChild("grid_window") - document = self.ui_test.get_component() + document = self.ui_test.get_component() - xDataMatrix = [] - for column in range(1, 3): - xColumn = [] - for row in range(0, 6): - xColumn.append(round(get_cell_by_position(document, 0, column, row).getValue(), 5)) - xDataMatrix.append(xColumn) - - xRowDescriptions = [] - for row in range(0, 6): - xRowDescriptions.append(get_cell_by_position(document, 0, 0, row).getString()) + xDataMatrix = [] + for column in range(1, 3): + xColumn = [] + for row in range(0, 6): + xColumn.append(round(get_cell_by_position(document, 0, column, row).getValue(), 5)) + xDataMatrix.append(xColumn) - gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"})) + xRowDescriptions = [] + for row in range(0, 6): + xRowDescriptions.append(get_cell_by_position(document, 0, 0, row).getString()) - self.xUITest.executeCommand(".uno:Copy") + gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"})) - self.xUITest.executeCommand(".uno:CloseDoc") + self.xUITest.executeCommand(".uno:Copy") - self.ui_test.create_doc_in_start_center("calc") - xCalcDoc = self.xUITest.getTopFocusWindow() - gridwin = xCalcDoc.getChild("grid_window") - document = self.ui_test.get_component() + self.xUITest.executeCommand(".uno:CloseDoc") - self.xUITest.executeCommand(".uno:Paste") + self.ui_test.create_doc_in_start_center("calc") + xCalcDoc = self.xUITest.getTopFocusWindow() + gridwin = xCalcDoc.getChild("grid_window") + document = self.ui_test.get_component() - xData = document.Sheets[0].Charts[0].getEmbeddedObject().Data + self.xUITest.executeCommand(".uno:Paste") - xNewDataMatrix = [] - xNewDataMatrix.append([round(item[0], 5) for item in xData.Data]) - xNewDataMatrix.append([round(item[1], 5) for item in xData.Data]) + xData = document.Sheets[0].Charts[0].getEmbeddedObject().Data - # Without the fix in place, this test would have failed with - # AssertionError: Lists differ: ['10m', '11v', '12m', '13m', '14m', '15v'] != ['55.3796', '35.0989'] - self.assertEqual(xRowDescriptions, list(xData.RowDescriptions)) + xNewDataMatrix = [] + xNewDataMatrix.append([round(item[0], 5) for item in xData.Data]) + xNewDataMatrix.append([round(item[1], 5) for item in xData.Data]) - self.assertEqual(xDataMatrix, xNewDataMatrix) + # Without the fix in place, this test would have failed with + # AssertionError: Lists differ: ['10m', '11v', '12m', '13m', '14m', '15v'] != ['55.3796', '35.0989'] + self.assertEqual(xRowDescriptions, list(xData.RowDescriptions)) - self.ui_test.close_doc() + self.assertEqual(xDataMatrix, xNewDataMatrix) # vim: set shiftwidth=4 softtabstop=4 expandtab: |