diff options
Diffstat (limited to 'cui/qa/uitest/dialogs')
| -rw-r--r-- | cui/qa/uitest/dialogs/chardlg.py | 21 | ||||
| -rw-r--r-- | cui/qa/uitest/dialogs/macroselectordlg.py | 44 | ||||
| -rw-r--r-- | cui/qa/uitest/dialogs/shortcuts.py | 1 |
3 files changed, 54 insertions, 12 deletions
diff --git a/cui/qa/uitest/dialogs/chardlg.py b/cui/qa/uitest/dialogs/chardlg.py index 21a1582567a0..686cb6472ac8 100644 --- a/cui/qa/uitest/dialogs/chardlg.py +++ b/cui/qa/uitest/dialogs/chardlg.py @@ -35,8 +35,8 @@ class Test(UITestCase): xFontTransparency.executeAction("UP", tuple()) # Verify the result. - drawPage = component.getDrawPages().getByIndex(0) - shape = drawPage.getByIndex(0) + drawPage = component.getDrawPages()[0] + shape = drawPage[0] # Without the accompanying fix in place, this test would have failed with: # AssertionError: 100 != 5 @@ -54,7 +54,7 @@ class Test(UITestCase): editWin = doc.getChild("impress_win") # Set theme colors. - drawPage = component.getDrawPages().getByIndex(0) + drawPage = component.getDrawPages()[0] master = drawPage.MasterPage theme = mkPropertyValues({ "Name": "nameA", @@ -74,7 +74,7 @@ class Test(UITestCase): 0x000000, # folHlink ]) }) - master.Theme = theme + master.ThemeUnoRepresentation = theme # Select the title shape. editWin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"})) @@ -98,25 +98,25 @@ class Test(UITestCase): colorSet.executeAction("CHOOSE", mkPropertyValues({"POS": "16"})) # Then make sure the doc model has the correct color theme index: - drawPage = component.getDrawPages().getByIndex(0) - shape = drawPage.getByIndex(0) + drawPage = component.getDrawPages()[0] + shape = drawPage[0] paragraphs = shape.createEnumeration() paragraph = paragraphs.nextElement() portions = paragraph.createEnumeration() portion = portions.nextElement() # Without the accompanying fix in place, this test would have failed with: - # AssertionError: -1 != 4 + # AssertionError: -1 != 3 # i.e. no theme index was set, instead of accent1 (index into the above color scheme). - self.assertEqual(portion.CharColorTheme, 4) + self.assertEqual(portion.CharColorTheme, 3) # Then make sure that '80% lighter' is lum-mod=2000 and lum-off=8000: # Without the accompanying fix in place, this test would have failed with: # AssertionError: 10000 != 2000 # i.e. the effects where not applied, luminance modulation was the default instead of a # custom value. - self.assertEqual(portion.CharColorLumMod, 2000) - self.assertEqual(portion.CharColorLumOff, 8000) + self.assertEqual(portion.CharColorLumMod, 5000) + self.assertEqual(portion.CharColorLumOff, 5000) def testSvxCharEffectsPageWriter(self): # Start Writer. @@ -150,7 +150,6 @@ class Test(UITestCase): # Start Writer. with self.ui_test.create_doc_in_start_center("writer"): doc = self.xUITest.getTopFocusWindow() - editWin = doc.getChild("writer_edit") # Use Format -> Character. with self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog: diff --git a/cui/qa/uitest/dialogs/macroselectordlg.py b/cui/qa/uitest/dialogs/macroselectordlg.py new file mode 100644 index 000000000000..96ba11a2d888 --- /dev/null +++ b/cui/qa/uitest/dialogs/macroselectordlg.py @@ -0,0 +1,44 @@ +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +from uitest.framework import UITestCase +from uitest.uihelper.common import get_state_as_dict + +class tdf145978(UITestCase): + def test_tdf145978(self): + with self.ui_test.execute_dialog_through_command(".uno:RunMacro") as xDialog: + xCategoriesTree = xDialog.getChild("categories") + xCategoriesTreeEntry = xCategoriesTree.getChild('1') #Application Macros + xCategoriesTreeEntry.executeAction("EXPAND", tuple()) + + xSubCategoriesTreeEntry = None + for i in xCategoriesTreeEntry.getChildren(): + xChild = xCategoriesTreeEntry.getChild(i) + if get_state_as_dict(xChild)["Text"] == "HelloWorld": + xSubCategoriesTreeEntry = xChild + break + + xSubCategoriesTreeEntry.executeAction("SELECT", tuple()) + + xCommandsTree = xDialog.getChild("commands") + + xCommandsTreeEntry = None + for i in xCommandsTree.getChildren(): + xChild = xCommandsTree.getChild(i) + if get_state_as_dict(xChild)["Text"] == "HelloWorldPython": + xCommandsTreeEntry = xChild + break + + xCommandsTreeEntry.executeAction("SELECT", tuple()) + + #Verify the dialog reloads with previous run macro selected + with self.ui_test.execute_dialog_through_command(".uno:RunMacro") as xDialog: + xTree = xDialog.getChild("categories") + self.assertEqual("HelloWorld", get_state_as_dict(xTree)["SelectEntryText"]) + xTree = xDialog.getChild("commands") + self.assertEqual("HelloWorldPython", get_state_as_dict(xTree)["SelectEntryText"]) + +# vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/cui/qa/uitest/dialogs/shortcuts.py b/cui/qa/uitest/dialogs/shortcuts.py index 99d2bd1ccedc..ac8a0a791496 100644 --- a/cui/qa/uitest/dialogs/shortcuts.py +++ b/cui/qa/uitest/dialogs/shortcuts.py @@ -15,7 +15,6 @@ class Test(UITestCase): def test_tab_navigation(self): with self.ui_test.create_doc_in_start_center("writer"): xWriterDoc = self.xUITest.getTopFocusWindow() - xWriterEdit = xWriterDoc.getChild("writer_edit") with self.ui_test.execute_dialog_through_command(".uno:EditStyle") as xDialog: |