[Libreoffice-commits] core.git: sc/qa sd/qa sw/qa
Xisco Fauli (via logerrit)
logerrit at kemper.freedesktop.org
Sun Jun 27 19:46:06 UTC 2021
sc/qa/uitest/autofilter/autofilterBugs.py | 17
sc/qa/uitest/autofilter/tdf101165.py | 3
sc/qa/uitest/autofilter/tdf117276.py | 1
sc/qa/uitest/autofilter/tdf130070.py | 1
sc/qa/uitest/autofilter/tdf140754.py | 32
sc/qa/uitest/autofilter/tdf92767.py | 1
sc/qa/uitest/autofilter/tdf97340.py | 1
sc/qa/uitest/calc_tests/autofill.py | 85 -
sc/qa/uitest/calc_tests/autosum.py | 177 +---
sc/qa/uitest/calc_tests/tdf133855.py | 5
sc/qa/uitest/calc_tests2/consolidate.py | 65 -
sc/qa/uitest/calc_tests2/standardFilter.py | 39
sc/qa/uitest/calc_tests2/tdf114992.py | 5
sc/qa/uitest/calc_tests2/tdf37623.py | 11
sc/qa/uitest/calc_tests3/tdf57274.py | 5
sc/qa/uitest/calc_tests3/tdf62267.py | 1
sc/qa/uitest/calc_tests3/tdf63805.py | 45 -
sc/qa/uitest/calc_tests3/tdf65856.py | 72 -
sc/qa/uitest/calc_tests3/tdf69981.py | 43 -
sc/qa/uitest/calc_tests3/tdf77509.py | 41
sc/qa/uitest/calc_tests4/tdf85403.py | 3
sc/qa/uitest/calc_tests4/tdf85979.py | 33
sc/qa/uitest/calc_tests4/tdf86253.py | 1
sc/qa/uitest/calc_tests4/tdf89958.py | 1
sc/qa/uitest/calc_tests4/tdf99386.py | 3
sc/qa/uitest/calc_tests4/textToColumns.py | 426 ++++------
sc/qa/uitest/calc_tests6/tdf107267.py | 13
sc/qa/uitest/calc_tests6/tdf107869.py | 51 -
sc/qa/uitest/calc_tests6/tdf118638.py | 13
sc/qa/uitest/calc_tests7/tdf122509.py | 3
sc/qa/uitest/calc_tests7/tdf124818.py | 3
sc/qa/uitest/calc_tests7/tdf124896.py | 3
sc/qa/uitest/calc_tests7/tdf31805.py | 11
sc/qa/uitest/calc_tests7/tdf91425.py | 7
sc/qa/uitest/calc_tests8/tdf114710.py | 1
sc/qa/uitest/calc_tests8/tdf119343.py | 7
sc/qa/uitest/calc_tests8/tdf124829.py | 3
sc/qa/uitest/calc_tests9/tdf126673.py | 1
sc/qa/uitest/calc_tests9/tdf130371.py | 1
sc/qa/uitest/calc_tests9/tdf91217.py | 7
sc/qa/uitest/chart/chartArea.py | 3
sc/qa/uitest/chart/chartAxes.py | 1
sc/qa/uitest/chart/chartDataLabels.py | 13
sc/qa/uitest/chart/chartGrid.py | 1
sc/qa/uitest/chart/chartGrids.py | 1
sc/qa/uitest/chart/chartLegend.py | 1
sc/qa/uitest/chart/chartTitles.py | 15
sc/qa/uitest/chart/chartWall.py | 3
sc/qa/uitest/chart/chartXAxis.py | 1
sc/qa/uitest/chart/chartYAxis.py | 1
sc/qa/uitest/chart/copyPaste.py | 3
sc/qa/uitest/chart/formatDataSeries.py | 1
sc/qa/uitest/chart/tdf101894.py | 5
sc/qa/uitest/chart/tdf107097.py | 3
sc/qa/uitest/chart/tdf120348.py | 3
sc/qa/uitest/chart/tdf122398.py | 1
sc/qa/uitest/chart/tdf123013.py | 1
sc/qa/uitest/chart/tdf123231.py | 1
sc/qa/uitest/chart/tdf123520.py | 1
sc/qa/uitest/chart/tdf124111.py | 1
sc/qa/uitest/chart/tdf129587.py | 5
sc/qa/uitest/chart/tdf133630.py | 3
sc/qa/uitest/chart/tdf134059.py | 1
sc/qa/uitest/chart/tdf136011.py | 1
sc/qa/uitest/chart/tdf142851.py | 1
sc/qa/uitest/chart/tdf43175.py | 4
sc/qa/uitest/chart/tdf62057.py | 5
sc/qa/uitest/chart/tdf62349.py | 3
sc/qa/uitest/chart/tdf93506_trendline.py | 1
sc/qa/uitest/chart/tdf96432.py | 7
sc/qa/uitest/chart/tdf99069.py | 3
sc/qa/uitest/conditional_format/tdf100793.py | 1
sc/qa/uitest/conditional_format/tdf105544.py | 1
sc/qa/uitest/conditional_format/tdf118206.py | 19
sc/qa/uitest/conditional_format/tdf81696.py | 13
sc/qa/uitest/function_wizard/tdf123479.py | 3
sc/qa/uitest/goalSeek/goalSeek.py | 5
sc/qa/uitest/goalSeek/tdf37341.py | 3
sc/qa/uitest/goalSeek/tdf43693.py | 3
sc/qa/uitest/key_f4/tdf102525.py | 15
sc/qa/uitest/pageFormat/tdf123508.py | 1
sc/qa/uitest/range_name/tdf119954.py | 13
sc/qa/uitest/search_replace/tdf35020.py | 9
sc/qa/uitest/search_replace/tdf39959.py | 7
sc/qa/uitest/search_replace/tdf44861.py | 11
sc/qa/uitest/solver/solver.py | 3
sc/qa/uitest/sort/stableSorting.py | 6
sc/qa/uitest/sort/subtotals.py | 16
sc/qa/uitest/sort/tdf105301.py | 1
sc/qa/uitest/sort/tdf49531.py | 17
sc/qa/uitest/sort/tdf53482.py | 7
sc/qa/uitest/sort/tdf54018.py | 15
sc/qa/uitest/sort/tdf57465.py | 13
sc/qa/uitest/sort/tdf95192.py | 15
sc/qa/uitest/sort/tdf99208.py | 15
sc/qa/uitest/sort/tdf99627.py | 9
sc/qa/uitest/statistics/regression.py | 7
sc/qa/uitest/statistics/tdf76731.py | 27
sc/qa/uitest/textCase/textCase.py | 8
sd/qa/uitest/findReplace/findReplace.py | 11
sw/qa/uitest/chapterNumbering/tdf123547.py | 3
sw/qa/uitest/findReplace/findReplace.py | 9
sw/qa/uitest/findReplace/tdf118208.py | 3
sw/qa/uitest/findSimilarity/findSimilarity.py | 1
sw/qa/uitest/navigator/tdf40427.py | 4
sw/qa/uitest/table/sheetToTable.py | 15
sw/qa/uitest/table/splitTable.py | 21
sw/qa/uitest/table/tableProperties.py | 1
sw/qa/uitest/table/tableToText.py | 25
sw/qa/uitest/table/tdf134881_colProportionalAdjust.py | 1
sw/qa/uitest/table/tdf81292.py | 3
sw/qa/uitest/table/tdf99334.py | 3
sw/qa/uitest/table/textToTable.py | 9
sw/qa/uitest/writer_tests/compareDocuments.py | 2
sw/qa/uitest/writer_tests/trackedChanges.py | 6
sw/qa/uitest/writer_tests/versionDialog.py | 1
sw/qa/uitest/writer_tests/wordCount.py | 2
sw/qa/uitest/writer_tests4/spellDialog.py | 3
sw/qa/uitest/writer_tests4/tdf113284.py | 5
sw/qa/uitest/writer_tests4/tdf122449.py | 1
sw/qa/uitest/writer_tests4/tdf134439.py | 4
sw/qa/uitest/writer_tests4/tdf135636.py | 4
sw/qa/uitest/writer_tests4/tdf136578.py | 3
sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py | 5
sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py | 4
sw/qa/uitest/writer_tests5/tdf117039.py | 3
sw/qa/uitest/writer_tests5/tdf118540.py | 3
sw/qa/uitest/writer_tests5/titlePageWizard.py | 3
sw/qa/uitest/writer_tests5/titlePageWizard2.py | 3
sw/qa/uitest/writer_tests6/tdf120731.py | 3
sw/qa/uitest/writer_tests6/tdf124586.py | 3
sw/qa/uitest/writer_tests6/tdf124675.py | 7
sw/qa/uitest/writer_tests6/tdf126017.py | 3
sw/qa/uitest/writer_tests6/tdf126627.py | 3
sw/qa/uitest/writer_tests7/forms.py | 3
sw/qa/uitest/writer_tests7/tdf132169.py | 3
sw/qa/uitest/writer_tests7/tdf137802.py | 3
sw/qa/uitest/writer_tests7/tdf137803.py | 3
sw/qa/uitest/writer_tests7/tdf140117.py | 3
sw/qa/uitest/writer_tests7/tdf90401.py | 6
140 files changed, 802 insertions(+), 997 deletions(-)
New commits:
commit eef1a5f3aa0f1b11024aa6760cf92181b9bf0a96
Author: Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Wed Jun 23 16:16:58 2021 +0200
Commit: Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Sun Jun 27 21:45:32 2021 +0200
uitest: remove duplicated calls to get_component()
after 8298aa62726312eee6f8fbb64a9fc9b12680447f
< uitest: guard execute_blocking_action >
Change-Id: I954c11c42620660afd48a585f5c59ff2196f4b6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117738
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/sc/qa/uitest/autofilter/autofilterBugs.py b/sc/qa/uitest/autofilter/autofilterBugs.py
index ffb6419690ea..908d78aa62d3 100644
--- a/sc/qa/uitest/autofilter/autofilterBugs.py
+++ b/sc/qa/uitest/autofilter/autofilterBugs.py
@@ -13,9 +13,8 @@ class autofilter(UITestCase):
def test_tdf115046(self):
with self.ui_test.load_file(get_url_for_data_file("tdf115046.ods")) as calc_doc:
- document = self.ui_test.get_component()
#autofilter exist
- self.assertEqual(document.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter, True)
+ self.assertEqual(calc_doc.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter, True)
self.ui_test.execute_dialog_through_command(".uno:DataSort")
xDialog = self.xUITest.getTopFocusWindow()
@@ -23,7 +22,7 @@ class autofilter(UITestCase):
xcancBtn = xDialog.getChild("cancel")
self.ui_test.close_dialog_through_button(xcancBtn)
#autofilter still exist
- self.assertEqual(document.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter, True)
+ self.assertEqual(calc_doc.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter, True)
def test_tdf94055(self):
self.ui_test.create_doc_in_start_center("calc")
@@ -58,11 +57,10 @@ class autofilter(UITestCase):
#tdf77479.ods
def test_tdf77479(self):
with self.ui_test.load_file(get_url_for_data_file("tdf77479.ods")) as calc_doc:
- document = self.ui_test.get_component()
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
#autofilter exist
- self.assertEqual(document.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter, True)
+ self.assertEqual(calc_doc.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter, True)
xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "A2:E6"}))
@@ -71,12 +69,11 @@ class autofilter(UITestCase):
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
#autofilter still exist
- self.assertEqual(document.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter, True)
+ self.assertEqual(calc_doc.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter, True)
#112656
def test_tdf112656(self):
with self.ui_test.load_file(get_url_for_data_file("tdf112656.ods")) as calc_doc:
- document = self.ui_test.get_component()
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -91,7 +88,6 @@ class autofilter(UITestCase):
#tdf81124
def test_tdf81124(self):
with self.ui_test.load_file(get_url_for_data_file("tdf81124.ods")) as calc_doc:
- document = self.ui_test.get_component()
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -114,7 +110,6 @@ class autofilter(UITestCase):
#tdf73565
def test_tdf73565(self):
with self.ui_test.load_file(get_url_for_data_file("tdf73565.ods")) as calc_doc:
- document = self.ui_test.get_component()
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -130,7 +125,6 @@ class autofilter(UITestCase):
#tdf65505
def test_tdf65505(self):
with self.ui_test.load_file(get_url_for_data_file("tdf81124.ods")) as calc_doc:
- document = self.ui_test.get_component()
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -146,7 +140,6 @@ class autofilter(UITestCase):
#tdf74857
def test_tdf74857(self):
with self.ui_test.load_file(get_url_for_data_file("tdf74857.ods")) as calc_doc:
- document = self.ui_test.get_component()
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -158,7 +151,6 @@ class autofilter(UITestCase):
#tdf35294
def test_tdf35294(self):
with self.ui_test.load_file(get_url_for_data_file("tdf35294.ods")) as calc_doc:
- document = self.ui_test.get_component()
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -187,7 +179,6 @@ class autofilter(UITestCase):
#tdf55712
def test_tdf55712(self):
with self.ui_test.load_file(get_url_for_data_file("tdf55712.ods")) as calc_doc:
- document = self.ui_test.get_component()
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
diff --git a/sc/qa/uitest/autofilter/tdf101165.py b/sc/qa/uitest/autofilter/tdf101165.py
index e71820e53e0a..8232866be98e 100644
--- a/sc/qa/uitest/autofilter/tdf101165.py
+++ b/sc/qa/uitest/autofilter/tdf101165.py
@@ -16,13 +16,12 @@ class tdf101165(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf101165.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", "COL": "1", "ROW": "0"}))
xFloatWindow = self.xUITest.getFloatWindow()
xAll = xFloatWindow.getChild("toggle_all")
xAll.executeAction("CLICK", tuple())
- self.assertEqual(get_cell_by_position(document, 1, 0, 1).getValue(), 6494)
+ self.assertEqual(get_cell_by_position(calc_doc, 1, 0, 1).getValue(), 6494)
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/autofilter/tdf117276.py b/sc/qa/uitest/autofilter/tdf117276.py
index fdd5e91b7f83..2c5a44be4bd3 100644
--- a/sc/qa/uitest/autofilter/tdf117276.py
+++ b/sc/qa/uitest/autofilter/tdf117276.py
@@ -16,7 +16,6 @@ class tdf117276(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf117276.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
# 1. open attached file
# 2. open filter of column B (Fabrikat) and deselect (Citroen, Fiat, Ford, Opel, Peugeot, Renault, Tesla)
gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", "COL": "1", "ROW": "0"}))
diff --git a/sc/qa/uitest/autofilter/tdf130070.py b/sc/qa/uitest/autofilter/tdf130070.py
index 1ea4b8fbaf9c..decff22e1009 100644
--- a/sc/qa/uitest/autofilter/tdf130070.py
+++ b/sc/qa/uitest/autofilter/tdf130070.py
@@ -16,7 +16,6 @@ class tdf130770(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf130770.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
# 1. open attached file and check initial state
self.assertFalse(is_row_hidden(calc_doc, 0))
diff --git a/sc/qa/uitest/autofilter/tdf140754.py b/sc/qa/uitest/autofilter/tdf140754.py
index 186637e303b9..67a4c5055eb7 100644
--- a/sc/qa/uitest/autofilter/tdf140754.py
+++ b/sc/qa/uitest/autofilter/tdf140754.py
@@ -30,17 +30,15 @@ class tdf140754(UITestCase):
xOKBtn = xDialogOpt.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
- document = self.ui_test.get_component()
- self.assertEqual(0, get_cell_by_position(document, 0, 0, 30).getValue())
- self.assertEqual(0, get_cell_by_position(document, 0, 0, 82).getValue())
- self.assertEqual(1, get_cell_by_position(document, 0, 0, 238).getValue())
- self.assertEqual(28, get_cell_by_position(document, 0, 0, 265).getValue())
- self.assertEqual(28, get_cell_by_position(document, 0, 0, 1370).getValue())
+ self.assertEqual(0, get_cell_by_position(calc_doc, 0, 0, 30).getValue())
+ self.assertEqual(0, get_cell_by_position(calc_doc, 0, 0, 82).getValue())
+ self.assertEqual(1, get_cell_by_position(calc_doc, 0, 0, 238).getValue())
+ self.assertEqual(28, get_cell_by_position(calc_doc, 0, 0, 265).getValue())
+ self.assertEqual(28, get_cell_by_position(calc_doc, 0, 0, 1370).getValue())
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", "COL": "2", "ROW": "0"}))
xFloatWindow = self.xUITest.getFloatWindow()
@@ -55,11 +53,11 @@ class tdf140754(UITestCase):
xOkBtn = xFloatWindow.getChild("ok")
xOkBtn.executeAction("CLICK", tuple())
- self.assertEqual(0, get_cell_by_position(document, 0, 0, 30).getValue())
- self.assertEqual(1, get_cell_by_position(document, 0, 0, 82).getValue())
- self.assertEqual(39, get_cell_by_position(document, 0, 0, 238).getValue())
- self.assertEqual(66, get_cell_by_position(document, 0, 0, 265).getValue())
- self.assertEqual(282, get_cell_by_position(document, 0, 0, 1370).getValue())
+ self.assertEqual(0, get_cell_by_position(calc_doc, 0, 0, 30).getValue())
+ self.assertEqual(1, get_cell_by_position(calc_doc, 0, 0, 82).getValue())
+ self.assertEqual(39, get_cell_by_position(calc_doc, 0, 0, 238).getValue())
+ self.assertEqual(66, get_cell_by_position(calc_doc, 0, 0, 265).getValue())
+ self.assertEqual(282, get_cell_by_position(calc_doc, 0, 0, 1370).getValue())
gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", "COL": "6", "ROW": "0"}))
xFloatWindow = self.xUITest.getFloatWindow()
@@ -73,10 +71,10 @@ class tdf140754(UITestCase):
xOkBtn = xFloatWindow.getChild("ok")
xOkBtn.executeAction("CLICK", tuple())
- self.assertEqual(1, get_cell_by_position(document, 0, 0, 30).getValue())
- self.assertEqual(11, get_cell_by_position(document, 0, 0, 82).getValue())
- self.assertEqual(69, get_cell_by_position(document, 0, 0, 238).getValue())
- self.assertEqual(96, get_cell_by_position(document, 0, 0, 265).getValue())
- self.assertEqual(411, get_cell_by_position(document, 0, 0, 1370).getValue())
+ self.assertEqual(1, get_cell_by_position(calc_doc, 0, 0, 30).getValue())
+ self.assertEqual(11, get_cell_by_position(calc_doc, 0, 0, 82).getValue())
+ self.assertEqual(69, get_cell_by_position(calc_doc, 0, 0, 238).getValue())
+ self.assertEqual(96, get_cell_by_position(calc_doc, 0, 0, 265).getValue())
+ self.assertEqual(411, get_cell_by_position(calc_doc, 0, 0, 1370).getValue())
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/autofilter/tdf92767.py b/sc/qa/uitest/autofilter/tdf92767.py
index a016d2337f86..bb63543660dd 100644
--- a/sc/qa/uitest/autofilter/tdf92767.py
+++ b/sc/qa/uitest/autofilter/tdf92767.py
@@ -15,7 +15,6 @@ class tdf92767(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf92767.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
for i in range(0,25):
self.assertFalse(is_row_hidden(calc_doc, i))
diff --git a/sc/qa/uitest/autofilter/tdf97340.py b/sc/qa/uitest/autofilter/tdf97340.py
index f4b58ce5a7d4..d7e7f0c2afa3 100644
--- a/sc/qa/uitest/autofilter/tdf97340.py
+++ b/sc/qa/uitest/autofilter/tdf97340.py
@@ -15,7 +15,6 @@ class tdf97340(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("autofilter.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", "COL": "0", "ROW": "0"}))
xFloatWindow = self.xUITest.getFloatWindow()
diff --git a/sc/qa/uitest/calc_tests/autofill.py b/sc/qa/uitest/calc_tests/autofill.py
index 57691ef5c499..60a5f04f3315 100644
--- a/sc/qa/uitest/calc_tests/autofill.py
+++ b/sc/qa/uitest/calc_tests/autofill.py
@@ -17,7 +17,6 @@ class CalcAutofill(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("autofill.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#Select cell A12 and drag the fill handle in the bottom right corner of the cell down to A18
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A12:A18"}))
self.ui_test.execute_dialog_through_command(".uno:FillSeries")
@@ -25,13 +24,13 @@ class CalcAutofill(UITestCase):
xOK = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOK)
#Compare with the content in the right next column
- self.assertEqual(get_cell_by_position(document, 0, 0, 11).getValue(), 18.34)
- self.assertEqual(get_cell_by_position(document, 0, 0, 12).getValue(), 19.34)
- self.assertEqual(get_cell_by_position(document, 0, 0, 13).getValue(), 20.34)
- self.assertEqual(get_cell_by_position(document, 0, 0, 14).getValue(), 21.34)
- self.assertEqual(get_cell_by_position(document, 0, 0, 15).getValue(), 22.34)
- self.assertEqual(get_cell_by_position(document, 0, 0, 16).getValue(), 23.34)
- self.assertEqual(get_cell_by_position(document, 0, 0, 17).getValue(), 24.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 11).getValue(), 18.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 12).getValue(), 19.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 13).getValue(), 20.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 14).getValue(), 21.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 15).getValue(), 22.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 16).getValue(), 23.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 17).getValue(), 24.34)
#Select cell A12 and drag the fill handle in the bottom right corner of the cell up to A6
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A6:A12"}))
self.ui_test.execute_dialog_through_command(".uno:FillSeries")
@@ -45,13 +44,13 @@ class CalcAutofill(UITestCase):
xOK = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOK)
#Compare with the content in the right next column
- self.assertEqual(get_cell_by_position(document, 0, 0, 5).getValue(), 12.34)
- self.assertEqual(get_cell_by_position(document, 0, 0, 6).getValue(), 13.34)
- self.assertEqual(get_cell_by_position(document, 0, 0, 7).getValue(), 14.34)
- self.assertEqual(get_cell_by_position(document, 0, 0, 8).getValue(), 15.34)
- self.assertEqual(get_cell_by_position(document, 0, 0, 9).getValue(), 16.34)
- self.assertEqual(get_cell_by_position(document, 0, 0, 10).getValue(), 17.34)
- self.assertEqual(get_cell_by_position(document, 0, 0, 11).getValue(), 18.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 5).getValue(), 12.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 6).getValue(), 13.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 7).getValue(), 14.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 8).getValue(), 15.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 9).getValue(), 16.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 10).getValue(), 17.34)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 11).getValue(), 18.34)
#Continue with the next cells with grey background
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "M12:M18"}))
@@ -60,13 +59,13 @@ class CalcAutofill(UITestCase):
xOK = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOK)
#Compare with the content in the right next column
- self.assertEqual(get_cell_by_position(document, 0, 12, 11).getString(), "12abc40")
- self.assertEqual(get_cell_by_position(document, 0, 12, 12).getString(), "12abc41")
- self.assertEqual(get_cell_by_position(document, 0, 12, 13).getString(), "12abc42")
- self.assertEqual(get_cell_by_position(document, 0, 12, 14).getString(), "12abc43")
- self.assertEqual(get_cell_by_position(document, 0, 12, 15).getString(), "12abc44")
- self.assertEqual(get_cell_by_position(document, 0, 12, 16).getString(), "12abc45")
- self.assertEqual(get_cell_by_position(document, 0, 12, 17).getString(), "12abc46")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 11).getString(), "12abc40")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 12).getString(), "12abc41")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 13).getString(), "12abc42")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 14).getString(), "12abc43")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 15).getString(), "12abc44")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 16).getString(), "12abc45")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 17).getString(), "12abc46")
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "M6:M12"}))
self.ui_test.execute_dialog_through_command(".uno:FillSeries")
@@ -80,13 +79,13 @@ class CalcAutofill(UITestCase):
xOK = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOK)
#Compare with the content in the right next column
- self.assertEqual(get_cell_by_position(document, 0, 12, 5).getString(), "12abc34")
- self.assertEqual(get_cell_by_position(document, 0, 12, 6).getString(), "12abc35")
- self.assertEqual(get_cell_by_position(document, 0, 12, 7).getString(), "12abc36")
- self.assertEqual(get_cell_by_position(document, 0, 12, 8).getString(), "12abc37")
- self.assertEqual(get_cell_by_position(document, 0, 12, 9).getString(), "12abc38")
- self.assertEqual(get_cell_by_position(document, 0, 12, 10).getString(), "12abc39")
- self.assertEqual(get_cell_by_position(document, 0, 12, 11).getString(), "12abc40")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 5).getString(), "12abc34")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 6).getString(), "12abc35")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 7).getString(), "12abc36")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 8).getString(), "12abc37")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 9).getString(), "12abc38")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 10).getString(), "12abc39")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 12, 11).getString(), "12abc40")
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "P12:P18"}))
self.ui_test.execute_dialog_through_command(".uno:FillSeries")
@@ -94,13 +93,13 @@ class CalcAutofill(UITestCase):
xOK = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOK)
#Compare with the content in the right next column
- self.assertEqual(get_cell_by_position(document, 0, 15, 11).getString(), "10.64.127.7")
- self.assertEqual(get_cell_by_position(document, 0, 15, 12).getString(), "10.64.127.8")
- self.assertEqual(get_cell_by_position(document, 0, 15, 13).getString(), "10.64.127.9")
- self.assertEqual(get_cell_by_position(document, 0, 15, 14).getString(), "10.64.127.10")
- self.assertEqual(get_cell_by_position(document, 0, 15, 15).getString(), "10.64.127.11")
- self.assertEqual(get_cell_by_position(document, 0, 15, 16).getString(), "10.64.127.12")
- self.assertEqual(get_cell_by_position(document, 0, 15, 17).getString(), "10.64.127.13")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 11).getString(), "10.64.127.7")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 12).getString(), "10.64.127.8")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 13).getString(), "10.64.127.9")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 14).getString(), "10.64.127.10")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 15).getString(), "10.64.127.11")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 16).getString(), "10.64.127.12")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 17).getString(), "10.64.127.13")
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "P6:P12"}))
self.ui_test.execute_dialog_through_command(".uno:FillSeries")
@@ -114,13 +113,13 @@ class CalcAutofill(UITestCase):
xOK = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOK)
#Compare with the content in the right next column
- self.assertEqual(get_cell_by_position(document, 0, 15, 5).getString(), "10.64.127.1")
- self.assertEqual(get_cell_by_position(document, 0, 15, 6).getString(), "10.64.127.2")
- self.assertEqual(get_cell_by_position(document, 0, 15, 7).getString(), "10.64.127.3")
- self.assertEqual(get_cell_by_position(document, 0, 15, 8).getString(), "10.64.127.4")
- self.assertEqual(get_cell_by_position(document, 0, 15, 9).getString(), "10.64.127.5")
- self.assertEqual(get_cell_by_position(document, 0, 15, 10).getString(), "10.64.127.6")
- self.assertEqual(get_cell_by_position(document, 0, 15, 11).getString(), "10.64.127.7")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 5).getString(), "10.64.127.1")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 6).getString(), "10.64.127.2")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 7).getString(), "10.64.127.3")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 8).getString(), "10.64.127.4")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 9).getString(), "10.64.127.5")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 10).getString(), "10.64.127.6")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 15, 11).getString(), "10.64.127.7")
def test_autofill_with_suffix(self):
calc_doc = self.ui_test.create_doc_in_start_center("calc")
diff --git a/sc/qa/uitest/calc_tests/autosum.py b/sc/qa/uitest/calc_tests/autosum.py
index bc493d1977b0..537ccb4a842f 100644
--- a/sc/qa/uitest/calc_tests/autosum.py
+++ b/sc/qa/uitest/calc_tests/autosum.py
@@ -18,7 +18,6 @@ class calcAutosum(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("autosum.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#Place the cell cursor on the gray cells located under Point 1.
#(Multiselection is not possible at this place) and press the Sum Icon in the formula bar.
#Now hit the enter key and the result should be shown. Do so for each gray cell in this part of the document.
@@ -28,24 +27,23 @@ class calcAutosum(UITestCase):
self.xUITest.executeCommand(".uno:AutoSum")
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B14"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(get_cell_by_position(document, 0, 1, 9).getValue(), 2)
- self.assertEqual(get_cell_by_position(document, 0, 1, 9).getFormula(), "=SUM(B8:B9)")
- self.assertEqual(get_cell_by_position(document, 0, 1, 12).getValue(), 2)
- self.assertEqual(get_cell_by_position(document, 0, 1, 12).getFormula(), "=SUM(B11:B12)")
- self.assertEqual(get_cell_by_position(document, 0, 1, 13).getValue(), 4)
- self.assertEqual(get_cell_by_position(document, 0, 1, 13).getFormula(), "=SUM(B13:B13;B10:B10)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 9).getValue(), 2)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 9).getFormula(), "=SUM(B8:B9)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 12).getValue(), 2)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 12).getFormula(), "=SUM(B11:B12)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 13).getValue(), 4)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 13).getFormula(), "=SUM(B13:B13;B10:B10)")
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "F8:F14"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(get_cell_by_position(document, 0, 5, 13).getValue(), 4)
- self.assertEqual(get_cell_by_position(document, 0, 5, 13).getFormula(), "=SUM(F13:F13;F10:F10)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 13).getValue(), 4)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 13).getFormula(), "=SUM(F13:F13;F10:F10)")
def test_autosum_test2(self):
#Sum on Row and Column
with self.ui_test.load_file(get_url_for_data_file("autosum.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "E25"}))
self.xUITest.executeCommand(".uno:AutoSum")
@@ -60,202 +58,191 @@ class calcAutosum(UITestCase):
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "E30"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(get_cell_by_position(document, 0, 4, 24).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 0, 4, 24).getFormula(), "=SUM(E22:E24)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 25).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 0, 4, 25).getFormula(), "=SUM(B26:D26)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 26).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 0, 4, 26).getFormula(), "=SUM(B27:D27)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 27).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 0, 4, 27).getFormula(), "=SUM(B28:D28)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 28).getValue(), 9)
- self.assertEqual(get_cell_by_position(document, 0, 4, 28).getFormula(), "=SUM(E26:E28)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 29).getValue(), 12)
- self.assertEqual(get_cell_by_position(document, 0, 4, 29).getFormula(), "=SUM(E29:E29;E25:E25)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 24).getValue(), 3)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 24).getFormula(), "=SUM(E22:E24)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 25).getValue(), 3)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 25).getFormula(), "=SUM(B26:D26)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 26).getValue(), 3)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 26).getFormula(), "=SUM(B27:D27)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 27).getValue(), 3)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 27).getFormula(), "=SUM(B28:D28)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 28).getValue(), 9)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 28).getFormula(), "=SUM(E26:E28)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 29).getValue(), 12)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 29).getFormula(), "=SUM(E29:E29;E25:E25)")
def test_autosum_test3(self):
#Subtotals on Autosum
with self.ui_test.load_file(get_url_for_data_file("autosum.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C49"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(get_cell_by_position(document, 0, 2, 48).getValue(), 20)
- self.assertEqual(get_cell_by_position(document, 0, 2, 48).getFormula(), "=SUBTOTAL(9;C38:C48)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 48).getValue(), 20)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 48).getFormula(), "=SUBTOTAL(9;C38:C48)")
def test_autosum_test4(self):
#Autosum on column with selected empty cell for result
with self.ui_test.load_file(get_url_for_data_file("autosum.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B59:B64"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(get_cell_by_position(document, 0, 1, 63).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 1, 63).getFormula(), "=SUM(B59:B63)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 63).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 63).getFormula(), "=SUM(B59:B63)")
def test_autosum_test5(self):
#5.Autosum on rows with selected empty cell for result
with self.ui_test.load_file(get_url_for_data_file("autosum.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B76:E80"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(get_cell_by_position(document, 0, 4, 75).getValue(), 30)
- self.assertEqual(get_cell_by_position(document, 0, 4, 75).getFormula(), "=SUM(B76:D76)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 76).getValue(), 60)
- self.assertEqual(get_cell_by_position(document, 0, 4, 76).getFormula(), "=SUM(B77:D77)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 77).getValue(), 90)
- self.assertEqual(get_cell_by_position(document, 0, 4, 77).getFormula(), "=SUM(B78:D78)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 78).getValue(), 120)
- self.assertEqual(get_cell_by_position(document, 0, 4, 78).getFormula(), "=SUM(B79:D79)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 79).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 4, 79).getFormula(), "=SUM(B80:D80)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 75).getValue(), 30)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 75).getFormula(), "=SUM(B76:D76)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 76).getValue(), 60)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 76).getFormula(), "=SUM(B77:D77)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 77).getValue(), 90)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 77).getFormula(), "=SUM(B78:D78)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 78).getValue(), 120)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 78).getFormula(), "=SUM(B79:D79)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 79).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 79).getFormula(), "=SUM(B80:D80)")
def test_autosum_test6(self):
#6.Subtotal on column with selected empty cell for result
with self.ui_test.load_file(get_url_for_data_file("autosum.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C92:C101"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(get_cell_by_position(document, 0, 2, 100).getValue(), 19)
- self.assertEqual(get_cell_by_position(document, 0, 2, 100).getFormula(), "=SUBTOTAL(9;C92:C100)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 100).getValue(), 19)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 100).getFormula(), "=SUBTOTAL(9;C92:C100)")
def test_autosum_test7(self):
#7.Autosum on column without selected empty cell for result
with self.ui_test.load_file(get_url_for_data_file("autosum.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B109:B113"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(get_cell_by_position(document, 0, 1, 113).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 1, 113).getFormula(), "=SUM(B109:B113)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 113).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 113).getFormula(), "=SUM(B109:B113)")
def test_autosum_test8(self):
#8.Autosum on rows without selected empty cell for result
with self.ui_test.load_file(get_url_for_data_file("autosum.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B126:D126"}))
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B128:D128", "EXTEND":"1"}))
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B130:D130", "EXTEND":"1"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(get_cell_by_position(document, 0, 4, 125).getValue(), 30)
- self.assertEqual(get_cell_by_position(document, 0, 4, 125).getFormula(), "=SUM(B126:D126)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 127).getValue(), 90)
- self.assertEqual(get_cell_by_position(document, 0, 4, 127).getFormula(), "=SUM(B128:D128)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 129).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 4, 129).getFormula(), "=SUM(B130:D130)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 125).getValue(), 30)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 125).getFormula(), "=SUM(B126:D126)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 127).getValue(), 90)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 127).getFormula(), "=SUM(B128:D128)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 129).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 129).getFormula(), "=SUM(B130:D130)")
def test_autosum_test9(self):
#9.Subtotal on column without selected empty cell for result
with self.ui_test.load_file(get_url_for_data_file("autosum.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C142:C149"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(get_cell_by_position(document, 0, 2, 150).getValue(), 19)
- self.assertEqual(get_cell_by_position(document, 0, 2, 150).getFormula(), "=SUBTOTAL(9;C142:C149)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 150).getValue(), 19)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 150).getFormula(), "=SUBTOTAL(9;C142:C149)")
def test_autosum_test10(self):
#10.Autosum on multiselected columns without selected empty cell for result
with self.ui_test.load_file(get_url_for_data_file("autosum.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B160:D164"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(get_cell_by_position(document, 0, 1, 164).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 1, 164).getFormula(), "=SUM(B160:B164)")
- self.assertEqual(get_cell_by_position(document, 0, 2, 164).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 2, 164).getFormula(), "=SUM(C160:C164)")
- self.assertEqual(get_cell_by_position(document, 0, 3, 164).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 3, 164).getFormula(), "=SUM(D160:D164)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 164).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 164).getFormula(), "=SUM(B160:B164)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 164).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 164).getFormula(), "=SUM(C160:C164)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 164).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 164).getFormula(), "=SUM(D160:D164)")
def test_autosum_test11(self):
#11.Autosum on columns with formula results without selected empty cell for result
with self.ui_test.load_file(get_url_for_data_file("autosum.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B173:D177"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(round(get_cell_by_position(document, 0, 1, 177).getValue(),2), 2.55)
- self.assertEqual(get_cell_by_position(document, 0, 1, 177).getFormula(), "=SUM(B173:B177)")
- self.assertEqual(round(get_cell_by_position(document, 0, 2, 177).getValue(),2), -4.91)
- self.assertEqual(get_cell_by_position(document, 0, 2, 177).getFormula(), "=SUM(C173:C177)")
- self.assertEqual(get_cell_by_position(document, 0, 3, 177).getValue(), 5500)
- self.assertEqual(get_cell_by_position(document, 0, 3, 177).getFormula(), "=SUM(D173:D177)")
+ self.assertEqual(round(get_cell_by_position(calc_doc, 0, 1, 177).getValue(),2), 2.55)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 177).getFormula(), "=SUM(B173:B177)")
+ self.assertEqual(round(get_cell_by_position(calc_doc, 0, 2, 177).getValue(),2), -4.91)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 177).getFormula(), "=SUM(C173:C177)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 177).getValue(), 5500)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 177).getFormula(), "=SUM(D173:D177)")
def test_autosum_test12(self):
#12.Autosum on column with filled cell under selected area
with self.ui_test.load_file(get_url_for_data_file("autosum.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B186:D190"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(get_cell_by_position(document, 0, 1, 191).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 1, 191).getFormula(), "=SUM(B186:B190)")
- self.assertEqual(get_cell_by_position(document, 0, 2, 191).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 2, 191).getFormula(), "=SUM(C186:C190)")
- self.assertEqual(get_cell_by_position(document, 0, 3, 191).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 3, 191).getFormula(), "=SUM(D186:D190)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 191).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 191).getFormula(), "=SUM(B186:B190)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 191).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 191).getFormula(), "=SUM(C186:C190)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 191).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 191).getFormula(), "=SUM(D186:D190)")
def test_autosum_test13(self):
#13.Autosum on column and rows with empty cells selected for row and column
with self.ui_test.load_file(get_url_for_data_file("autosum.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B203:E208"}))
self.xUITest.executeCommand(".uno:AutoSum")
- self.assertEqual(get_cell_by_position(document, 0, 1, 207).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 1, 207).getFormula(), "=SUM(B203:B207)")
- self.assertEqual(get_cell_by_position(document, 0, 2, 207).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 2, 207).getFormula(), "=SUM(C203:C207)")
- self.assertEqual(get_cell_by_position(document, 0, 3, 207).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 3, 207).getFormula(), "=SUM(D203:D207)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 207).getValue(), 450)
- self.assertEqual(get_cell_by_position(document, 0, 4, 207).getFormula(), "=SUM(B208:D208)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 202).getValue(), 30)
- self.assertEqual(get_cell_by_position(document, 0, 4, 202).getFormula(), "=SUM(B203:D203)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 203).getValue(), 60)
- self.assertEqual(get_cell_by_position(document, 0, 4, 203).getFormula(), "=SUM(B204:D204)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 204).getValue(), 90)
- self.assertEqual(get_cell_by_position(document, 0, 4, 204).getFormula(), "=SUM(B205:D205)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 205).getValue(), 120)
- self.assertEqual(get_cell_by_position(document, 0, 4, 205).getFormula(), "=SUM(B206:D206)")
- self.assertEqual(get_cell_by_position(document, 0, 4, 206).getValue(), 150)
- self.assertEqual(get_cell_by_position(document, 0, 4, 206).getFormula(), "=SUM(B207:D207)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 207).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 207).getFormula(), "=SUM(B203:B207)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 207).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 207).getFormula(), "=SUM(C203:C207)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 207).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 207).getFormula(), "=SUM(D203:D207)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 207).getValue(), 450)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 207).getFormula(), "=SUM(B208:D208)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 202).getValue(), 30)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 202).getFormula(), "=SUM(B203:D203)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 203).getValue(), 60)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 203).getFormula(), "=SUM(B204:D204)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 204).getValue(), 90)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 204).getFormula(), "=SUM(B205:D205)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 205).getValue(), 120)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 205).getFormula(), "=SUM(B206:D206)")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 206).getValue(), 150)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 206).getFormula(), "=SUM(B207:D207)")
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests/tdf133855.py b/sc/qa/uitest/calc_tests/tdf133855.py
index cd2144c3a134..ea9c5b15a47f 100644
--- a/sc/qa/uitest/calc_tests/tdf133855.py
+++ b/sc/qa/uitest/calc_tests/tdf133855.py
@@ -15,7 +15,6 @@ class tdf133855(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf133855.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
- document = self.ui_test.get_component()
results = ['A', 'B', 'C', 'D', 'E', 'F']
@@ -30,7 +29,7 @@ class tdf133855(UITestCase):
xListItem = xlist.getChild( str(i) )
xListItem.executeAction("DOUBLECLICK" , mkPropertyValues({}) )
- self.assertEqual(get_cell_by_position(document, 0, 6, 5).getString(), results[i])
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 6, 5).getString(), results[i])
# normal dropdown list
for i in range(len(results)):
@@ -43,6 +42,6 @@ class tdf133855(UITestCase):
xListItem = xlist.getChild( str(i) )
xListItem.executeAction("DOUBLECLICK" , mkPropertyValues({}) )
- self.assertEqual(get_cell_by_position(document, 0, 6, 6).getString(), results[i])
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 6, 6).getString(), results[i])
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests2/consolidate.py b/sc/qa/uitest/calc_tests2/consolidate.py
index 95ddcf3df592..83ed3587dad1 100644
--- a/sc/qa/uitest/calc_tests2/consolidate.py
+++ b/sc/qa/uitest/calc_tests2/consolidate.py
@@ -15,7 +15,6 @@ class consolidate(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("consolidate.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
self.ui_test.execute_modeless_dialog_through_command(".uno:DataConsolidate")
xDialog = self.xUITest.getTopFocusWindow()
@@ -44,25 +43,25 @@ class consolidate(UITestCase):
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
#verify
- self.assertEqual(get_cell_by_position(document, 0, 1, 2).getValue(), 300)
- self.assertEqual(get_cell_by_position(document, 0, 1, 3).getValue(), 303)
- self.assertEqual(get_cell_by_position(document, 0, 1, 4).getValue(), 306)
- self.assertEqual(get_cell_by_position(document, 0, 1, 5).getValue(), 309)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 2).getValue(), 300)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 3).getValue(), 303)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 4).getValue(), 306)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 5).getValue(), 309)
- self.assertEqual(get_cell_by_position(document, 0, 2, 2).getValue(), 303)
- self.assertEqual(get_cell_by_position(document, 0, 2, 3).getValue(), 306)
- self.assertEqual(get_cell_by_position(document, 0, 2, 4).getValue(), 309)
- self.assertEqual(get_cell_by_position(document, 0, 2, 5).getValue(), 312)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 2).getValue(), 303)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 3).getValue(), 306)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 4).getValue(), 309)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 5).getValue(), 312)
- self.assertEqual(get_cell_by_position(document, 0, 3, 2).getValue(), 306)
- self.assertEqual(get_cell_by_position(document, 0, 3, 3).getValue(), 309)
- self.assertEqual(get_cell_by_position(document, 0, 3, 4).getValue(), 312)
- self.assertEqual(get_cell_by_position(document, 0, 3, 5).getValue(), 315)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 2).getValue(), 306)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 3).getValue(), 309)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 4).getValue(), 312)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 5).getValue(), 315)
- self.assertEqual(get_cell_by_position(document, 0, 4, 2).getValue(), 309)
- self.assertEqual(get_cell_by_position(document, 0, 4, 3).getValue(), 312)
- self.assertEqual(get_cell_by_position(document, 0, 4, 4).getValue(), 315)
- self.assertEqual(get_cell_by_position(document, 0, 4, 5).getValue(), 318)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 2).getValue(), 309)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 3).getValue(), 312)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 4).getValue(), 315)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 5).getValue(), 318)
#verify dialog
self.ui_test.execute_modeless_dialog_through_command(".uno:DataConsolidate")
xDialog = self.xUITest.getTopFocusWindow()
@@ -86,25 +85,25 @@ class consolidate(UITestCase):
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
- self.assertEqual(get_cell_by_position(document, 0, 1, 2).getValue(), 200)
- self.assertEqual(get_cell_by_position(document, 0, 1, 3).getValue(), 202)
- self.assertEqual(get_cell_by_position(document, 0, 1, 4).getValue(), 204)
- self.assertEqual(get_cell_by_position(document, 0, 1, 5).getValue(), 206)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 2).getValue(), 200)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 3).getValue(), 202)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 4).getValue(), 204)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 5).getValue(), 206)
- self.assertEqual(get_cell_by_position(document, 0, 2, 2).getValue(), 202)
- self.assertEqual(get_cell_by_position(document, 0, 2, 3).getValue(), 204)
- self.assertEqual(get_cell_by_position(document, 0, 2, 4).getValue(), 206)
- self.assertEqual(get_cell_by_position(document, 0, 2, 5).getValue(), 208)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 2).getValue(), 202)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 3).getValue(), 204)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 4).getValue(), 206)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 5).getValue(), 208)
- self.assertEqual(get_cell_by_position(document, 0, 3, 2).getValue(), 204)
- self.assertEqual(get_cell_by_position(document, 0, 3, 3).getValue(), 206)
- self.assertEqual(get_cell_by_position(document, 0, 3, 4).getValue(), 208)
- self.assertEqual(get_cell_by_position(document, 0, 3, 5).getValue(), 210)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 2).getValue(), 204)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 3).getValue(), 206)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 4).getValue(), 208)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 5).getValue(), 210)
- self.assertEqual(get_cell_by_position(document, 0, 4, 2).getValue(), 206)
- self.assertEqual(get_cell_by_position(document, 0, 4, 3).getValue(), 208)
- self.assertEqual(get_cell_by_position(document, 0, 4, 4).getValue(), 210)
- self.assertEqual(get_cell_by_position(document, 0, 4, 5).getValue(), 212)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 2).getValue(), 206)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 3).getValue(), 208)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 4).getValue(), 210)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 5).getValue(), 212)
# test cancel button
self.ui_test.execute_modeless_dialog_through_command(".uno:DataConsolidate")
diff --git a/sc/qa/uitest/calc_tests2/standardFilter.py b/sc/qa/uitest/calc_tests2/standardFilter.py
index 25b6373c7e42..dccf669d1e39 100644
--- a/sc/qa/uitest/calc_tests2/standardFilter.py
+++ b/sc/qa/uitest/calc_tests2/standardFilter.py
@@ -18,7 +18,6 @@ class standardFilter(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("standardFilter.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C8"}))
self.ui_test.execute_modeless_dialog_through_command(".uno:DataFilterStandardFilter")
@@ -67,7 +66,6 @@ class standardFilter(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("standardFilter.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C8"}))
self.ui_test.execute_modeless_dialog_through_command(".uno:DataFilterStandardFilter")
@@ -89,21 +87,20 @@ class standardFilter(UITestCase):
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
#verify
- self.assertEqual(get_cell_by_position(document, 0, 5, 0).getString(), "a")
- self.assertEqual(get_cell_by_position(document, 0, 6, 0).getString(), "b")
- self.assertEqual(get_cell_by_position(document, 0, 7, 0).getString(), "c")
- self.assertEqual(get_cell_by_position(document, 0, 5, 1).getValue(), 1)
- self.assertEqual(get_cell_by_position(document, 0, 6, 1).getValue(), 2)
- self.assertEqual(get_cell_by_position(document, 0, 7, 1).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 0, 5, 2).getValue(), 2)
- self.assertEqual(get_cell_by_position(document, 0, 6, 2).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 0, 7, 2).getValue(), 4)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 0).getString(), "a")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 6, 0).getString(), "b")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 7, 0).getString(), "c")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 1).getValue(), 1)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 6, 1).getValue(), 2)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 7, 1).getValue(), 3)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 2).getValue(), 2)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 6, 2).getValue(), 3)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 7, 2).getValue(), 4)
def test_standard_filter_copy_result_next_sheet(self):
with self.ui_test.load_file(get_url_for_data_file("standardFilter.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C8"}))
self.ui_test.execute_modeless_dialog_through_command(".uno:DataFilterStandardFilter")
@@ -125,15 +122,15 @@ class standardFilter(UITestCase):
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
#verify
- self.assertEqual(get_cell_by_position(document, 1, 5, 0).getString(), "a")
- self.assertEqual(get_cell_by_position(document, 1, 6, 0).getString(), "b")
- self.assertEqual(get_cell_by_position(document, 1, 7, 0).getString(), "c")
- self.assertEqual(get_cell_by_position(document, 1, 5, 1).getValue(), 1)
- self.assertEqual(get_cell_by_position(document, 1, 6, 1).getValue(), 2)
- self.assertEqual(get_cell_by_position(document, 1, 7, 1).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 1, 5, 2).getValue(), 2)
- self.assertEqual(get_cell_by_position(document, 1, 6, 2).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 1, 7, 2).getValue(), 4)
+ self.assertEqual(get_cell_by_position(calc_doc, 1, 5, 0).getString(), "a")
+ self.assertEqual(get_cell_by_position(calc_doc, 1, 6, 0).getString(), "b")
+ self.assertEqual(get_cell_by_position(calc_doc, 1, 7, 0).getString(), "c")
+ self.assertEqual(get_cell_by_position(calc_doc, 1, 5, 1).getValue(), 1)
+ self.assertEqual(get_cell_by_position(calc_doc, 1, 6, 1).getValue(), 2)
+ self.assertEqual(get_cell_by_position(calc_doc, 1, 7, 1).getValue(), 3)
+ self.assertEqual(get_cell_by_position(calc_doc, 1, 5, 2).getValue(), 2)
+ self.assertEqual(get_cell_by_position(calc_doc, 1, 6, 2).getValue(), 3)
+ self.assertEqual(get_cell_by_position(calc_doc, 1, 7, 2).getValue(), 4)
def test_standard_filter_case_sensitive(self):
calc_doc = self.ui_test.create_doc_in_start_center("calc")
diff --git a/sc/qa/uitest/calc_tests2/tdf114992.py b/sc/qa/uitest/calc_tests2/tdf114992.py
index eedf7dcba100..3a4ffb55a857 100644
--- a/sc/qa/uitest/calc_tests2/tdf114992.py
+++ b/sc/qa/uitest/calc_tests2/tdf114992.py
@@ -14,15 +14,14 @@ class tdf114992(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf114992.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
self.ui_test.execute_dialog_through_command(".uno:Remove") #delete sheet
xDialog = self.xUITest.getTopFocusWindow()
xOKButton = xDialog.getChild("yes")
xOKButton.executeAction("CLICK", tuple())
- self.assertEqual(document.Sheets.getCount(), 1)
+ self.assertEqual(calc_doc.Sheets.getCount(), 1)
self.xUITest.executeCommand(".uno:Undo")
- self.assertEqual(document.Sheets.getCount(), 2)
+ self.assertEqual(calc_doc.Sheets.getCount(), 2)
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests2/tdf37623.py b/sc/qa/uitest/calc_tests2/tdf37623.py
index fcf4d278448a..00ccf19c4a33 100644
--- a/sc/qa/uitest/calc_tests2/tdf37623.py
+++ b/sc/qa/uitest/calc_tests2/tdf37623.py
@@ -15,7 +15,6 @@ class tdf37623(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf37623.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A2:A6"}))
self.ui_test.execute_dialog_through_command(".uno:FillSeries")
xDialog = self.xUITest.getTopFocusWindow()
@@ -24,10 +23,10 @@ class tdf37623(UITestCase):
xOK = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOK)
- self.assertEqual(get_cell_by_position(document, 0, 0, 1).getValue(), 1)
- self.assertEqual(get_cell_by_position(document, 0, 0, 2).getValue(), 0)
- self.assertEqual(get_cell_by_position(document, 0, 0, 3).getValue(), 0)
- self.assertEqual(get_cell_by_position(document, 0, 0, 4).getValue(), 2)
- self.assertEqual(get_cell_by_position(document, 0, 0, 5).getValue(), 3)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 1).getValue(), 1)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 2).getValue(), 0)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 3).getValue(), 0)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 4).getValue(), 2)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 5).getValue(), 3)
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests3/tdf57274.py b/sc/qa/uitest/calc_tests3/tdf57274.py
index 32b92bc14bcc..135a83a223dd 100644
--- a/sc/qa/uitest/calc_tests3/tdf57274.py
+++ b/sc/qa/uitest/calc_tests3/tdf57274.py
@@ -17,7 +17,6 @@ class tdf57274(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf57274.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#* Source Cells, range B6..E6
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "B6:E6"}))
@@ -35,7 +34,7 @@ class tdf57274(UITestCase):
pass
#we would expect a reference to cell E6 here and a zero being displayed, but the cell is also simply blank.
- self.assertEqual(get_cell_by_position(document, 0, 4, 10).getValue(), 0)
- self.assertEqual(get_cell_by_position(document, 0, 4, 10).getFormula(), "=$Sheet1.$E$6")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 10).getValue(), 0)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 10).getFormula(), "=$Sheet1.$E$6")
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests3/tdf62267.py b/sc/qa/uitest/calc_tests3/tdf62267.py
index c4c36b150125..68654e8d0062 100644
--- a/sc/qa/uitest/calc_tests3/tdf62267.py
+++ b/sc/qa/uitest/calc_tests3/tdf62267.py
@@ -18,7 +18,6 @@ class tdf62267(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf62267.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#* Copy A1, then paste special to C1;
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
diff --git a/sc/qa/uitest/calc_tests3/tdf63805.py b/sc/qa/uitest/calc_tests3/tdf63805.py
index 8c9332cb4200..9f9d9baeca75 100644
--- a/sc/qa/uitest/calc_tests3/tdf63805.py
+++ b/sc/qa/uitest/calc_tests3/tdf63805.py
@@ -18,7 +18,6 @@ class tdf63805(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf63805.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#1 - A1: 2012-10-31
enter_text_to_cell(gridwin, "A1", "2012-10-31")
@@ -30,29 +29,29 @@ class tdf63805(UITestCase):
xOK = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOK)
#5 -Expected: All Cells show last day of month / Actual: some months skipped
- self.assertEqual(get_cell_by_position(document, 0, 0, 0).getValue(), 41213)
- self.assertEqual(get_cell_by_position(document, 0, 0, 1).getValue(), 41243)
- self.assertEqual(get_cell_by_position(document, 0, 0, 2).getValue(), 41274)
- self.assertEqual(get_cell_by_position(document, 0, 0, 3).getValue(), 41305)
- self.assertEqual(get_cell_by_position(document, 0, 0, 4).getValue(), 41333)
- self.assertEqual(get_cell_by_position(document, 0, 0, 5).getValue(), 41364)
- self.assertEqual(get_cell_by_position(document, 0, 0, 6).getValue(), 41394)
- self.assertEqual(get_cell_by_position(document, 0, 0, 7).getValue(), 41425)
- self.assertEqual(get_cell_by_position(document, 0, 0, 8).getValue(), 41455)
- self.assertEqual(get_cell_by_position(document, 0, 0, 9).getValue(), 41486)
- self.assertEqual(get_cell_by_position(document, 0, 0, 10).getValue(), 41517)
- self.assertEqual(get_cell_by_position(document, 0, 0, 11).getValue(), 41547)
- self.assertEqual(get_cell_by_position(document, 0, 0, 12).getValue(), 41578)
- self.assertEqual(get_cell_by_position(document, 0, 0, 13).getValue(), 41608)
- self.assertEqual(get_cell_by_position(document, 0, 0, 14).getValue(), 41639)
- self.assertEqual(get_cell_by_position(document, 0, 0, 15).getValue(), 41670)
- self.assertEqual(get_cell_by_position(document, 0, 0, 16).getValue(), 41698)
- self.assertEqual(get_cell_by_position(document, 0, 0, 17).getValue(), 41729)
- self.assertEqual(get_cell_by_position(document, 0, 0, 18).getValue(), 41759)
- self.assertEqual(get_cell_by_position(document, 0, 0, 19).getValue(), 41790)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 0).getValue(), 41213)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 1).getValue(), 41243)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 2).getValue(), 41274)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 3).getValue(), 41305)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 4).getValue(), 41333)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 5).getValue(), 41364)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 6).getValue(), 41394)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 7).getValue(), 41425)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 8).getValue(), 41455)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 9).getValue(), 41486)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 10).getValue(), 41517)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 11).getValue(), 41547)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 12).getValue(), 41578)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 13).getValue(), 41608)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 14).getValue(), 41639)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 15).getValue(), 41670)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 16).getValue(), 41698)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 17).getValue(), 41729)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 18).getValue(), 41759)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 19).getValue(), 41790)
#4 - undo.
self.xUITest.executeCommand(".uno:Undo")
- self.assertEqual(get_cell_by_position(document, 0, 0, 0).getValue(), 41213)
- self.assertEqual(get_cell_by_position(document, 0, 0, 1).getValue(), 0)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 0).getValue(), 41213)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 1).getValue(), 0)
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests3/tdf65856.py b/sc/qa/uitest/calc_tests3/tdf65856.py
index 3211d3117b34..5d08e89bc774 100644
--- a/sc/qa/uitest/calc_tests3/tdf65856.py
+++ b/sc/qa/uitest/calc_tests3/tdf65856.py
@@ -15,7 +15,6 @@ class tdf65856(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf65856.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#- mark D1:E14; copy
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "D1:E14"}))
@@ -32,26 +31,25 @@ class tdf65856(UITestCase):
self.ui_test.close_dialog_through_button(xOkBtn)
#check
- self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "T1")
- self.assertEqual(get_cell_by_position(document, 0, 1, 0).getString(), "TE1")
- self.assertEqual(get_cell_by_position(document, 0, 2, 0).getString(), "TES1")
- self.assertEqual(get_cell_by_position(document, 0, 3, 0).getString(), "TEST1")
- self.assertEqual(get_cell_by_position(document, 0, 4, 0).getString(), "TEST1")
- self.assertEqual(get_cell_by_position(document, 0, 5, 0).getString(), "TEST1")
- self.assertEqual(get_cell_by_position(document, 0, 6, 0).getString(), "TEST1")
- self.assertEqual(get_cell_by_position(document, 0, 0, 13).getString(), "T14")
- self.assertEqual(get_cell_by_position(document, 0, 1, 13).getString(), "TE14")
- self.assertEqual(get_cell_by_position(document, 0, 2, 13).getString(), "TES14")
- self.assertEqual(get_cell_by_position(document, 0, 3, 13).getString(), "TEST14")
- self.assertEqual(get_cell_by_position(document, 0, 4, 13).getString(), "TEST14")
- self.assertEqual(get_cell_by_position(document, 0, 5, 13).getString(), "TEST14")
- self.assertEqual(get_cell_by_position(document, 0, 6, 13).getString(), "TEST14")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 0).getString(), "T1")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 0).getString(), "TE1")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 0).getString(), "TES1")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 0).getString(), "TEST1")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 0).getString(), "TEST1")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 0).getString(), "TEST1")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 6, 0).getString(), "TEST1")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 13).getString(), "T14")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 13).getString(), "TE14")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 13).getString(), "TES14")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 13).getString(), "TEST14")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 13).getString(), "TEST14")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 13).getString(), "TEST14")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 6, 13).getString(), "TEST14")
def test_tdf65856_paste_special_shift_right_2(self):
with self.ui_test.load_file(get_url_for_data_file("tdf65856_2.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#- select range C2:D4; copy
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C2:D4"}))
@@ -68,27 +66,27 @@ class tdf65856(UITestCase):
self.ui_test.close_dialog_through_button(xOkBtn)
#check
- self.assertEqual(get_cell_by_position(document, 0, 1, 1).getString(), "1")
- self.assertEqual(get_cell_by_position(document, 0, 2, 1).getString(), "1")
- self.assertEqual(get_cell_by_position(document, 0, 3, 1).getString(), "1")
- self.assertEqual(get_cell_by_position(document, 0, 4, 1).getString(), "1")
- self.assertEqual(get_cell_by_position(document, 0, 5, 1).getString(), "1")
- self.assertEqual(get_cell_by_position(document, 0, 1, 2).getString(), "2")
- self.assertEqual(get_cell_by_position(document, 0, 2, 2).getString(), "2")
- self.assertEqual(get_cell_by_position(document, 0, 3, 2).getString(), "2")
- self.assertEqual(get_cell_by_position(document, 0, 4, 2).getString(), "2")
- self.assertEqual(get_cell_by_position(document, 0, 5, 2).getString(), "2")
- self.assertEqual(get_cell_by_position(document, 0, 1, 3).getString(), "3")
- self.assertEqual(get_cell_by_position(document, 0, 2, 3).getString(), "3")
- self.assertEqual(get_cell_by_position(document, 0, 3, 3).getString(), "3")
- self.assertEqual(get_cell_by_position(document, 0, 4, 3).getString(), "3")
- self.assertEqual(get_cell_by_position(document, 0, 5, 3).getString(), "3")
- self.assertEqual(get_cell_by_position(document, 0, 4, 1).getFormula(), "=D2")
- self.assertEqual(get_cell_by_position(document, 0, 5, 1).getFormula(), "=D2")
- self.assertEqual(get_cell_by_position(document, 0, 3, 2).getFormula(), "=E3")
- self.assertEqual(get_cell_by_position(document, 0, 5, 2).getFormula(), "=E3")
- self.assertEqual(get_cell_by_position(document, 0, 3, 3).getFormula(), "=F4")
- self.assertEqual(get_cell_by_position(document, 0, 4, 3).getFormula(), "=F4")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 1).getString(), "1")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 1).getString(), "1")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 1).getString(), "1")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 1).getString(), "1")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 1).getString(), "1")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 2).getString(), "2")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 2).getString(), "2")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 2).getString(), "2")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 2).getString(), "2")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 2).getString(), "2")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 3).getString(), "3")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 3).getString(), "3")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 3).getString(), "3")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 3).getString(), "3")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 3).getString(), "3")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 1).getFormula(), "=D2")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 1).getFormula(), "=D2")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 2).getFormula(), "=E3")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 2).getFormula(), "=E3")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 3).getFormula(), "=F4")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 3).getFormula(), "=F4")
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests3/tdf69981.py b/sc/qa/uitest/calc_tests3/tdf69981.py
index c32476acc056..6d4a548713f3 100644
--- a/sc/qa/uitest/calc_tests3/tdf69981.py
+++ b/sc/qa/uitest/calc_tests3/tdf69981.py
@@ -16,7 +16,6 @@ class tdf69981(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf69981.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged.
self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog
xDialogOpt = self.xUITest.getTopFocusWindow()
@@ -49,28 +48,28 @@ class tdf69981(UITestCase):
pass
#Verify
- self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "Original")
- self.assertEqual(get_cell_by_position(document, 0, 0, 1).getString(), "a")
- self.assertEqual(get_cell_by_position(document, 0, 0, 2).getString(), "")
- self.assertEqual(get_cell_by_position(document, 0, 0, 3).getString(), "")
- self.assertEqual(get_cell_by_position(document, 0, 0, 4).getString(), "a")
- self.assertEqual(get_cell_by_position(document, 0, 0, 5).getString(), "a")
- self.assertEqual(get_cell_by_position(document, 0, 0, 6).getString(), "a")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 0).getString(), "Original")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 1).getString(), "a")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 2).getString(), "")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 3).getString(), "")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 4).getString(), "a")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 5).getString(), "a")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 6).getString(), "a")
- self.assertEqual(get_cell_by_position(document, 0, 1, 0).getString(), "Copy")
- self.assertEqual(get_cell_by_position(document, 0, 1, 1).getString(), "b")
- self.assertEqual(get_cell_by_position(document, 0, 1, 2).getString(), "b")
- self.assertEqual(get_cell_by_position(document, 0, 1, 3).getString(), "")
- self.assertEqual(get_cell_by_position(document, 0, 1, 4).getString(), "")
- self.assertEqual(get_cell_by_position(document, 0, 1, 5).getString(), "b")
- self.assertEqual(get_cell_by_position(document, 0, 1, 6).getString(), "")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 0).getString(), "Copy")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 1).getString(), "b")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 2).getString(), "b")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 3).getString(), "")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 4).getString(), "")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 5).getString(), "b")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 6).getString(), "")
- self.assertEqual(get_cell_by_position(document, 0, 2, 0).getString(), "")
- self.assertEqual(get_cell_by_position(document, 0, 2, 1).getString(), "c")
- self.assertEqual(get_cell_by_position(document, 0, 2, 2).getString(), "c")
- self.assertEqual(get_cell_by_position(document, 0, 2, 3).getString(), "c")
- self.assertEqual(get_cell_by_position(document, 0, 2, 4).getString(), "")
- self.assertEqual(get_cell_by_position(document, 0, 2, 5).getString(), "")
- self.assertEqual(get_cell_by_position(document, 0, 2, 6).getString(), "c")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 0).getString(), "")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 1).getString(), "c")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 2).getString(), "c")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 3).getString(), "c")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 4).getString(), "")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 5).getString(), "")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 6).getString(), "c")
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests3/tdf77509.py b/sc/qa/uitest/calc_tests3/tdf77509.py
index 79e228c180da..40e741a7dd42 100644
--- a/sc/qa/uitest/calc_tests3/tdf77509.py
+++ b/sc/qa/uitest/calc_tests3/tdf77509.py
@@ -16,7 +16,6 @@ class tdf77509(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf77509.xls")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#1. Open attachment: Consolidate-test.xls
#2. Select any empty cell, eg. cell D1
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "D1"}))
@@ -46,30 +45,30 @@ class tdf77509(UITestCase):
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
#verify
- self.assertEqual("A 1", get_cell_by_position(document, 0, 3, 0).getString())
- self.assertEqual("AB 1", get_cell_by_position(document, 0, 3, 1).getString())
- self.assertEqual("AB 12", get_cell_by_position(document, 0, 3, 2).getString())
- self.assertEqual("AB 123", get_cell_by_position(document, 0, 3, 3).getString())
- self.assertEqual("ABC 1", get_cell_by_position(document, 0, 3, 4).getString())
+ self.assertEqual("A 1", get_cell_by_position(calc_doc, 0, 3, 0).getString())
+ self.assertEqual("AB 1", get_cell_by_position(calc_doc, 0, 3, 1).getString())
+ self.assertEqual("AB 12", get_cell_by_position(calc_doc, 0, 3, 2).getString())
+ self.assertEqual("AB 123", get_cell_by_position(calc_doc, 0, 3, 3).getString())
+ self.assertEqual("ABC 1", get_cell_by_position(calc_doc, 0, 3, 4).getString())
- self.assertEqual(1, get_cell_by_position(document, 0, 4, 0).getValue())
- self.assertEqual(2, get_cell_by_position(document, 0, 4, 1).getValue())
- self.assertEqual(2, get_cell_by_position(document, 0, 4, 2).getValue())
- self.assertEqual(1, get_cell_by_position(document, 0, 4, 3).getValue())
- self.assertEqual(1, get_cell_by_position(document, 0, 4, 4).getValue())
+ self.assertEqual(1, get_cell_by_position(calc_doc, 0, 4, 0).getValue())
+ self.assertEqual(2, get_cell_by_position(calc_doc, 0, 4, 1).getValue())
+ self.assertEqual(2, get_cell_by_position(calc_doc, 0, 4, 2).getValue())
+ self.assertEqual(1, get_cell_by_position(calc_doc, 0, 4, 3).getValue())
+ self.assertEqual(1, get_cell_by_position(calc_doc, 0, 4, 4).getValue())
self.xUITest.executeCommand(".uno:Undo")
- self.assertEqual("", get_cell_by_position(document, 0, 3, 0).getString())
- self.assertEqual("", get_cell_by_position(document, 0, 3, 1).getString())
- self.assertEqual("", get_cell_by_position(document, 0, 3, 2).getString())
- self.assertEqual("", get_cell_by_position(document, 0, 3, 3).getString())
- self.assertEqual("", get_cell_by_position(document, 0, 3, 4).getString())
+ self.assertEqual("", get_cell_by_position(calc_doc, 0, 3, 0).getString())
+ self.assertEqual("", get_cell_by_position(calc_doc, 0, 3, 1).getString())
+ self.assertEqual("", get_cell_by_position(calc_doc, 0, 3, 2).getString())
+ self.assertEqual("", get_cell_by_position(calc_doc, 0, 3, 3).getString())
+ self.assertEqual("", get_cell_by_position(calc_doc, 0, 3, 4).getString())
- self.assertEqual(0, get_cell_by_position(document, 0, 4, 0).getValue())
- self.assertEqual(0, get_cell_by_position(document, 0, 4, 1).getValue())
- self.assertEqual(0, get_cell_by_position(document, 0, 4, 2).getValue())
- self.assertEqual(0, get_cell_by_position(document, 0, 4, 3).getValue())
- self.assertEqual(0, get_cell_by_position(document, 0, 4, 4).getValue())
+ self.assertEqual(0, get_cell_by_position(calc_doc, 0, 4, 0).getValue())
+ self.assertEqual(0, get_cell_by_position(calc_doc, 0, 4, 1).getValue())
+ self.assertEqual(0, get_cell_by_position(calc_doc, 0, 4, 2).getValue())
+ self.assertEqual(0, get_cell_by_position(calc_doc, 0, 4, 3).getValue())
+ self.assertEqual(0, get_cell_by_position(calc_doc, 0, 4, 4).getValue())
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests4/tdf85403.py b/sc/qa/uitest/calc_tests4/tdf85403.py
index 0a2acbd7ce9f..a09475c98838 100644
--- a/sc/qa/uitest/calc_tests4/tdf85403.py
+++ b/sc/qa/uitest/calc_tests4/tdf85403.py
@@ -16,7 +16,6 @@ class tdf85403(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf85403.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#'123 in A1, SUM(A1) in B1, result is 0 as expected,
#now select A1 and use data->text to columns->ok and B1 is not updated,
@@ -30,6 +29,6 @@ class tdf85403(UITestCase):
self.ui_test.close_dialog_through_button(xOK)
#Verify
- self.assertEqual(get_cell_by_position(document, 0, 1, 0).getValue(), 123)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 0).getValue(), 123)
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests4/tdf85979.py b/sc/qa/uitest/calc_tests4/tdf85979.py
index 8482bdb917d0..48052fdc1e6a 100644
--- a/sc/qa/uitest/calc_tests4/tdf85979.py
+++ b/sc/qa/uitest/calc_tests4/tdf85979.py
@@ -16,7 +16,6 @@ class tdf85979(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf85979.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#(I selected C1 to C5, then Text to Columns, unselected "Tab" and selected "Space")
gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "C1:C5"}))
@@ -31,21 +30,21 @@ class tdf85979(UITestCase):
self.ui_test.close_dialog_through_button(xOK)
#Verify
- self.assertEqual(get_cell_by_position(document, 0, 2, 0).getValue(), 99)
- self.assertEqual(get_cell_by_position(document, 0, 2, 1).getValue(), 4)
- self.assertEqual(get_cell_by_position(document, 0, 2, 2).getValue(), 9)
- self.assertEqual(get_cell_by_position(document, 0, 2, 3).getValue(), 9)
- self.assertEqual(get_cell_by_position(document, 0, 3, 0).getValue(), 260)
- self.assertEqual(get_cell_by_position(document, 0, 3, 1).getValue(), 10)
- self.assertEqual(get_cell_by_position(document, 0, 3, 2).getValue(), 23)
- self.assertEqual(get_cell_by_position(document, 0, 3, 3).getValue(), 23)
- self.assertEqual(get_cell_by_position(document, 0, 4, 0).getValue(), 149)
- self.assertEqual(get_cell_by_position(document, 0, 4, 1).getValue(), 6)
- self.assertEqual(get_cell_by_position(document, 0, 4, 2).getValue(), 14)
- self.assertEqual(get_cell_by_position(document, 0, 4, 3).getValue(), 14)
- self.assertEqual(get_cell_by_position(document, 0, 5, 0).getValue(), 0)
- self.assertEqual(get_cell_by_position(document, 0, 5, 1).getValue(), 16)
- self.assertEqual(get_cell_by_position(document, 0, 5, 2).getValue(), 35)
- self.assertEqual(get_cell_by_position(document, 0, 5, 3).getValue(), 35)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 0).getValue(), 99)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 1).getValue(), 4)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 2).getValue(), 9)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 3).getValue(), 9)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 0).getValue(), 260)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 1).getValue(), 10)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 2).getValue(), 23)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 3, 3).getValue(), 23)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 0).getValue(), 149)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 1).getValue(), 6)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 2).getValue(), 14)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 4, 3).getValue(), 14)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 0).getValue(), 0)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 1).getValue(), 16)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 2).getValue(), 35)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 5, 3).getValue(), 35)
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests4/tdf86253.py b/sc/qa/uitest/calc_tests4/tdf86253.py
index f3047f8fd4f2..da35ac663ad4 100644
--- a/sc/qa/uitest/calc_tests4/tdf86253.py
+++ b/sc/qa/uitest/calc_tests4/tdf86253.py
@@ -14,7 +14,6 @@ class tdf86253(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf86253.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#* Copy A1, then paste special only "formatting" to C1:C17;
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
diff --git a/sc/qa/uitest/calc_tests4/tdf89958.py b/sc/qa/uitest/calc_tests4/tdf89958.py
index 8935bae5934a..1f97bc57ceca 100644
--- a/sc/qa/uitest/calc_tests4/tdf89958.py
+++ b/sc/qa/uitest/calc_tests4/tdf89958.py
@@ -16,7 +16,6 @@ class tdf89958(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("tdf89958.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#select A1-> Column .uno:SelectColumn
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
self.xUITest.executeCommand(".uno:SelectColumn")
diff --git a/sc/qa/uitest/calc_tests4/tdf99386.py b/sc/qa/uitest/calc_tests4/tdf99386.py
index 4df99fb733b8..afe89217d2c6 100644
--- a/sc/qa/uitest/calc_tests4/tdf99386.py
+++ b/sc/qa/uitest/calc_tests4/tdf99386.py
@@ -18,12 +18,11 @@ class tdf99386(UITestCase):
xCalcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B1"})) #select cells
self.xUITest.executeCommand(".uno:ToggleMergeCells") # merge cells
self.xUITest.executeCommand(".uno:Undo")
- self.assertEqual(get_cell_by_position(document, 0, 1, 1).getString(), "This")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 1).getString(), "This")
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests4/textToColumns.py b/sc/qa/uitest/calc_tests4/textToColumns.py
index 5231c40dabcb..fac0666452b3 100644
--- a/sc/qa/uitest/calc_tests4/textToColumns.py
+++ b/sc/qa/uitest/calc_tests4/textToColumns.py
@@ -18,7 +18,6 @@ class CalcTextToColumns(UITestCase):
with self.ui_test.load_file(get_url_for_data_file("text_to_columns_dot.ods")) as calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
- document = self.ui_test.get_component()
#Make sure that tools-options-StarOffice Calc-General-Input settings-Show overwrite warning when pasting data is tagged.
self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog
xDialogOpt = self.xUITest.getTopFocusWindow()
@@ -61,41 +60,41 @@ class CalcTextToColumns(UITestCase):
xask.executeAction("CLICK", tuple())
#Verify
- self.assertEqual(get_cell_by_position(document, 0, 0, 0).getValue(), 1)
- self.assertEqual(get_cell_by_position(document, 0, 0, 1).getValue(), 2)
- self.assertEqual(get_cell_by_position(document, 0, 0, 2).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 0, 0, 3).getValue(), 4)
- self.assertEqual(get_cell_by_position(document, 0, 0, 4).getValue(), 5)
- self.assertEqual(get_cell_by_position(document, 0, 1, 0).getValue(), 2)
- self.assertEqual(get_cell_by_position(document, 0, 1, 1).getValue(), 2)
- self.assertEqual(get_cell_by_position(document, 0, 1, 2).getValue(), 2)
- self.assertEqual(get_cell_by_position(document, 0, 1, 3).getValue(), 2)
- self.assertEqual(get_cell_by_position(document, 0, 1, 4).getValue(), 2)
- self.assertEqual(get_cell_by_position(document, 0, 2, 0).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 0, 2, 1).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 0, 2, 2).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 0, 2, 3).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 0, 2, 4).getValue(), 3)
- self.assertEqual(get_cell_by_position(document, 0, 3, 0).getValue(), 4)
- self.assertEqual(get_cell_by_position(document, 0, 3, 1).getValue(), 4)
- self.assertEqual(get_cell_by_position(document, 0, 3, 2).getValue(), 4)
- self.assertEqual(get_cell_by_position(document, 0, 3, 3).getValue(), 4)
- self.assertEqual(get_cell_by_position(document, 0, 3, 4).getValue(), 4)
- self.assertEqual(get_cell_by_position(document, 0, 4, 0).getValue(), 5)
- self.assertEqual(get_cell_by_position(document, 0, 4, 1).getValue(), 5)
- self.assertEqual(get_cell_by_position(document, 0, 4, 2).getValue(), 5)
- self.assertEqual(get_cell_by_position(document, 0, 4, 3).getValue(), 5)
- self.assertEqual(get_cell_by_position(document, 0, 4, 4).getValue(), 5)
- self.assertEqual(get_cell_by_position(document, 0, 5, 0).getValue(), 6)
- self.assertEqual(get_cell_by_position(document, 0, 5, 1).getValue(), 6)
- self.assertEqual(get_cell_by_position(document, 0, 5, 2).getValue(), 6)
- self.assertEqual(get_cell_by_position(document, 0, 5, 3).getValue(), 6)
- self.assertEqual(get_cell_by_position(document, 0, 5, 4).getValue(), 6)
- self.assertEqual(get_cell_by_position(document, 0, 6, 0).getString(), "random content")
- self.assertEqual(get_cell_by_position(document, 0, 6, 1).getValue(), 0)
- self.assertEqual(get_cell_by_position(document, 0, 6, 2).getValue(), 0)
- self.assertEqual(get_cell_by_position(document, 0, 6, 3).getValue(), 0)
- self.assertEqual(get_cell_by_position(document, 0, 6, 4).getString(), "random content")
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 0).getValue(), 1)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 1).getValue(), 2)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 2).getValue(), 3)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 3).getValue(), 4)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 0, 4).getValue(), 5)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 0).getValue(), 2)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 1).getValue(), 2)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 2).getValue(), 2)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 3).getValue(), 2)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 1, 4).getValue(), 2)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 0).getValue(), 3)
+ self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 1).getValue(), 3)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list