sc/qa/uitest/calc_tests7/tdf125030.py | 33 ---------------------------------
sc/qa/unit/uicalc/uicalc2.cxx | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 33 deletions(-)
New commits:
commit b97a4df392ef03c6cbe23f7703fd4f55827ee71d
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jan 10 10:03:09 2024 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jan 10 11:40:19 2024 +0100
tdf#125030: sc: move UItest to CppUnittest
Change-Id: If5bb88a7c20e094332a687978662b9a93edb18bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161876
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/qa/uitest/calc_tests7/tdf125030.py
b/sc/qa/uitest/calc_tests7/tdf125030.py
deleted file mode 100644
index cc49edd210c9..000000000000
--- a/sc/qa/uitest/calc_tests7/tdf125030.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
-#
-# This file is part of the LibreOffice project.
-#
-# 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 libreoffice.uno.propertyvalue import mkPropertyValues
-from libreoffice.calc.document import get_cell_by_position
-from uitest.uihelper.calc import enter_text_to_cell
-
-#Bug 125030 - nice crash by repeating apply style (Ctrl+Shft+Y)
-
-class tdf125030(UITestCase):
- def test_tdf125030_repeat_crash(self):
- with self.ui_test.create_doc_in_start_center("calc") as document:
- xCalcDoc = self.xUITest.getTopFocusWindow()
- gridwin = xCalcDoc.getChild("grid_window")
- #enter data
- enter_text_to_cell(gridwin, "A1", "aaaa")
- enter_text_to_cell(gridwin, "B1", "bbbb")
- #select A1
- gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
-
self.xUITest.executeCommand(".uno:StyleApply?Style:string=Heading%201&FamilyName:string=CellStyles")
- #focus on A2
- gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A2"}))
- #repeat (Ctrl+Shft+Y)
- self.xUITest.executeCommand(".uno:Repeat")
- self.assertEqual(get_cell_by_position(document, 0, 0,
0).getString(), "aaaa")
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/unit/uicalc/uicalc2.cxx b/sc/qa/unit/uicalc/uicalc2.cxx
index a488749e9835..af1ff870e8a1 100644
--- a/sc/qa/unit/uicalc/uicalc2.cxx
+++ b/sc/qa/unit/uicalc/uicalc2.cxx
@@ -112,6 +112,29 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest2, testTdf158254)
CPPUNIT_ASSERT_EQUAL(OUString("Default"), pStyleSheet->GetName());
}
+CPPUNIT_TEST_FIXTURE(ScUiCalcTest2, testTdf125030)
+{
+ createScDoc();
+ ScDocument* pDoc = getScDoc();
+
+ goToCell("A1");
+ dispatchCommand(mxComponent,
+
".uno:StyleApply?Style:string=Accent%201&FamilyName:string=CellStyles", {});
+
+ const ScPatternAttr* pPatternA1 = pDoc->GetPattern(0, 0, 0);
+ ScStyleSheet* pStyleSheetA1 =
const_cast<ScStyleSheet*>(pPatternA1->GetStyleSheet());
+
+ CPPUNIT_ASSERT_EQUAL(OUString("Accent 1"), pStyleSheetA1->GetName());
+
+ goToCell("A2");
+ dispatchCommand(mxComponent, ".uno:Repeat", {});
+
+ const ScPatternAttr* pPatternA2 = pDoc->GetPattern(0, 1, 0);
+ ScStyleSheet* pStyleSheetA2 =
const_cast<ScStyleSheet*>(pPatternA2->GetStyleSheet());
+
+ CPPUNIT_ASSERT_EQUAL(OUString("Accent 1"), pStyleSheetA2->GetName());
+}
+
CPPUNIT_TEST_FIXTURE(ScUiCalcTest2, testTdf133326)
{
createScDoc("tdf133326.ods");
