[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/qa

[Jan-Marek Glogowski (via logerrit)]

 sc/qa/uitest/options/tdf122977.py |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit c6af095d03cad9969d3a207fde2370d578b05e12
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sun Feb 16 18:51:07 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 11 09:22:30 2020 +0200

    Fix UITest_options: changed property name
    
    Seems the color widget was changed into a tree at some point, so
    the entry amount is now in "Children" instead of "EntryCount".
    
    Change-Id: Ief6e6d0ebc4a6571a7f7e978b838eb49b2e051cf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88831
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96082
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sc/qa/uitest/options/tdf122977.py b/sc/qa/uitest/options/tdf122977.py
index ee8d4ff3b4c1..11d0ff98888c 100644
--- a/sc/qa/uitest/options/tdf122977.py
+++ b/sc/qa/uitest/options/tdf122977.py
@@ -19,6 +19,7 @@ class chartDefaultColors(UITestCase):
         xCalcDoc = self.xUITest.getTopFocusWindow()
         gridwin = xCalcDoc.getChild("grid_window")
         document = self.ui_test.get_component()
+
         #Go to Tools -> Options -> Charts -> Default Colors
         self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")  #optionsdialog
         xDialogOpt = self.xUITest.getTopFocusWindow()
@@ -32,12 +33,14 @@ class chartDefaultColors(UITestCase):
         xAdd = xDialogOpt.getChild("add")
         xDelete = xDialogOpt.getChild("delete")
         xDefault = xDialogOpt.getChild("default")
+
         #click Default - reset
         xDefault.executeAction("CLICK", tuple())
-        nrDefaultColors = get_state_as_dict(xColors)["EntryCount"]
+        nrDefaultColors = get_state_as_dict(xColors)["Children"]
         nrDefaultColors1 = int(nrDefaultColors) + 1
         xAdd.executeAction("CLICK", tuple())    #add new color
-        self.assertEqual(get_state_as_dict(xColors)["EntryCount"], str(nrDefaultColors1))
+        self.assertEqual(get_state_as_dict(xColors)["Children"], str(nrDefaultColors1))
+
         #delete new color
         def handle_delete_dlg(dialog):
             xyesBtn = dialog.getChild("yes")
@@ -45,13 +48,13 @@ class chartDefaultColors(UITestCase):
 
         self.ui_test.execute_blocking_action(xDelete.executeAction, args=('CLICK', ()),
                 dialog_handler=handle_delete_dlg)
-        self.assertEqual(get_state_as_dict(xColors)["EntryCount"], nrDefaultColors)
+        self.assertEqual(get_state_as_dict(xColors)["Children"], nrDefaultColors)
 
         xAdd.executeAction("CLICK", tuple())    #add new color
-        self.assertEqual(get_state_as_dict(xColors)["EntryCount"], str(nrDefaultColors1))
+        self.assertEqual(get_state_as_dict(xColors)["Children"], str(nrDefaultColors1))
         #click Default
         xDefault.executeAction("CLICK", tuple())
-        self.assertEqual(get_state_as_dict(xColors)["EntryCount"], nrDefaultColors)
+        self.assertEqual(get_state_as_dict(xColors)["Children"], nrDefaultColors)
 
         xCancelBtn = xDialogOpt.getChild("cancel")
         self.ui_test.close_dialog_through_button(xCancelBtn)