[Libreoffice-commits] core.git: sd/qa sd/source

[Xisco Fauli (via logerrit)]

 sd/qa/uitest/impress_tests/moveSlides.py |   77 +++++++++++++++++++++++++++++++
 sd/source/ui/uitest/uiobject.cxx         |    1 
 2 files changed, 78 insertions(+)

New commits:
commit 9aab76d2d1311d85fefa0ff7ad910a3e162bee10
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Sun Jan 31 19:17:56 2021 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Sun Jan 31 20:26:26 2021 +0100

    uitest: sd: Add UItest for move pages
    
    Change-Id: If15bdff99251f050f8183289819510e866bec9b4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110210
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sd/qa/uitest/impress_tests/moveSlides.py b/sd/qa/uitest/impress_tests/moveSlides.py
new file mode 100644
index 000000000000..fa89253af2ce
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/moveSlides.py
@@ -0,0 +1,77 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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, get_url_for_data_file, type_text
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+class moveSlides(UITestCase):
+
+    def renameSlide(self, editWin, currentPos):
+        self.assertEqual(currentPos, get_state_as_dict(editWin)['CurrentSlide'])
+        self.assertEqual("Slide " + currentPos, get_state_as_dict(editWin)['CurrentSlideName'])
+
+        self.ui_test.execute_dialog_through_command(".uno:RenamePage")
+        xDialog = self.xUITest.getTopFocusWindow()
+
+        name_entry = xDialog.getChild("name_entry")
+        name_entry.executeAction("TYPE", mkPropertyValues({"TEXT": "Test " + currentPos}))
+
+        xOKBtn = xDialog.getChild("ok")
+        self.ui_test.close_dialog_through_button(xOKBtn)
+
+        self.assertEqual(currentPos, get_state_as_dict(editWin)['CurrentSlide'])
+        self.assertEqual("Test " + currentPos, get_state_as_dict(editWin)['CurrentSlideName'])
+
+    def test_moveSlides(self):
+
+        self.ui_test.create_doc_in_start_center("impress")
+
+        xTemplateDlg = self.xUITest.getTopFocusWindow()
+        xCancelBtn = xTemplateDlg.getChild("close")
+        self.ui_test.close_dialog_through_button(xCancelBtn)
+
+        xImpress = self.xUITest.getTopFocusWindow()
+        xEditWin = xImpress.getChild("impress_win")
+
+        self.renameSlide(xEditWin, '1')
+
+        for i in range(2):
+            self.xUITest.executeCommand(".uno:InsertPage")
+
+            self.renameSlide(xEditWin, str(i + 2))
+
+        # Move slide 'Test 3' up
+        for i in range(2, 0, -1):
+            self.xUITest.executeCommand(".uno:MovePageUp")
+
+            self.assertEqual(str(i), get_state_as_dict(xEditWin)['CurrentSlide'])
+            self.assertEqual("Test 3", get_state_as_dict(xEditWin)['CurrentSlideName'])
+
+        # Move slide 'Test 3' down
+        for i in range(2, 4, 1):
+            self.xUITest.executeCommand(".uno:MovePageDown")
+
+            self.assertEqual(str(i), get_state_as_dict(xEditWin)['CurrentSlide'])
+            self.assertEqual("Test 3", get_state_as_dict(xEditWin)['CurrentSlideName'])
+
+        # Move slide 'Test 3' to the top
+        self.xUITest.executeCommand(".uno:MovePageFirst")
+
+        self.assertEqual('1', get_state_as_dict(xEditWin)['CurrentSlide'])
+        self.assertEqual("Test 3", get_state_as_dict(xEditWin)['CurrentSlideName'])
+
+        # Move slide 'Test 3' to the bottom
+        self.xUITest.executeCommand(".uno:MovePageLast")
+
+        self.assertEqual('3', get_state_as_dict(xEditWin)['CurrentSlide'])
+        self.assertEqual("Test 3", get_state_as_dict(xEditWin)['CurrentSlideName'])
+
+        self.ui_test.close_doc()
+
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sd/source/ui/uitest/uiobject.cxx b/sd/source/ui/uitest/uiobject.cxx
index 87e9a137fcaa..d5acbc42963f 100644
--- a/sd/source/ui/uitest/uiobject.cxx
+++ b/sd/source/ui/uitest/uiobject.cxx
@@ -86,6 +86,7 @@ StringMap ImpressWindowUIObject::get_state()
 
     aMap["SelectedText"] = getViewShell(mxWindow)->GetSelectionText(false);
     aMap["CurrentSlide"] = OUString::number(getViewShell(mxWindow)->GetCurPagePos() + 1);
+    aMap["CurrentSlideName"] = getViewShell(mxWindow)->GetActualPage()->GetName();
     aMap["Zoom"] = OUString::number(getViewShell(mxWindow)->GetZoom());
 
     return aMap;