diff options
Diffstat (limited to 'sc/qa/uitest/chart/tdf136011.py')
| -rw-r--r-- | sc/qa/uitest/chart/tdf136011.py | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/sc/qa/uitest/chart/tdf136011.py b/sc/qa/uitest/chart/tdf136011.py index e4bcbd5f975e..a523b8ecaa0e 100644 --- a/sc/qa/uitest/chart/tdf136011.py +++ b/sc/qa/uitest/chart/tdf136011.py @@ -22,36 +22,35 @@ class tdf136011(UITestCase): # Test both charts for i, name in enumerate(xObjectNames): - calc_doc = self.ui_test.load_file(get_url_for_data_file("tdf136011.ods")) - xCalcDoc = self.xUITest.getTopFocusWindow() - gridwin = xCalcDoc.getChild("grid_window") - document = self.ui_test.get_component() + with self.ui_test.load_file(get_url_for_data_file("tdf136011.ods")) as calc_doc: + xCalcDoc = self.xUITest.getTopFocusWindow() + gridwin = xCalcDoc.getChild("grid_window") + document = self.ui_test.get_component() - xExpectedResults = [] - for category in xCategories: - for subCategory in xSubCategories[i]: - xExpectedResults.append(category + ' ' + subCategory) + xExpectedResults = [] + for category in xCategories: + for subCategory in xSubCategories[i]: + xExpectedResults.append(category + ' ' + subCategory) - gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": name})) + gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": name})) - self.xUITest.executeCommand(".uno:Copy") + self.xUITest.executeCommand(".uno:Copy") - self.xUITest.executeCommand(".uno:CloseDoc") + self.xUITest.executeCommand(".uno:CloseDoc") - 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.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:Paste") + self.xUITest.executeCommand(".uno:Paste") - xData = document.Sheets[0].Charts[0].getEmbeddedObject().Data + xData = document.Sheets[0].Charts[0].getEmbeddedObject().Data - self.assertEqual(xColumnNames, list(xData.ColumnDescriptions)) + self.assertEqual(xColumnNames, list(xData.ColumnDescriptions)) - # Without the fix in place, the numbers in the categories in chart - # 'Object 2' wouldn't have been pasted to the new document - self.assertEqual(xExpectedResults, list(xData.RowDescriptions)) + # Without the fix in place, the numbers in the categories in chart + # 'Object 2' wouldn't have been pasted to the new document + self.assertEqual(xExpectedResults, list(xData.RowDescriptions)) - self.ui_test.close_doc() # vim: set shiftwidth=4 softtabstop=4 expandtab: |