sc/qa/uitest/autofilter/autofilterBugs.py
| 28
sc/qa/uitest/calc_tests6/autocorrectOptions.py
| 2
sc/qa/uitest/calc_tests6/multipleOperations.py
| 4
sc/qa/uitest/calc_tests6/scenarios.py
| 2
sc/qa/uitest/calc_tests6/shareSpreadsheet.py
| 2
sc/qa/uitest/calc_tests7/save_readonly_with_password.py
| 4
sc/qa/uitest/calc_tests7/tdf124896.py
| 14
sc/qa/uitest/calc_tests7/tdf150044.py
| 2
sc/qa/uitest/calc_tests7/tdf91425.py
| 2
sc/qa/uitest/calc_tests9/tdf113571.py
| 2
sc/qa/uitest/calc_tests9/tdf125440.py
| 2
sc/qa/uitest/calc_tests9/tdf149529.py
| 2
sc/qa/uitest/calc_tests9/tdf156268.py
| 2
sc/qa/uitest/calc_tests9/tdf95554.py
| 2
sc/qa/uitest/chart/chartArea.py
| 272 +--
sc/qa/uitest/chart/chartAxes.py
| 88 -
sc/qa/uitest/chart/chartDataLabels.py
| 400 ++--
sc/qa/uitest/chart/chartGrid.py
| 302 +--
sc/qa/uitest/chart/chartGrids.py
| 128 -
sc/qa/uitest/chart/chartLegend.py
| 176 +-
sc/qa/uitest/chart/chartTitles.py
| 166 +-
sc/qa/uitest/chart/chartWall.py
| 250 +--
sc/qa/uitest/chart/chartXAxis.py
| 442 ++---
sc/qa/uitest/chart/chartYAxis.py
| 446 ++---
sc/qa/uitest/chart/formatDataSeries.py
| 152 -
sc/qa/uitest/chart/tdf93506_trendline.py
| 824 +++++-----
sc/qa/uitest/chart/tdf96432.py
| 88 -
sc/qa/uitest/chart/tdf99069.py
| 80
sc/qa/uitest/chart2/tdf122398.py
| 122 -
sc/qa/uitest/chart2/tdf123013.py
| 62
sc/qa/uitest/chart2/tdf123231.py
| 80
sc/qa/uitest/chart2/tdf123520.py
| 84 -
sc/qa/uitest/chart2/tdf124111.py
| 68
sc/qa/uitest/chart2/tdf129587.py
| 56
sc/qa/uitest/chart2/tdf133630.py
| 2
sc/qa/uitest/pageFormat/tdf123508.py
| 54
sc/qa/uitest/range_name/tdf119954.py
| 2
sc/qa/uitest/search_replace/tdf132097.py
| 2
sc/qa/uitest/search_replace/tdf132783.py
| 2
sc/qa/uitest/search_replace/tdf143759.py
| 2
sc/qa/uitest/search_replace/tdf35020.py
| 2
sc/qa/uitest/search_replace/tdf39959.py
| 2
sc/qa/uitest/search_replace/tdf44398.py
| 4
sc/qa/uitest/search_replace/tdf44861.py
| 2
sc/qa/uitest/search_replace/tdf57523.py
| 2
sc/qa/uitest/search_replace/tdf65334.py
| 2
sc/qa/uitest/search_replace/tdf83126.py
| 2
sc/qa/uitest/signatureLine/insertSignatureLine.py
| 2
sd/qa/uitest/impress_tests/autocorrectOptions.py
| 2
sd/qa/uitest/impress_tests/insertSlide.py
| 4
sd/qa/uitest/impress_tests/masterElements.py
| 2
sd/qa/uitest/impress_tests/renameSlide.py
| 2
sd/qa/uitest/impress_tests/save_readonly_with_password.py
| 4
sd/qa/uitest/impress_tests/tdf159927_dateTime.py
| 2
sd/qa/uitest/impress_tests2/tdf106612.py
| 2
sd/qa/uitest/impress_tests2/tdf130440.py
| 2
sd/qa/uitest/impress_tests2/tdf137637.py
| 2
sd/qa/uitest/impress_tests2/tdf139511.py
| 2
sd/qa/uitest/impress_tests2/tdf91762.py
| 2
sw/qa/uitest/chapterNumbering/tdf123547.py
| 2
sw/qa/uitest/librelogo/compile.py
| 30
sw/qa/uitest/librelogo/run.py
| 42
sw/qa/uitest/sidebar/stylesSidebar.py
| 2
sw/qa/uitest/styleInspector/tdf137105.py
| 2
sw/qa/uitest/styleInspector/tdf137513.py
| 2
sw/qa/uitest/table/tdf115572.py
| 6
sw/qa/uitest/table/tdf115573.py
| 10
sw/qa/uitest/table/tdf144843.py
| 2
sw/qa/uitest/table/tdf81292.py
| 2
sw/qa/uitest/table/tdf99334.py
| 2
sw/qa/uitest/writer_tests/insertCaption.py
| 2
sw/qa/uitest/writer_tests/tdf78068.py
| 2
sw/qa/uitest/writer_tests/tdf81457.py
| 2
sw/qa/uitest/writer_tests/watermark.py
| 2
sw/qa/uitest/writer_tests2/asianPhoneticGuide.py
| 2
sw/qa/uitest/writer_tests2/documentProperties.py
| 4
sw/qa/uitest/writer_tests2/formatBulletsNumbering.py
| 18
sw/qa/uitest/writer_tests2/formatCharacter.py
| 12
sw/qa/uitest/writer_tests2/formatParagraph.py
| 20
sw/qa/uitest/writer_tests2/insertFootnote.py
| 2
sw/qa/uitest/writer_tests2/pasteSpecial.py
| 2
sw/qa/uitest/writer_tests2/tdf116474.py
| 2
sw/qa/uitest/writer_tests2/tdf133299.py
| 2
sw/qa/uitest/writer_tests2/tdf146375.py
| 2
sw/qa/uitest/writer_tests2/tdf153244.py
| 2
sw/qa/uitest/writer_tests3/goToPage.py
| 32
sw/qa/uitest/writer_tests3/insertEndnote.py
| 2
sw/qa/uitest/writer_tests3/insertFootEndnote.py
| 2
sw/qa/uitest/writer_tests3/insertSignatureLine.py
| 2
sw/qa/uitest/writer_tests3/save_readonly_with_password.py
| 4
sw/qa/uitest/writer_tests3/sort.py
| 4
sw/qa/uitest/writer_tests4/tdf113252.py
| 2
sw/qa/uitest/writer_tests4/tdf113284.py
| 36
sw/qa/uitest/writer_tests5/autocorrectOptions.py
| 2
sw/qa/uitest/writer_tests5/tdf115871.py
| 2
sw/qa/uitest/writer_tests5/tdf117039.py
| 2
sw/qa/uitest/writer_tests5/tdf118540.py
| 2
sw/qa/uitest/writer_tests5/tdf122722.py
| 2
sw/qa/uitest/writer_tests5/tdf123378.py
| 2
sw/qa/uitest/writer_tests5/tdf123446.py
| 2
sw/qa/uitest/writer_tests5/tdf148920.py
| 2
sw/qa/uitest/writer_tests5/tdf154543.py
| 2
sw/qa/uitest/writer_tests6/tdf107847_frame_properties_macro_tab.py
| 2
sw/qa/uitest/writer_tests6/tdf118883_copy_shape_from_writer_to_calc.py
| 2
sw/qa/uitest/writer_tests6/tdf120731_open_character_dialog_with_large_amount_of_text_selected.py
| 2
sw/qa/uitest/writer_tests6/tdf124586_switch_outline_numbering_to_chapter_numbering.py
| 2
sw/qa/uitest/writer_tests6/tdf124675_move_SwTextFrame_to_previous_page.py
| 2
sw/qa/uitest/writer_tests6/tdf126017_index_end_of_section_undo.py
| 2
sw/qa/uitest/writer_tests6/tdf126168_frame_style_undo_redo.py
| 2
sw/qa/uitest/writer_tests6/tdf126226_add_comment_to_tracked_change.py
| 2
sw/qa/uitest/writer_tests6/tdf89383_readonly_password_ooxml.py
| 2
sw/qa/uitest/writer_tests7/tdf104795.py
| 2
sw/qa/uitest/writer_tests7/tdf122780.py
| 2
sw/qa/uitest/writer_tests7/tdf128744.py
| 2
sw/qa/uitest/writer_tests8/save_with_password_test_policy.py
| 92 -
115 files changed, 2430 insertions(+), 2430 deletions(-)
New commits:
commit 22a87c434ce396b54b341692dd73209f2bc27fad
Author: Neil Roberts <[email protected]>
AuthorDate: Mon Nov 3 18:29:09 2025 +0100
Commit: Xisco Fauli <[email protected]>
CommitDate: Wed Nov 12 10:00:33 2025 +0100
Fix indentation in the UI tests
A bunch of the UI tests were using only three spaces to indent the
“def” line for a method. In most of the tests, the subsequent lines were
indented by five spaces so that most of the code ends up on a multiple
of 4 spaces and it works out. A few of the tests only indented the
subsequent lines by one additional space so if we fix the “def” line we
need to also fix the rest of the function because otherwise it would end
up having the same indentation as the declaration.
This patch normalises the indentation to use multiples of 4 spaces. I
think the change is worthwhile because the tests are often copy-pasted
and the misindentation is probably spreading that way.
The change was made with this snippet of Emacs lisp:
(with-temp-buffer
(call-process "bash" nil (current-buffer) nil
"-c" "git ls-files | grep '/uitest/.*\.py$'")
(goto-char (point-min))
(while (re-search-forward "^.+$" nil t)
(save-excursion
(find-file (match-string 0))
(when (local-variable-p 'require-final-newline)
(setq require-final-newline nil))
(goto-char (point-min))
(while (re-search-forward "^ [^ ]" nil t)
(goto-char (match-beginning 0))
(let ((end (if (looking-at " *def\_>")
(copy-marker (save-excursion (end-of-defun) (point)))
nil)))
(insert " ")
(when end
(forward-line)
;; Find the next indented line
(when (re-search-forward "^\( +\)[^ ]" end t)
(let ((indent (length (match-string 1))))
;; If it’s not indented by 8 then adjust the whole
;; function by the right amount
(when (/= indent 8)
(beginning-of-line)
(increase-left-margin (point) end (- 8 indent)))))
(set-marker end nil)))))))
Change-Id: Iaec817dd5b982010f460be61950003b6ec8e42b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193371
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <[email protected]>
diff --git a/sc/qa/uitest/autofilter/autofilterBugs.py
b/sc/qa/uitest/autofilter/autofilterBugs.py
index 849351861d7f..5ebd0c923c13 100644
--- a/sc/qa/uitest/autofilter/autofilterBugs.py
+++ b/sc/qa/uitest/autofilter/autofilterBugs.py
@@ -14,7 +14,7 @@ from uitest.uihelper.calc import enter_text_to_cell
class autofilter(UITestCase):
- def test_tdf115046(self):
+ def test_tdf115046(self):
with self.ui_test.load_file(get_url_for_data_file("tdf115046.ods")) as
calc_doc:
#autofilter exist
self.assertEqual(calc_doc.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter,
True)
@@ -25,7 +25,7 @@ class autofilter(UITestCase):
#autofilter still exist
self.assertEqual(calc_doc.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter,
True)
- def test_tdf123095(self):
+ def test_tdf123095(self):
with self.ui_test.create_doc_in_start_center("calc"):
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -45,7 +45,7 @@ class autofilter(UITestCase):
self.assertEqual(get_state_as_dict(xTreeList.getChild("0"))["Text"],
"乙二醇(进口料件)")
self.assertEqual(get_state_as_dict(xTreeList.getChild("1"))["Text"],
"乙二醇（进口料件）")
- def test_tdf125363(self):
+ def test_tdf125363(self):
with self.ui_test.create_doc_in_start_center("calc"):
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -73,7 +73,7 @@ class autofilter(UITestCase):
self.assertEqual(get_state_as_dict(xTreeList.getChild("4"))["Text"], "vröude")
self.assertEqual(get_state_as_dict(xTreeList.getChild("5"))["Text"], "vröudᵉ")
- def test_tdf158326(self):
+ def test_tdf158326(self):
with self.ui_test.create_doc_in_start_center("calc"):
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -97,7 +97,7 @@ class autofilter(UITestCase):
self.assertEqual(get_state_as_dict(xTreeList.getChild("0"))["Text"], "vröude")
self.assertEqual(get_state_as_dict(xTreeList.getChild("1"))["Text"], "vröudᵉ")
- def test_tdf94055(self):
+ def test_tdf94055(self):
with self.ui_test.create_doc_in_start_center("calc") as document:
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -123,7 +123,7 @@ class autofilter(UITestCase):
#tdf77479.ods
- def test_tdf77479(self):
+ def test_tdf77479(self):
with self.ui_test.load_file(get_url_for_data_file("tdf77479.ods")) as
calc_doc:
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -139,7 +139,7 @@ class autofilter(UITestCase):
self.assertEqual(calc_doc.getPropertyValue("UnnamedDatabaseRanges").getByTable(0).AutoFilter,
True)
#112656
- def test_tdf112656(self):
+ def test_tdf112656(self):
with self.ui_test.load_file(get_url_for_data_file("tdf112656.ods")):
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -153,7 +153,7 @@ class autofilter(UITestCase):
self.assertEqual(get_state_as_dict(xSecondEntry)["Text"],
"Vegetables")
#tdf81124
- def test_tdf81124(self):
+ def test_tdf81124(self):
with self.ui_test.load_file(get_url_for_data_file("tdf81124.ods")):
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -175,7 +175,7 @@ class autofilter(UITestCase):
xCancel.executeAction("CLICK", tuple())
#tdf73565
- def test_tdf73565(self):
+ def test_tdf73565(self):
with self.ui_test.load_file(get_url_for_data_file("tdf73565.ods")):
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -190,7 +190,7 @@ class autofilter(UITestCase):
xCancel.executeAction("CLICK", tuple())
#tdf65505
- def test_tdf65505(self):
+ def test_tdf65505(self):
with self.ui_test.load_file(get_url_for_data_file("tdf81124.ods")):
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -205,7 +205,7 @@ class autofilter(UITestCase):
xCancel.executeAction("CLICK", tuple())
#tdf74857
- def test_tdf74857(self):
+ def test_tdf74857(self):
with self.ui_test.load_file(get_url_for_data_file("tdf74857.ods")):
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -216,7 +216,7 @@ class autofilter(UITestCase):
self.assertEqual(gridWinState["MarkedArea"],
"Sheet1.A1:Sheet1.A25")
#tdf35294
- def test_tdf35294(self):
+ def test_tdf35294(self):
with self.ui_test.load_file(get_url_for_data_file("tdf35294.ods")):
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -244,7 +244,7 @@ class autofilter(UITestCase):
xCancel.executeAction("CLICK", tuple())
#tdf55712
- def test_tdf55712(self):
+ def test_tdf55712(self):
with self.ui_test.load_file(get_url_for_data_file("tdf55712.ods")):
calcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = calcDoc.getChild("grid_window")
@@ -277,7 +277,7 @@ class autofilter(UITestCase):
xCancel.executeAction("CLICK", tuple())
#tdf152082
- def test_tdf152082(self):
+ def test_tdf152082(self):
with self.ui_test.load_file(get_url_for_data_file("tdf152082.ods")):
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
diff --git a/sc/qa/uitest/calc_tests6/autocorrectOptions.py
b/sc/qa/uitest/calc_tests6/autocorrectOptions.py
index e626ad93f43b..7441ca5232b4 100644
--- a/sc/qa/uitest/calc_tests6/autocorrectOptions.py
+++ b/sc/qa/uitest/calc_tests6/autocorrectOptions.py
@@ -14,7 +14,7 @@ from uitest.uihelper.common import select_pos
class autocorrectOptions(UITestCase):
- def test_autocorrect_options_calc(self):
+ def test_autocorrect_options_calc(self):
with self.ui_test.create_doc_in_start_center("calc"):
with
self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg",
close_button="cancel") as xDialog:
xTabs = xDialog.getChild("tabcontrol")
diff --git a/sc/qa/uitest/calc_tests6/multipleOperations.py
b/sc/qa/uitest/calc_tests6/multipleOperations.py
index a796016a83e7..148cedc24085 100644
--- a/sc/qa/uitest/calc_tests6/multipleOperations.py
+++ b/sc/qa/uitest/calc_tests6/multipleOperations.py
@@ -16,7 +16,7 @@ from uitest.uihelper.calc import enter_text_to_cell
class multipleOperations(UITestCase):
- def test_multiple_operations_one_variable(self):
+ def test_multiple_operations_one_variable(self):
with self.ui_test.create_doc_in_start_center("calc") as document:
xCalcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = xCalcDoc.getChild("grid_window")
@@ -59,7 +59,7 @@ class multipleOperations(UITestCase):
self.assertEqual(get_cell_by_position(document, 0, 4,
9).getValue(), 26000)
self.assertEqual(get_cell_by_position(document, 0, 4,
10).getValue(), 30000)
- def test_multiple_operations_several_formulas(self):
+ def test_multiple_operations_several_formulas(self):
with self.ui_test.create_doc_in_start_center("calc") as document:
xCalcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = xCalcDoc.getChild("grid_window")
diff --git a/sc/qa/uitest/calc_tests6/scenarios.py
b/sc/qa/uitest/calc_tests6/scenarios.py
index 583c0b1ce504..a7137f4700b6 100644
--- a/sc/qa/uitest/calc_tests6/scenarios.py
+++ b/sc/qa/uitest/calc_tests6/scenarios.py
@@ -15,7 +15,7 @@ from uitest.uihelper.calc import enter_text_to_cell
class scenarios(UITestCase):
- def test_scenarios(self):
+ def test_scenarios(self):
with self.ui_test.create_doc_in_start_center("calc"):
xCalcDoc = self.xUITest.getTopFocusWindow()
xGridWindow = xCalcDoc.getChild("grid_window")
diff --git a/sc/qa/uitest/calc_tests6/shareSpreadsheet.py
b/sc/qa/uitest/calc_tests6/shareSpreadsheet.py
index 265d4a2d14e1..ba27646e2a1f 100644
--- a/sc/qa/uitest/calc_tests6/shareSpreadsheet.py
+++ b/sc/qa/uitest/calc_tests6/shareSpreadsheet.py
@@ -14,7 +14,7 @@ from uitest.uihelper.common import get_state_as_dict
class shareSpreadsheet(UITestCase):
- def test_share_spreadsheet(self):
+ def test_share_spreadsheet(self):
with self.ui_test.create_doc_in_start_center("calc"):
#dialog shareSpreadsheet
with
self.ui_test.execute_dialog_through_command(".uno:ShareDocument",
close_button="cancel") as xDialog:
diff --git a/sc/qa/uitest/calc_tests7/save_readonly_with_password.py
b/sc/qa/uitest/calc_tests7/save_readonly_with_password.py
index 13064432bc8f..211060822f88 100644
--- a/sc/qa/uitest/calc_tests7/save_readonly_with_password.py
+++ b/sc/qa/uitest/calc_tests7/save_readonly_with_password.py
@@ -16,7 +16,7 @@ import os.path
class save_readonly_with_password(UITestCase):
- def test_save_to_xlsx(self):
+ def test_save_to_xlsx(self):
with TemporaryDirectory() as tempdir:
xFilePath = os.path.join(tempdir,
"readonly_with_password_tmp.xlsx")
@@ -56,7 +56,7 @@ class save_readonly_with_password(UITestCase):
self.assertFalse(document.isReadonly())
- def test_save_to_ods(self):
+ def test_save_to_ods(self):
with TemporaryDirectory() as tempdir:
xFilePath = os.path.join(tempdir, "readonly_with_password_tmp.ods")
diff --git a/sc/qa/uitest/calc_tests7/tdf124896.py
b/sc/qa/uitest/calc_tests7/tdf124896.py
index 573a1b4d86b4..52fe8f6bd10f 100644
--- a/sc/qa/uitest/calc_tests7/tdf124896.py
+++ b/sc/qa/uitest/calc_tests7/tdf124896.py
@@ -12,13 +12,13 @@ from uitest.uihelper.common import get_url_for_data_file
# Bug 124896 - CRASH: deleting sheet
class tdf124896(UITestCase):
- def test_tdf124896_crash_delete_sheet(self):
- with self.ui_test.load_file(get_url_for_data_file("tdf124896.ods")) as
calc_doc:
- # Remove X Bar R Chart (2) sheet
- with self.ui_test.execute_dialog_through_command(".uno:Remove",
close_button="yes"):
- pass
+ def test_tdf124896_crash_delete_sheet(self):
+ with self.ui_test.load_file(get_url_for_data_file("tdf124896.ods")) as
calc_doc:
+ # Remove X Bar R Chart (2) sheet
+ with self.ui_test.execute_dialog_through_command(".uno:Remove",
close_button="yes"):
+ pass
- #verify; no crashes
- self.assertEqual(len(calc_doc.Sheets), 2)
+ #verify; no crashes
+ self.assertEqual(len(calc_doc.Sheets), 2)
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests7/tdf150044.py
b/sc/qa/uitest/calc_tests7/tdf150044.py
index ffa0077879ea..bda9d6eb5161 100644
--- a/sc/qa/uitest/calc_tests7/tdf150044.py
+++ b/sc/qa/uitest/calc_tests7/tdf150044.py
@@ -13,7 +13,7 @@ import os.path
class save_shared_readonly_with_password(UITestCase):
- def test_save_to_shared_ods(self):
+ def test_save_to_shared_ods(self):
with TemporaryDirectory() as tempdir:
xFilePath = os.path.join(tempdir,
"shared_readonly_with_password_tmp.ods")
diff --git a/sc/qa/uitest/calc_tests7/tdf91425.py
b/sc/qa/uitest/calc_tests7/tdf91425.py
index d8acdd8c16b8..18a78507d176 100644
--- a/sc/qa/uitest/calc_tests7/tdf91425.py
+++ b/sc/qa/uitest/calc_tests7/tdf91425.py
@@ -15,7 +15,7 @@ from libreoffice.calc.document import get_cell_by_position
#Bug 91425 - CRASH - Calc Insert Columns Left
class tdf91425(UITestCase):
- def test_tdf91425_insert_columns_left(self):
+ def test_tdf91425_insert_columns_left(self):
with self.ui_test.load_file(get_url_for_data_file("tdf91425.ods")) as
calc_doc:
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
diff --git a/sc/qa/uitest/calc_tests9/tdf113571.py
b/sc/qa/uitest/calc_tests9/tdf113571.py
index 0dc337ca64c6..c978cbab89a9 100644
--- a/sc/qa/uitest/calc_tests9/tdf113571.py
+++ b/sc/qa/uitest/calc_tests9/tdf113571.py
@@ -13,7 +13,7 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
class Tdf113571(UITestCase):
- def test_tdf113571(self):
+ def test_tdf113571(self):
with self.ui_test.load_file(get_url_for_data_file("tdf113571.ods")):
xCalcDoc = self.xUITest.getTopFocusWindow()
diff --git a/sc/qa/uitest/calc_tests9/tdf125440.py
b/sc/qa/uitest/calc_tests9/tdf125440.py
index a5319d5826a6..15b0a80a0a4c 100644
--- a/sc/qa/uitest/calc_tests9/tdf125440.py
+++ b/sc/qa/uitest/calc_tests9/tdf125440.py
@@ -14,7 +14,7 @@ from uitest.uihelper.common import get_url_for_data_file
class Tdf1254400(UITestCase):
- def test_tdf125440(self):
+ def test_tdf125440(self):
# In order to simulate copy&paste from external source,
# import the text in Writer, copy it and paste it in Calc
with self.ui_test.load_file(get_url_for_data_file("tdf125440.odt")):
diff --git a/sc/qa/uitest/calc_tests9/tdf149529.py
b/sc/qa/uitest/calc_tests9/tdf149529.py
index afd355da5f82..bef10d806bfb 100644
--- a/sc/qa/uitest/calc_tests9/tdf149529.py
+++ b/sc/qa/uitest/calc_tests9/tdf149529.py
@@ -14,7 +14,7 @@ from libreoffice.calc.document import get_cell_by_position
class Tdf149529(UITestCase):
- def test_tdf149529(self):
+ def test_tdf149529(self):
with self.ui_test.create_doc_in_start_center("calc") as document:
with self.ui_test.execute_dialog_through_command(".uno:Insert") as
xDialog:
diff --git a/sc/qa/uitest/calc_tests9/tdf156268.py
b/sc/qa/uitest/calc_tests9/tdf156268.py
index d3544653691e..21e840b8c344 100644
--- a/sc/qa/uitest/calc_tests9/tdf156268.py
+++ b/sc/qa/uitest/calc_tests9/tdf156268.py
@@ -12,7 +12,7 @@ from uitest.uihelper.common import get_url_for_data_file
class Tdf156268(UITestCase):
- def test_tdf156268(self):
+ def test_tdf156268(self):
# In order to simulate copy&paste from external source,
# import the text in Writer, copy it and paste it in Calc
with self.ui_test.load_file(get_url_for_data_file("tdf156268.fods")):
diff --git a/sc/qa/uitest/calc_tests9/tdf95554.py
b/sc/qa/uitest/calc_tests9/tdf95554.py
index 734711e415e7..f0dbb5666f77 100644
--- a/sc/qa/uitest/calc_tests9/tdf95554.py
+++ b/sc/qa/uitest/calc_tests9/tdf95554.py
@@ -15,7 +15,7 @@ import platform
class Tdf95554(UITestCase):
- def test_tdf95554(self):
+ def test_tdf95554(self):
with self.ui_test.create_doc_in_start_center("calc"):
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
diff --git a/sc/qa/uitest/chart/chartArea.py b/sc/qa/uitest/chart/chartArea.py
index 520ab8e83a2d..fa4da575d5df 100644
--- a/sc/qa/uitest/chart/chartArea.py
+++ b/sc/qa/uitest/chart/chartArea.py
@@ -15,141 +15,141 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
# Chart Area dialog
class chartArea(UITestCase):
- def test_chart_area_dialog(self):
- with self.ui_test.load_file(get_url_for_data_file("chartArea.ods")) as
calc_doc:
-
- with change_measurement_unit(self, "Centimeter"):
- xCalcDoc = self.xUITest.getTopFocusWindow()
- gridwin = xCalcDoc.getChild("grid_window")
-
- xArea = calc_doc.Sheets[0].Charts[0].getEmbeddedObject().Area
- self.assertEqual(xArea.LineWidth, 0)
- self.assertEqual(xArea.LineTransparence, 0)
- self.assertEqual(hex(xArea.FillColor), '0xffffff')
- self.assertEqual(xArea.FillTransparence, 0)
-
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramArea"})) as xDialog:
- #Click on tab "Borders".
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "0")
-
- xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
- transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
-
- xWidth.executeAction("UP", tuple())
- transparency.executeAction("UP", tuple())
-
-
- self.assertEqual(xArea.LineWidth, 100)
- self.assertEqual(xArea.LineTransparence, 5)
- self.assertEqual(hex(xArea.FillColor), '0xffffff')
- self.assertEqual(xArea.FillTransparence, 0)
-
- #reopen and verify tab "Borders".
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramArea"})) as xDialog:
-
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "0")
- xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
- transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
-
- self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.10 cm")
- self.assertEqual(get_state_as_dict(transparency)["Text"], "5%")
-
- #Click on tab "Area"
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "1")
-
- btncolor = xDialog.getChild("btncolor")
- btncolor.executeAction("CLICK", tuple())
-
- rCustom = xDialog.getChild("R_custom")
- gCustom = xDialog.getChild("G_custom")
- bCustom = xDialog.getChild("B_custom")
-
- rCustom.executeAction("CLEAR", tuple())
- rCustom.executeAction("TYPE", mkPropertyValues({"TEXT":"35"}))
- rCustom.executeAction("UP", tuple())
- rCustom.executeAction("DOWN", tuple()) #without this save
data doesn't works
- self.assertEqual(get_state_as_dict(rCustom)["Text"], "35")
- gCustom.executeAction("CLEAR", tuple())
- gCustom.executeAction("TYPE", mkPropertyValues({"TEXT":"169"}))
- gCustom.executeAction("UP", tuple())
- gCustom.executeAction("DOWN", tuple()) #without this save
data doesn't works
- bCustom.executeAction("CLEAR", tuple())
- bCustom.executeAction("TYPE", mkPropertyValues({"TEXT":"211"}))
- bCustom.executeAction("UP", tuple())
- bCustom.executeAction("DOWN", tuple()) #without this save
data doesn't works
-
- self.assertEqual(xArea.LineWidth, 100)
- self.assertEqual(xArea.LineTransparence, 5)
- self.assertEqual(hex(xArea.FillColor), '0x23a9d3')
- self.assertEqual(xArea.FillTransparence, 0)
-
- #reopen and verify tab "Area".
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramArea"})) as xDialog:
-
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "1")
-
- rCustom = xDialog.getChild("R_custom")
- gCustom = xDialog.getChild("G_custom")
- bCustom = xDialog.getChild("B_custom")
-
- self.assertEqual(get_state_as_dict(rCustom)["Text"], "35")
- self.assertEqual(get_state_as_dict(gCustom)["Text"], "169")
- self.assertEqual(get_state_as_dict(bCustom)["Text"], "211")
-
- #change tab "Transparency"
- select_pos(tabcontrol, "2")
- transparency = xDialog.getChild("RBT_TRANS_LINEAR")
- transparencyPercent = xDialog.getChild("MTR_TRANSPARENT") #51%
-
- transparency.executeAction("CLICK", tuple())
- transparencyPercent.executeAction("UP", tuple())
-
-
- self.assertEqual(xArea.LineWidth, 100)
- self.assertEqual(xArea.LineTransparence, 5)
- self.assertEqual(hex(xArea.FillColor), '0x23a9d3')
- self.assertEqual(xArea.FillTransparence, 51)
-
- #reopen and verify tab "Transparency"
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramArea"})) as xDialog:
-
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "2")
-
- transparency = xDialog.getChild("RBT_TRANS_LINEAR")
- transparencyPercent = xDialog.getChild("MTR_TRANSPARENT") #51%
-
- self.assertEqual(get_state_as_dict(transparency)["Checked"],
"true")
-
self.assertEqual(get_state_as_dict(transparencyPercent)["Text"], "51%")
-
-
- self.assertEqual(xArea.LineWidth, 100)
- self.assertEqual(xArea.LineTransparence, 5)
- self.assertEqual(hex(xArea.FillColor), '0x23a9d3')
- self.assertEqual(xArea.FillTransparence, 51)
+ def test_chart_area_dialog(self):
+ with self.ui_test.load_file(get_url_for_data_file("chartArea.ods")) as
calc_doc:
+
+ with change_measurement_unit(self, "Centimeter"):
+ xCalcDoc = self.xUITest.getTopFocusWindow()
+ gridwin = xCalcDoc.getChild("grid_window")
+
+ xArea = calc_doc.Sheets[0].Charts[0].getEmbeddedObject().Area
+ self.assertEqual(xArea.LineWidth, 0)
+ self.assertEqual(xArea.LineTransparence, 0)
+ self.assertEqual(hex(xArea.FillColor), '0xffffff')
+ self.assertEqual(xArea.FillTransparence, 0)
+
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramArea"})) as xDialog:
+ #Click on tab "Borders".
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
+
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+
+ xWidth.executeAction("UP", tuple())
+ transparency.executeAction("UP", tuple())
+
+
+ self.assertEqual(xArea.LineWidth, 100)
+ self.assertEqual(xArea.LineTransparence, 5)
+ self.assertEqual(hex(xArea.FillColor), '0xffffff')
+ self.assertEqual(xArea.FillTransparence, 0)
+
+ #reopen and verify tab "Borders".
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramArea"})) as xDialog:
+
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+
+ self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.10
cm")
+ self.assertEqual(get_state_as_dict(transparency)["Text"],
"5%")
+
+ #Click on tab "Area"
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "1")
+
+ btncolor = xDialog.getChild("btncolor")
+ btncolor.executeAction("CLICK", tuple())
+
+ rCustom = xDialog.getChild("R_custom")
+ gCustom = xDialog.getChild("G_custom")
+ bCustom = xDialog.getChild("B_custom")
+
+ rCustom.executeAction("CLEAR", tuple())
+ rCustom.executeAction("TYPE",
mkPropertyValues({"TEXT":"35"}))
+ rCustom.executeAction("UP", tuple())
+ rCustom.executeAction("DOWN", tuple()) #without this save
data doesn't works
+ self.assertEqual(get_state_as_dict(rCustom)["Text"], "35")
+ gCustom.executeAction("CLEAR", tuple())
+ gCustom.executeAction("TYPE",
mkPropertyValues({"TEXT":"169"}))
+ gCustom.executeAction("UP", tuple())
+ gCustom.executeAction("DOWN", tuple()) #without this save
data doesn't works
+ bCustom.executeAction("CLEAR", tuple())
+ bCustom.executeAction("TYPE",
mkPropertyValues({"TEXT":"211"}))
+ bCustom.executeAction("UP", tuple())
+ bCustom.executeAction("DOWN", tuple()) #without this save
data doesn't works
+
+ self.assertEqual(xArea.LineWidth, 100)
+ self.assertEqual(xArea.LineTransparence, 5)
+ self.assertEqual(hex(xArea.FillColor), '0x23a9d3')
+ self.assertEqual(xArea.FillTransparence, 0)
+
+ #reopen and verify tab "Area".
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramArea"})) as xDialog:
+
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "1")
+
+ rCustom = xDialog.getChild("R_custom")
+ gCustom = xDialog.getChild("G_custom")
+ bCustom = xDialog.getChild("B_custom")
+
+ self.assertEqual(get_state_as_dict(rCustom)["Text"], "35")
+ self.assertEqual(get_state_as_dict(gCustom)["Text"], "169")
+ self.assertEqual(get_state_as_dict(bCustom)["Text"], "211")
+
+ #change tab "Transparency"
+ select_pos(tabcontrol, "2")
+ transparency = xDialog.getChild("RBT_TRANS_LINEAR")
+ transparencyPercent = xDialog.getChild("MTR_TRANSPARENT")
#51%
+
+ transparency.executeAction("CLICK", tuple())
+ transparencyPercent.executeAction("UP", tuple())
+
+
+ self.assertEqual(xArea.LineWidth, 100)
+ self.assertEqual(xArea.LineTransparence, 5)
+ self.assertEqual(hex(xArea.FillColor), '0x23a9d3')
+ self.assertEqual(xArea.FillTransparence, 51)
+
+ #reopen and verify tab "Transparency"
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramArea"})) as xDialog:
+
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "2")
+
+ transparency = xDialog.getChild("RBT_TRANS_LINEAR")
+ transparencyPercent = xDialog.getChild("MTR_TRANSPARENT")
#51%
+
+
self.assertEqual(get_state_as_dict(transparency)["Checked"], "true")
+
self.assertEqual(get_state_as_dict(transparencyPercent)["Text"], "51%")
+
+
+ self.assertEqual(xArea.LineWidth, 100)
+ self.assertEqual(xArea.LineTransparence, 5)
+ self.assertEqual(hex(xArea.FillColor), '0x23a9d3')
+ self.assertEqual(xArea.FillTransparence, 51)
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/chart/chartAxes.py b/sc/qa/uitest/chart/chartAxes.py
index 13a556e9b0f6..a7cb27232c7d 100644
--- a/sc/qa/uitest/chart/chartAxes.py
+++ b/sc/qa/uitest/chart/chartAxes.py
@@ -15,58 +15,58 @@ from uitest.uihelper.common import select_pos
# Chart Enable Axes dialog
class chartAxes(UITestCase):
- def test_chart_enable_grids_dialog(self):
- with self.ui_test.load_file(get_url_for_data_file("chart.ods")):
- xCalcDoc = self.xUITest.getTopFocusWindow()
- gridwin = xCalcDoc.getChild("grid_window")
+ def test_chart_enable_grids_dialog(self):
+ with self.ui_test.load_file(get_url_for_data_file("chart.ods")):
+ xCalcDoc = self.xUITest.getTopFocusWindow()
+ gridwin = xCalcDoc.getChild("grid_window")
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object
1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "InsertMenuAxes"})) as xDialog:
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "InsertMenuAxes"})) as xDialog:
- primaryX = xDialog.getChild("primaryX")
- primaryY = xDialog.getChild("primaryY")
- secondaryX = xDialog.getChild("secondaryX")
- secondaryY = xDialog.getChild("secondaryY")
+ primaryX = xDialog.getChild("primaryX")
+ primaryY = xDialog.getChild("primaryY")
+ secondaryX = xDialog.getChild("secondaryX")
+ secondaryY = xDialog.getChild("secondaryY")
- primaryX.executeAction("CLICK", tuple())
- primaryY.executeAction("CLICK", tuple())
- secondaryX.executeAction("CLICK", tuple())
- secondaryY.executeAction("CLICK", tuple())
+ primaryX.executeAction("CLICK", tuple())
+ primaryY.executeAction("CLICK", tuple())
+ secondaryX.executeAction("CLICK", tuple())
+ secondaryY.executeAction("CLICK", tuple())
- #reopen and verify Grids dialog
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object
1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "InsertMenuAxes"})) as xDialog:
+ #reopen and verify Grids dialog
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "InsertMenuAxes"})) as xDialog:
- primaryX = xDialog.getChild("primaryX")
- primaryY = xDialog.getChild("primaryY")
- secondaryX = xDialog.getChild("secondaryX")
- secondaryY = xDialog.getChild("secondaryY")
+ primaryX = xDialog.getChild("primaryX")
+ primaryY = xDialog.getChild("primaryY")
+ secondaryX = xDialog.getChild("secondaryX")
+ secondaryY = xDialog.getChild("secondaryY")
- self.assertEqual(get_state_as_dict(primaryX)["Selected"], "false")
- self.assertEqual(get_state_as_dict(primaryY)["Selected"], "false")
- self.assertEqual(get_state_as_dict(secondaryX)["Selected"], "true")
- self.assertEqual(get_state_as_dict(secondaryY)["Selected"], "true")
+ self.assertEqual(get_state_as_dict(primaryX)["Selected"],
"false")
+ self.assertEqual(get_state_as_dict(primaryY)["Selected"],
"false")
+ self.assertEqual(get_state_as_dict(secondaryX)["Selected"],
"true")
+ self.assertEqual(get_state_as_dict(secondaryY)["Selected"],
"true")
- # Test Format -> Axis -> X Axis...: the child name is generated in
- # lcl_getAxisCIDForCommand().
- xAxisX = xChartMain.getChild("CID/D=0:CS=0:Axis=0,0")
- with self.ui_test.execute_dialog_through_action(xAxisX, "COMMAND",
mkPropertyValues({"COMMAND": "DiagramAxisX"})) as xDialog:
- xTabs = xDialog.getChild("tabcontrol")
- # Select RID_SVXPAGE_CHAR_EFFECTS, see the SchAttribTabDlg ctor.
- select_pos(xTabs, "6")
- xFontTransparency = xDialog.getChild("fonttransparencymtr")
- # Without the accompanying fix in place, this test would have
failed, the
- # semi-transparent text UI was visible, but then it was lost on
save.
- self.assertEqual(get_state_as_dict(xFontTransparency)["Visible"],
"false")
+ # Test Format -> Axis -> X Axis...: the child name is generated in
+ # lcl_getAxisCIDForCommand().
+ xAxisX = xChartMain.getChild("CID/D=0:CS=0:Axis=0,0")
+ with self.ui_test.execute_dialog_through_action(xAxisX, "COMMAND",
mkPropertyValues({"COMMAND": "DiagramAxisX"})) as xDialog:
+ xTabs = xDialog.getChild("tabcontrol")
+ # Select RID_SVXPAGE_CHAR_EFFECTS, see the SchAttribTabDlg
ctor.
+ select_pos(xTabs, "6")
+ xFontTransparency = xDialog.getChild("fonttransparencymtr")
+ # Without the accompanying fix in place, this test would have
failed, the
+ # semi-transparent text UI was visible, but then it was lost
on save.
+
self.assertEqual(get_state_as_dict(xFontTransparency)["Visible"], "false")
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/chart/chartDataLabels.py
b/sc/qa/uitest/chart/chartDataLabels.py
index cbdfb30e82d5..78919e902f68 100644
--- a/sc/qa/uitest/chart/chartDataLabels.py
+++ b/sc/qa/uitest/chart/chartDataLabels.py
@@ -18,273 +18,273 @@ from com.sun.star.lang import Locale
# Chart Display Data Labels dialog
class chartDataLabels(UITestCase):
- def test_chart_data_labels_dialog(self):
- with self.ui_test.load_file(get_url_for_data_file("chart.ods")) as
calc_doc:
- xCalcDoc = self.xUITest.getTopFocusWindow()
- gridwin = xCalcDoc.getChild("grid_window")
+ def test_chart_data_labels_dialog(self):
+ with self.ui_test.load_file(get_url_for_data_file("chart.ods")) as
calc_doc:
+ xCalcDoc = self.xUITest.getTopFocusWindow()
+ gridwin = xCalcDoc.getChild("grid_window")
+
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+
+ xDataSeries =
calc_doc.Sheets[0].Charts[0].getEmbeddedObject().getFirstDiagram().CoordinateSystems[0].ChartTypes[0].DataSeries
+ self.assertFalse(xDataSeries[0].Label.ShowNumber)
+ self.assertFalse(xDataSeries[0].Label.ShowCategoryName)
+ self.assertFalse(xDataSeries[0].Label.ShowLegendSymbol)
+ self.assertEqual(xDataSeries[0].LabelSeparator, " ")
+
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "InsertMenuDataLabels"})) as xDialog:
+
+ xTabs = xDialog.getChild("tabcontrol")
+ select_pos(xTabs, "1")
+
+ self.assertTrue(xDataSeries[0].Label.ShowNumber)
+ self.assertFalse(xDataSeries[0].Label.ShowCategoryName)
+ self.assertFalse(xDataSeries[0].Label.ShowLegendSymbol)
+ self.assertEqual(xDataSeries[0].LabelSeparator, " ")
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object
1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ category = xDialog.getChild("CB_CATEGORY")
+ legend = xDialog.getChild("CB_SYMBOL")
+ wrapText = xDialog.getChild("CB_WRAP_TEXT")
+ separator = xDialog.getChild("LB_TEXT_SEPARATOR")
+ placement = xDialog.getChild("LB_LABEL_PLACEMENT")
+ degrees = xDialog.getChild("NF_LABEL_DEGREES")
+ textDirection = xDialog.getChild("LB_LABEL_TEXTDIR")
- xDataSeries =
calc_doc.Sheets[0].Charts[0].getEmbeddedObject().getFirstDiagram().CoordinateSystems[0].ChartTypes[0].DataSeries
- self.assertFalse(xDataSeries[0].Label.ShowNumber)
- self.assertFalse(xDataSeries[0].Label.ShowCategoryName)
- self.assertFalse(xDataSeries[0].Label.ShowLegendSymbol)
- self.assertEqual(xDataSeries[0].LabelSeparator, " ")
+ #valueAsNumber.executeAction("CLICK", tuple())
+ category.executeAction("CLICK", tuple())
+ legend.executeAction("CLICK", tuple())
+ wrapText.executeAction("CLICK", tuple())
+ select_by_text(separator, "Comma")
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "InsertMenuDataLabels"})) as xDialog:
+ select_by_text(placement, "Below")
+ degrees.executeAction("UP", tuple())
+ select_by_text(textDirection, "Right-to-left")
- xTabs = xDialog.getChild("tabcontrol")
- select_pos(xTabs, "1")
self.assertTrue(xDataSeries[0].Label.ShowNumber)
- self.assertFalse(xDataSeries[0].Label.ShowCategoryName)
- self.assertFalse(xDataSeries[0].Label.ShowLegendSymbol)
- self.assertEqual(xDataSeries[0].LabelSeparator, " ")
+ self.assertTrue(xDataSeries[0].Label.ShowCategoryName)
+ self.assertTrue(xDataSeries[0].Label.ShowLegendSymbol)
+ self.assertEqual(xDataSeries[0].LabelSeparator, ", ")
+
+ #reopen and verify InsertMenuDataLabels dialog
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "InsertMenuDataLabels"})) as xDialog:
+
+ xTabs = xDialog.getChild("tabcontrol")
+ select_pos(xTabs, "1")
+
+ self.assertTrue(xDataSeries[0].Label.ShowNumber)
+ self.assertTrue(xDataSeries[0].Label.ShowCategoryName)
+ self.assertTrue(xDataSeries[0].Label.ShowLegendSymbol)
+ self.assertEqual(xDataSeries[0].LabelSeparator, ", ")
+
+ valueAsNumber = xDialog.getChild("CB_VALUE_AS_NUMBER")
+ category = xDialog.getChild("CB_CATEGORY")
+ legend = xDialog.getChild("CB_SYMBOL")
+ wrapText = xDialog.getChild("CB_WRAP_TEXT")
+ separator = xDialog.getChild("LB_TEXT_SEPARATOR")
+ placement = xDialog.getChild("LB_LABEL_PLACEMENT")
+ degrees = xDialog.getChild("NF_LABEL_DEGREES")
+ textDirection = xDialog.getChild("LB_LABEL_TEXTDIR")
+
+ self.assertEqual(get_state_as_dict(valueAsNumber)["Selected"],
"true")
+ self.assertEqual(get_state_as_dict(category)["Selected"],
"true")
+ self.assertEqual(get_state_as_dict(legend)["Selected"], "true")
+ self.assertEqual(get_state_as_dict(wrapText)["Selected"],
"true")
+
self.assertEqual(get_state_as_dict(separator)["SelectEntryText"], "Comma")
+
self.assertEqual(get_state_as_dict(placement)["SelectEntryText"], "Below")
+ self.assertEqual(get_state_as_dict(degrees)["Text"], "1°")
+
self.assertEqual(get_state_as_dict(textDirection)["SelectEntryText"],
"Right-to-left")
- category = xDialog.getChild("CB_CATEGORY")
- legend = xDialog.getChild("CB_SYMBOL")
- wrapText = xDialog.getChild("CB_WRAP_TEXT")
- separator = xDialog.getChild("LB_TEXT_SEPARATOR")
- placement = xDialog.getChild("LB_LABEL_PLACEMENT")
- degrees = xDialog.getChild("NF_LABEL_DEGREES")
- textDirection = xDialog.getChild("LB_LABEL_TEXTDIR")
-
- #valueAsNumber.executeAction("CLICK", tuple())
- category.executeAction("CLICK", tuple())
- legend.executeAction("CLICK", tuple())
- wrapText.executeAction("CLICK", tuple())
- select_by_text(separator, "Comma")
-
- select_by_text(placement, "Below")
- degrees.executeAction("UP", tuple())
- select_by_text(textDirection, "Right-to-left")
-
-
- self.assertTrue(xDataSeries[0].Label.ShowNumber)
- self.assertTrue(xDataSeries[0].Label.ShowCategoryName)
- self.assertTrue(xDataSeries[0].Label.ShowLegendSymbol)
- self.assertEqual(xDataSeries[0].LabelSeparator, ", ")
-
- #reopen and verify InsertMenuDataLabels dialog
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object
1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "InsertMenuDataLabels"})) as xDialog:
-
- xTabs = xDialog.getChild("tabcontrol")
- select_pos(xTabs, "1")
self.assertTrue(xDataSeries[0].Label.ShowNumber)
self.assertTrue(xDataSeries[0].Label.ShowCategoryName)
self.assertTrue(xDataSeries[0].Label.ShowLegendSymbol)
self.assertEqual(xDataSeries[0].LabelSeparator, ", ")
- valueAsNumber = xDialog.getChild("CB_VALUE_AS_NUMBER")
- category = xDialog.getChild("CB_CATEGORY")
- legend = xDialog.getChild("CB_SYMBOL")
- wrapText = xDialog.getChild("CB_WRAP_TEXT")
- separator = xDialog.getChild("LB_TEXT_SEPARATOR")
- placement = xDialog.getChild("LB_LABEL_PLACEMENT")
- degrees = xDialog.getChild("NF_LABEL_DEGREES")
- textDirection = xDialog.getChild("LB_LABEL_TEXTDIR")
-
- self.assertEqual(get_state_as_dict(valueAsNumber)["Selected"],
"true")
- self.assertEqual(get_state_as_dict(category)["Selected"], "true")
- self.assertEqual(get_state_as_dict(legend)["Selected"], "true")
- self.assertEqual(get_state_as_dict(wrapText)["Selected"], "true")
- self.assertEqual(get_state_as_dict(separator)["SelectEntryText"],
"Comma")
- self.assertEqual(get_state_as_dict(placement)["SelectEntryText"],
"Below")
- self.assertEqual(get_state_as_dict(degrees)["Text"], "1°")
-
self.assertEqual(get_state_as_dict(textDirection)["SelectEntryText"],
"Right-to-left")
-
-
- self.assertTrue(xDataSeries[0].Label.ShowNumber)
- self.assertTrue(xDataSeries[0].Label.ShowCategoryName)
- self.assertTrue(xDataSeries[0].Label.ShowLegendSymbol)
- self.assertEqual(xDataSeries[0].LabelSeparator, ", ")
-
- def test_chart_data_labels_percentage_dialog(self):
- with self.ui_test.load_file(get_url_for_data_file("dataLabels.ods")) as
calc_doc:
- xCalcDoc = self.xUITest.getTopFocusWindow()
- gridwin = xCalcDoc.getChild("grid_window")
-
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object
1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
-
- xDataSeries =
calc_doc.Sheets[0].Charts[0].getEmbeddedObject().getFirstDiagram().CoordinateSystems[0].ChartTypes[0].DataSeries
- self.assertTrue(xDataSeries[0].Label.ShowNumber)
- self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
- self.assertIsNone(xDataSeries[0].PercentageNumberFormat)
-
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "FormatDataLabels"})) as xDialog:
-
- xTabs = xDialog.getChild("tabcontrol")
- select_pos(xTabs, "1")
+ def test_chart_data_labels_percentage_dialog(self):
+ with self.ui_test.load_file(get_url_for_data_file("dataLabels.ods"))
as calc_doc:
+ xCalcDoc = self.xUITest.getTopFocusWindow()
+ gridwin = xCalcDoc.getChild("grid_window")
+
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ xDataSeries =
calc_doc.Sheets[0].Charts[0].getEmbeddedObject().getFirstDiagram().CoordinateSystems[0].ChartTypes[0].DataSeries
self.assertTrue(xDataSeries[0].Label.ShowNumber)
self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
self.assertIsNone(xDataSeries[0].PercentageNumberFormat)
- valueAsNumber = xDialog.getChild("CB_VALUE_AS_NUMBER")
- valueAsPercentage = xDialog.getChild("CB_VALUE_AS_PERCENTAGE")
- buttonPercentage = xDialog.getChild("PB_PERCENT_NUMBERFORMAT")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "FormatDataLabels"})) as xDialog:
- valueAsNumber.executeAction("CLICK", tuple())
- valueAsPercentage.executeAction("CLICK", tuple())
- #button Percentage format
+ xTabs = xDialog.getChild("tabcontrol")
+ select_pos(xTabs, "1")
- with
self.ui_test.execute_blocking_action(buttonPercentage.executeAction,
args=('CLICK', ())) as dialog:
- sourceformat = dialog.getChild("sourceformat")
- decimalsed = dialog.getChild("decimalsed")
- leadzerosed = dialog.getChild("leadzerosed")
- negnumred = dialog.getChild("negnumred")
- thousands = dialog.getChild("thousands")
- formatted = dialog.getChild("formatted")
+ self.assertTrue(xDataSeries[0].Label.ShowNumber)
+ self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
+ self.assertIsNone(xDataSeries[0].PercentageNumberFormat)
- sourceformat.executeAction("CLICK", tuple())
- decimalsed.executeAction("UP", tuple())
- leadzerosed.executeAction("UP", tuple())
- negnumred.executeAction("CLICK", tuple())
- thousands.executeAction("CLICK", tuple())
- self.assertEqual(get_state_as_dict(formatted)["Text"],
"#,#00.0%;[RED]-#,#00.0%")
+ valueAsNumber = xDialog.getChild("CB_VALUE_AS_NUMBER")
+ valueAsPercentage = xDialog.getChild("CB_VALUE_AS_PERCENTAGE")
+ buttonPercentage = xDialog.getChild("PB_PERCENT_NUMBERFORMAT")
- self.assertEqual(get_state_as_dict(valueAsNumber)["Selected"],
"false")
- self.assertEqual(get_state_as_dict(valueAsPercentage)["Selected"],
"true")
+ valueAsNumber.executeAction("CLICK", tuple())
+ valueAsPercentage.executeAction("CLICK", tuple())
+ #button Percentage format
+ with
self.ui_test.execute_blocking_action(buttonPercentage.executeAction,
args=('CLICK', ())) as dialog:
+ sourceformat = dialog.getChild("sourceformat")
+ decimalsed = dialog.getChild("decimalsed")
+ leadzerosed = dialog.getChild("leadzerosed")
+ negnumred = dialog.getChild("negnumred")
+ thousands = dialog.getChild("thousands")
+ formatted = dialog.getChild("formatted")
- xNumberFormats =
calc_doc.Sheets[0].Charts[0].getEmbeddedObject().getNumberFormats()
- xLocale = Locale('en', 'US', '')
- xFormat = xNumberFormats.queryKey("#,#00.0%;[RED]-#,#00.0%", xLocale,
True)
+ sourceformat.executeAction("CLICK", tuple())
+ decimalsed.executeAction("UP", tuple())
+ leadzerosed.executeAction("UP", tuple())
+ negnumred.executeAction("CLICK", tuple())
+ thousands.executeAction("CLICK", tuple())
+ self.assertEqual(get_state_as_dict(formatted)["Text"],
"#,#00.0%;[RED]-#,#00.0%")
- self.assertFalse(xDataSeries[0].Label.ShowNumber)
- self.assertTrue(xDataSeries[0].Label.ShowNumberInPercent)
- self.assertEqual(xDataSeries[0].PercentageNumberFormat, xFormat)
+ self.assertEqual(get_state_as_dict(valueAsNumber)["Selected"],
"false")
+
self.assertEqual(get_state_as_dict(valueAsPercentage)["Selected"], "true")
- #reopen and verify Percentage dialog
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object
1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "FormatDataLabels"})) as xDialog:
- xTabs = xDialog.getChild("tabcontrol")
- select_pos(xTabs, "1")
+ xNumberFormats =
calc_doc.Sheets[0].Charts[0].getEmbeddedObject().getNumberFormats()
+ xLocale = Locale('en', 'US', '')
+ xFormat = xNumberFormats.queryKey("#,#00.0%;[RED]-#,#00.0%",
xLocale, True)
self.assertFalse(xDataSeries[0].Label.ShowNumber)
self.assertTrue(xDataSeries[0].Label.ShowNumberInPercent)
self.assertEqual(xDataSeries[0].PercentageNumberFormat, xFormat)
- valueAsNumber = xDialog.getChild("CB_VALUE_AS_NUMBER")
- valueAsPercentage = xDialog.getChild("CB_VALUE_AS_PERCENTAGE")
+ #reopen and verify Percentage dialog
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "FormatDataLabels"})) as xDialog:
- self.assertEqual(get_state_as_dict(valueAsNumber)["Selected"],
"false")
- self.assertEqual(get_state_as_dict(valueAsPercentage)["Selected"],
"true")
+ xTabs = xDialog.getChild("tabcontrol")
+ select_pos(xTabs, "1")
- self.assertFalse(xDataSeries[0].Label.ShowNumber)
- self.assertTrue(xDataSeries[0].Label.ShowNumberInPercent)
- self.assertEqual(xDataSeries[0].PercentageNumberFormat, xFormat)
+ self.assertFalse(xDataSeries[0].Label.ShowNumber)
+ self.assertTrue(xDataSeries[0].Label.ShowNumberInPercent)
+ self.assertEqual(xDataSeries[0].PercentageNumberFormat,
xFormat)
- def test_tdf131291(self):
- with self.ui_test.load_file(get_url_for_data_file("tdf131291.ods")) as
calc_doc:
- xCalcDoc = self.xUITest.getTopFocusWindow()
- gridwin = xCalcDoc.getChild("grid_window")
+ valueAsNumber = xDialog.getChild("CB_VALUE_AS_NUMBER")
+ valueAsPercentage = xDialog.getChild("CB_VALUE_AS_PERCENTAGE")
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object
1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ self.assertEqual(get_state_as_dict(valueAsNumber)["Selected"],
"false")
+
self.assertEqual(get_state_as_dict(valueAsPercentage)["Selected"], "true")
- xDataSeries =
calc_doc.Sheets[0].Charts[0].getEmbeddedObject().getFirstDiagram().CoordinateSystems[0].ChartTypes[0].DataSeries
- self.assertTrue(xDataSeries[0].Label.ShowNumber)
- self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
+ self.assertFalse(xDataSeries[0].Label.ShowNumber)
+ self.assertTrue(xDataSeries[0].Label.ShowNumberInPercent)
+ self.assertEqual(xDataSeries[0].PercentageNumberFormat, xFormat)
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "FormatDataLabels"})) as xDialog:
+ def test_tdf131291(self):
+ with self.ui_test.load_file(get_url_for_data_file("tdf131291.ods")) as
calc_doc:
+ xCalcDoc = self.xUITest.getTopFocusWindow()
+ gridwin = xCalcDoc.getChild("grid_window")
- xTabs = xDialog.getChild("tabcontrol")
- select_pos(xTabs, "1")
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ xDataSeries =
calc_doc.Sheets[0].Charts[0].getEmbeddedObject().getFirstDiagram().CoordinateSystems[0].ChartTypes[0].DataSeries
self.assertTrue(xDataSeries[0].Label.ShowNumber)
self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
- xNumberFormatBtn = xDialog.getChild("PB_NUMBERFORMAT")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "FormatDataLabels"})) as xDialog:
- with
self.ui_test.execute_blocking_action(xNumberFormatBtn.executeAction,
args=('CLICK', ())) as dialog:
- categoryformat = dialog.getChild("categorylb")
- formatted = dialog.getChild("formatted")
- sourceformat = dialog.getChild("sourceformat")
+ xTabs = xDialog.getChild("tabcontrol")
+ select_pos(xTabs, "1")
- # Select currency
- sourceformat.executeAction("CLICK", tuple())
- categoryformat.getChild("4").executeAction("SELECT", tuple())
+ self.assertTrue(xDataSeries[0].Label.ShowNumber)
+ self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
-
self.assertEqual(get_state_as_dict(categoryformat)["SelectEntryText"],
"Currency")
+ xNumberFormatBtn = xDialog.getChild("PB_NUMBERFORMAT")
- self.assertEqual(get_state_as_dict(formatted)["Text"],
"[$$-409]#,##0.00;[RED]-[$$-409]#,##0.00")
+ with
self.ui_test.execute_blocking_action(xNumberFormatBtn.executeAction,
args=('CLICK', ())) as dialog:
+ categoryformat = dialog.getChild("categorylb")
+ formatted = dialog.getChild("formatted")
+ sourceformat = dialog.getChild("sourceformat")
+ # Select currency
+ sourceformat.executeAction("CLICK", tuple())
+ categoryformat.getChild("4").executeAction("SELECT",
tuple())
- xNumberFormats =
calc_doc.Sheets[0].Charts[0].getEmbeddedObject().getNumberFormats()
- xLocale = Locale()
- xFormat =
xNumberFormats.queryKey("[$$-409]#,##0.00;[RED]-[$$-409]#,##0.00", xLocale,
True)
+
self.assertEqual(get_state_as_dict(categoryformat)["SelectEntryText"],
"Currency")
- self.assertTrue(xDataSeries[0].Label.ShowNumber)
- self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
- self.assertEqual(xDataSeries[0].NumberFormat, xFormat)
+ self.assertEqual(get_state_as_dict(formatted)["Text"],
"[$$-409]#,##0.00;[RED]-[$$-409]#,##0.00")
- #reopen and verify the previous changes
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "FormatDataLabels"})) as xDialog:
+
+ xNumberFormats =
calc_doc.Sheets[0].Charts[0].getEmbeddedObject().getNumberFormats()
+ xLocale = Locale()
+ xFormat =
xNumberFormats.queryKey("[$$-409]#,##0.00;[RED]-[$$-409]#,##0.00", xLocale,
True)
self.assertTrue(xDataSeries[0].Label.ShowNumber)
self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
- # tdf#131291: it would fail here: AssertionError: 0 != 104
self.assertEqual(xDataSeries[0].NumberFormat, xFormat)
+ #reopen and verify the previous changes
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "FormatDataLabels"})) as xDialog:
- self.assertTrue(xDataSeries[0].Label.ShowNumber)
- self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
- self.assertEqual(xDataSeries[0].NumberFormat, xFormat)
+ self.assertTrue(xDataSeries[0].Label.ShowNumber)
+ self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
+ # tdf#131291: it would fail here: AssertionError: 0 != 104
+ self.assertEqual(xDataSeries[0].NumberFormat, xFormat)
- def test_tdf136573(self):
- with self.ui_test.load_file(get_url_for_data_file("dataLabels.ods")):
- with change_measurement_unit(self, "Centimeter"):
- xCalcDoc = self.xUITest.getTopFocusWindow()
- gridwin = xCalcDoc.getChild("grid_window")
+ self.assertTrue(xDataSeries[0].Label.ShowNumber)
+ self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
+ self.assertEqual(xDataSeries[0].NumberFormat, xFormat)
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
+ def test_tdf136573(self):
+ with self.ui_test.load_file(get_url_for_data_file("dataLabels.ods")):
+
+ with change_measurement_unit(self, "Centimeter"):
+ xCalcDoc = self.xUITest.getTopFocusWindow()
+ gridwin = xCalcDoc.getChild("grid_window")
+
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
- # Select the first label
- xDataLabel =
xChartMain.getChild("CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0")
- xDataLabel.executeAction("SELECT", tuple())
+ # Select the first label
+ xDataLabel =
xChartMain.getChild("CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0")
+ xDataLabel.executeAction("SELECT", tuple())
- with self.ui_test.execute_dialog_through_action(xDataLabel,
"COMMAND", mkPropertyValues({"COMMAND": "TransformDialog"})) as xDialog:
+ with self.ui_test.execute_dialog_through_action(xDataLabel,
"COMMAND", mkPropertyValues({"COMMAND": "TransformDialog"})) as xDialog:
- self.assertEqual("0.73",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
- self.assertEqual("2.82",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
+ self.assertEqual("0.73",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
+ self.assertEqual("2.82",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
- # Use OK button in order to test tdf#137165
+ # Use OK button in order to test tdf#137165
- xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"UP"}))
- xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"LEFT"}))
+ xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"UP"}))
+ xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"LEFT"}))
- with self.ui_test.execute_dialog_through_action(xDataLabel,
"COMMAND", mkPropertyValues({"COMMAND": "TransformDialog"})) as xDialog:
+ with self.ui_test.execute_dialog_through_action(xDataLabel,
"COMMAND", mkPropertyValues({"COMMAND": "TransformDialog"})) as xDialog:
- # Check the position has changed after moving the label using
the arrows keys
- self.assertEqual("0.63",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
- self.assertEqual("2.72",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
+ # Check the position has changed after moving the label
using the arrows keys
+ self.assertEqual("0.63",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
+ self.assertEqual("2.72",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/chart/chartGrid.py b/sc/qa/uitest/chart/chartGrid.py
index fc1b705e6cd0..0275515d40c8 100644
--- a/sc/qa/uitest/chart/chartGrid.py
+++ b/sc/qa/uitest/chart/chartGrid.py
@@ -15,186 +15,186 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
# Chart Grid dialog
# Bug 98390 - Crash when modifying minor grid
class chartGrid(UITestCase):
- def test_tdf98390_chart_grid_dialog(self):
- with self.ui_test.load_file(get_url_for_data_file("chart.ods")):
+ def test_tdf98390_chart_grid_dialog(self):
+ with self.ui_test.load_file(get_url_for_data_file("chart.ods")):
- with change_measurement_unit(self, "Centimeter"):
- xCalcDoc = self.xUITest.getTopFocusWindow()
- gridwin = xCalcDoc.getChild("grid_window")
-
- #X Axis Major Grid
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridYMain"})) as xDialog:
- #tab "Line".
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "0")
-
- xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
- transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
-
- xWidth.executeAction("UP", tuple())
- transparency.executeAction("UP", tuple())
-
-
- #reopen and verify X Axis Major Grid
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridYMain"})) as xDialog:
+ with change_measurement_unit(self, "Centimeter"):
+ xCalcDoc = self.xUITest.getTopFocusWindow()
+ gridwin = xCalcDoc.getChild("grid_window")
+
+ #X Axis Major Grid
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridYMain"})) as xDialog:
+ #tab "Line".
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
+
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+
+ xWidth.executeAction("UP", tuple())
+ transparency.executeAction("UP", tuple())
+
+
+ #reopen and verify X Axis Major Grid
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridYMain"})) as xDialog:
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "0")
- xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
- transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
- self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.10 cm")
- self.assertEqual(get_state_as_dict(transparency)["Text"], "5%")
-
- #Y Axis Major Grid
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridXMain"})) as xDialog:
+ self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.10
cm")
+ self.assertEqual(get_state_as_dict(transparency)["Text"],
"5%")
+
+ #Y Axis Major Grid
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridXMain"})) as xDialog:
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "0")
-
- xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
- transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
+
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
- xWidth.executeAction("UP", tuple())
- transparency.executeAction("UP", tuple())
+ xWidth.executeAction("UP", tuple())
+ transparency.executeAction("UP", tuple())
- #reopen and verify Y Axis Major Grid
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridXMain"})) as xDialog:
+ #reopen and verify Y Axis Major Grid
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridXMain"})) as xDialog:
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "0")
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
- xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
- transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
- self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.10 cm")
- self.assertEqual(get_state_as_dict(transparency)["Text"], "5%")
-
-
- #Y Axis Minor Grid
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridXHelp"})) as xDialog:
-
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "0")
-
- xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
- transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
-
- xWidth.executeAction("UP", tuple())
- transparency.executeAction("UP", tuple())
-
-
- #reopen and verify Y Axis Minor Grid
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridXHelp"})) as xDialog:
+ self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.10
cm")
+ self.assertEqual(get_state_as_dict(transparency)["Text"],
"5%")
+
+
+ #Y Axis Minor Grid
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridXHelp"})) as xDialog:
+
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
+
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+
+ xWidth.executeAction("UP", tuple())
+ transparency.executeAction("UP", tuple())
+
+
+ #reopen and verify Y Axis Minor Grid
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridXHelp"})) as xDialog:
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "0")
- xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
- transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
-
- self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.10 cm")
- self.assertEqual(get_state_as_dict(transparency)["Text"], "5%")
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+
+ self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.10
cm")
+ self.assertEqual(get_state_as_dict(transparency)["Text"],
"5%")
- #X Axis Minor Grid
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridYHelp"})) as xDialog:
+ #X Axis Minor Grid
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridYHelp"})) as xDialog:
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "0")
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
- xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
- transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
- xWidth.executeAction("UP", tuple())
- transparency.executeAction("UP", tuple())
+ xWidth.executeAction("UP", tuple())
+ transparency.executeAction("UP", tuple())
- #reopen and verify X Axis Minor Grid
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridYHelp"})) as xDialog:
+ #reopen and verify X Axis Minor Grid
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridYHelp"})) as xDialog:
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "0")
- xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
- transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
- self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.10 cm")
- self.assertEqual(get_state_as_dict(transparency)["Text"], "5%")
+ self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.10
cm")
+ self.assertEqual(get_state_as_dict(transparency)["Text"],
"5%")
- #All Grids
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridAll"})) as xDialog:
+ #All Grids
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridAll"})) as xDialog:
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "0")
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
- xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
- transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
- xWidth.executeAction("UP", tuple())
- transparency.executeAction("UP", tuple())
+ xWidth.executeAction("UP", tuple())
+ transparency.executeAction("UP", tuple())
- #reopen and verify X Axis Minor Grid (changed in All Grids)
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridYHelp"})) as xDialog:
+ #reopen and verify X Axis Minor Grid (changed in All Grids)
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "DiagramGridYHelp"})) as xDialog:
- tabcontrol = xDialog.getChild("tabcontrol")
- select_pos(tabcontrol, "0")
- xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
- transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
- self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.20 cm")
- self.assertEqual(get_state_as_dict(transparency)["Text"],
"10%")
+ self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.20
cm")
+ self.assertEqual(get_state_as_dict(transparency)["Text"],
"10%")
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/chart/chartGrids.py b/sc/qa/uitest/chart/chartGrids.py
index 327da2933651..010e5344483b 100644
--- a/sc/qa/uitest/chart/chartGrids.py
+++ b/sc/qa/uitest/chart/chartGrids.py
@@ -14,70 +14,70 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
# Chart Enable Grids dialog
class chartGrids(UITestCase):
- def test_chart_enable_grids_dialog(self):
- with self.ui_test.load_file(get_url_for_data_file("chart.ods")):
- xCalcDoc = self.xUITest.getTopFocusWindow()
- gridwin = xCalcDoc.getChild("grid_window")
-
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object
1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "InsertMenuGrids"})) as xDialog:
-
- primaryX = xDialog.getChild("primaryX")
- primaryY = xDialog.getChild("primaryY")
- secondaryX = xDialog.getChild("secondaryX")
- secondaryY = xDialog.getChild("secondaryY")
-
- primaryX.executeAction("CLICK", tuple())
- primaryY.executeAction("CLICK", tuple())
- secondaryX.executeAction("CLICK", tuple())
- secondaryY.executeAction("CLICK", tuple())
-
-
- #reopen and verify Grids dialog
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object
1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "InsertMenuGrids"})) as xDialog:
-
- primaryX = xDialog.getChild("primaryX")
- primaryY = xDialog.getChild("primaryY")
- secondaryX = xDialog.getChild("secondaryX")
- secondaryY = xDialog.getChild("secondaryY")
-
- self.assertEqual(get_state_as_dict(primaryX)["Selected"], "false")
- self.assertEqual(get_state_as_dict(primaryY)["Selected"], "false")
- self.assertEqual(get_state_as_dict(secondaryX)["Selected"],
"false")
- self.assertEqual(get_state_as_dict(secondaryY)["Selected"],
"false")
-
- primaryX.executeAction("CLICK", tuple())
- primaryY.executeAction("CLICK", tuple())
- secondaryX.executeAction("CLICK", tuple())
- secondaryY.executeAction("CLICK", tuple())
-
-
- #reopen and verify Grids dialog
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object
1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "InsertMenuGrids"})) as xDialog:
-
- primaryX = xDialog.getChild("primaryX")
- primaryY = xDialog.getChild("primaryY")
- secondaryX = xDialog.getChild("secondaryX")
- secondaryY = xDialog.getChild("secondaryY")
-
- self.assertEqual(get_state_as_dict(primaryX)["Selected"], "true")
- self.assertEqual(get_state_as_dict(primaryY)["Selected"], "true")
- self.assertEqual(get_state_as_dict(secondaryX)["Selected"], "true")
- self.assertEqual(get_state_as_dict(secondaryY)["Selected"], "true")
+ def test_chart_enable_grids_dialog(self):
+ with self.ui_test.load_file(get_url_for_data_file("chart.ods")):
+ xCalcDoc = self.xUITest.getTopFocusWindow()
+ gridwin = xCalcDoc.getChild("grid_window")
+
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "InsertMenuGrids"})) as xDialog:
+
+ primaryX = xDialog.getChild("primaryX")
+ primaryY = xDialog.getChild("primaryY")
+ secondaryX = xDialog.getChild("secondaryX")
+ secondaryY = xDialog.getChild("secondaryY")
+
+ primaryX.executeAction("CLICK", tuple())
+ primaryY.executeAction("CLICK", tuple())
+ secondaryX.executeAction("CLICK", tuple())
+ secondaryY.executeAction("CLICK", tuple())
+
+
+ #reopen and verify Grids dialog
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "InsertMenuGrids"})) as xDialog:
+
+ primaryX = xDialog.getChild("primaryX")
+ primaryY = xDialog.getChild("primaryY")
+ secondaryX = xDialog.getChild("secondaryX")
+ secondaryY = xDialog.getChild("secondaryY")
+
+ self.assertEqual(get_state_as_dict(primaryX)["Selected"],
"false")
+ self.assertEqual(get_state_as_dict(primaryY)["Selected"],
"false")
+ self.assertEqual(get_state_as_dict(secondaryX)["Selected"],
"false")
+ self.assertEqual(get_state_as_dict(secondaryY)["Selected"],
"false")
+
+ primaryX.executeAction("CLICK", tuple())
+ primaryY.executeAction("CLICK", tuple())
+ secondaryX.executeAction("CLICK", tuple())
+ secondaryY.executeAction("CLICK", tuple())
+
+
+ #reopen and verify Grids dialog
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT":
"Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "InsertMenuGrids"})) as xDialog:
+
+ primaryX = xDialog.getChild("primaryX")
+ primaryY = xDialog.getChild("primaryY")
+ secondaryX = xDialog.getChild("secondaryX")
+ secondaryY = xDialog.getChild("secondaryY")
+
+ self.assertEqual(get_state_as_dict(primaryX)["Selected"],
"true")
+ self.assertEqual(get_state_as_dict(primaryY)["Selected"],
"true")
+ self.assertEqual(get_state_as_dict(secondaryX)["Selected"],
"true")
+ self.assertEqual(get_state_as_dict(secondaryY)["Selected"],
"true")
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/chart/chartLegend.py
b/sc/qa/uitest/chart/chartLegend.py
index 7294331f489e..ac1b722c7adb 100644
--- a/sc/qa/uitest/chart/chartLegend.py
+++ b/sc/qa/uitest/chart/chartLegend.py
@@ -15,66 +15,8 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
# Chart Display Legend dialog
class chartLegend(UITestCase):
- def test_chart_display_legend_dialog(self):
- with self.ui_test.load_file(get_url_for_data_file("chart.ods")):
- xCalcDoc = self.xUITest.getTopFocusWindow()
- gridwin = xCalcDoc.getChild("grid_window")
-
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "InsertMenuLegend"})) as xDialog:
- left = xDialog.getChild("left")
-
- left.executeAction("CLICK", tuple())
-
- #reopen and verify InsertMenuLegend dialog
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "InsertMenuLegend"})) as xDialog:
- left = xDialog.getChild("left")
- right = xDialog.getChild("right")
- top = xDialog.getChild("top")
- bottom = xDialog.getChild("bottom")
- show = xDialog.getChild("show")
-
- self.assertEqual(get_state_as_dict(left)["Checked"], "true")
- self.assertEqual(get_state_as_dict(right)["Checked"], "false")
- self.assertEqual(get_state_as_dict(top)["Checked"], "false")
- self.assertEqual(get_state_as_dict(bottom)["Checked"], "false")
-
- show.executeAction("CLICK", tuple())
-
- #reopen and verify InsertMenuLegend dialog
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
- gridwin.executeAction("ACTIVATE", tuple())
- xChartMainTop = self.xUITest.getTopFocusWindow()
- xChartMain = xChartMainTop.getChild("chart_window")
- xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
- with self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "InsertMenuLegend"})) as xDialog:
- left = xDialog.getChild("left")
- right = xDialog.getChild("right")
- top = xDialog.getChild("top")
- bottom = xDialog.getChild("bottom")
- show = xDialog.getChild("show")
-
- self.assertEqual(get_state_as_dict(left)["Checked"], "true")
- self.assertEqual(get_state_as_dict(right)["Checked"], "false")
- self.assertEqual(get_state_as_dict(top)["Checked"], "false")
- self.assertEqual(get_state_as_dict(bottom)["Checked"], "false")
-
- self.assertEqual(get_state_as_dict(show)["Selected"], "false")
-
- def test_legends_move_with_arrows_keys(self):
-
- with self.ui_test.load_file(get_url_for_data_file("dataLabels.ods")):
-
- with change_measurement_unit(self, "Centimeter"):
+ def test_chart_display_legend_dialog(self):
+ with self.ui_test.load_file(get_url_for_data_file("chart.ods")):
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
@@ -82,44 +24,102 @@ class chartLegend(UITestCase):
gridwin.executeAction("ACTIVATE", tuple())
xChartMainTop = self.xUITest.getTopFocusWindow()
xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ with self.ui_test.execute_dialog_through_action(xSeriesObj,
"COMMAND", mkPropertyValues({"COMMAND": "InsertMenuLegend"})) as xDialog:
+ left = xDialog.getChild("left")
- # Select the legends
- xLegends = xChartMain.getChild("CID/D=0:Legend=")
- xLegends.executeAction("SELECT", tuple())
+ left.executeAction("CLICK", tuple())
+
+ #reopen and verify InsertMenuLegend dialog
-e
... etc. - the rest is truncated
