chart2/qa/extras/uichart.cxx | 38 +++++++++++++++++++++++++++++++++++++
sc/qa/uitest/chart/tdf98690.py | 42 -----------------------------------------
2 files changed, 38 insertions(+), 42 deletions(-)
New commits:
commit 0e5d89a149e86975e103270a0ff4e65776ff8f85
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Dec 12 17:27:12 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Dec 12 21:54:27 2022 +0000
tdf#98690: move UItest to CppUnittest
Change-Id: Icb1ccc4b3d5fc16264d7700201d3884cc935e5ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144004
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/qa/uitest/data/tdf98690.xlsx
b/chart2/qa/extras/data/xlsx/tdf98690.xlsx
similarity index 100%
rename from sc/qa/uitest/data/tdf98690.xlsx
rename to chart2/qa/extras/data/xlsx/tdf98690.xlsx
diff --git a/chart2/qa/extras/uichart.cxx b/chart2/qa/extras/uichart.cxx
index ec250f80bb27..877ea0ffac1e 100644
--- a/chart2/qa/extras/uichart.cxx
+++ b/chart2/qa/extras/uichart.cxx
@@ -201,6 +201,44 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf62057)
testCopyPasteToNewSheet(xChartDoc, "Object 1", 2, 6);
}
+CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf98690)
+{
+ loadFromURL(u"xlsx/tdf98690.xlsx");
+ uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0,
0, mxComponent),
+ uno::UNO_QUERY_THROW);
+
+ CPPUNIT_ASSERT(xChartDoc.is());
+ uno::Reference<chart::XChartDataArray> xChartData(xChartDoc->getData(),
uno::UNO_QUERY_THROW);
+ uno::Sequence<OUString> aSeriesList = xChartData->getColumnDescriptions();
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(6), aSeriesList.getLength());
+
+ uno::Sequence<beans::PropertyValue> aPropertyValues = {
+ comphelper::makePropertyValue("ToObject", OUString("Chart 2")),
+ };
+ dispatchCommand(mxComponent, ".uno:GoToObject", aPropertyValues);
+ Scheduler::ProcessEventsToIdle();
+
+ dispatchCommand(mxComponent, ".uno:Copy", {});
+ Scheduler::ProcessEventsToIdle();
+
+ // create a new document
+ load("private:factory/scalc");
+
+ dispatchCommand(mxComponent, ".uno:Paste", {});
+ Scheduler::ProcessEventsToIdle();
+
+ uno::Reference<chart::XChartDocument> xChartDoc2(getChartCompFromSheet(0,
0, mxComponent),
+ uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT(xChartDoc2.is());
+ uno::Reference<chart::XChartDataArray> xChartData2(xChartDoc2->getData(),
uno::UNO_QUERY_THROW);
+ uno::Sequence<OUString> aSeriesList2 =
xChartData2->getColumnDescriptions();
+
+ // Without the fix in place, this test would have failed with
+ // - Expected: 12
+ // - Actual : 0
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(12), aSeriesList2.getLength());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/uitest/chart/tdf98690.py b/sc/qa/uitest/chart/tdf98690.py
deleted file mode 100644
index 8cd6b82c0359..000000000000
--- a/sc/qa/uitest/chart/tdf98690.py
+++ /dev/null
@@ -1,42 +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 uitest.uihelper.common import get_url_for_data_file
-
-class tdf98690(UITestCase):
-
- def test_tdf98690(self):
- with self.ui_test.load_file(get_url_for_data_file("tdf98690.xlsx")):
- xCalcDoc = self.xUITest.getTopFocusWindow()
- gridwin = xCalcDoc.getChild("grid_window")
-
- gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Chart
2"}))
-
- self.xUITest.executeCommand(".uno:Copy")
-
- with self.ui_test.load_empty_file("calc") as calc_document:
- xCalcDoc = self.xUITest.getTopFocusWindow()
- gridwin = xCalcDoc.getChild("grid_window")
-
- self.xUITest.executeCommand(".uno:Paste")
-
- xData = calc_document.Sheets[0].Charts[0].getEmbeddedObject().Data
-
- aExpectedRowDescriptions = tuple(str(i) for i in range(1, 14))
- aExpectedColumnDescriptions = ('Column D Column D', 'cc_girder2',
'Column S Column S',
- 'Column S Column S', 'Column D Column D', 'clexrfdon', 'Column
S Column S',
- 'Column S Column S', 'Column D', 'clexrfdoff', 'Column S
Column S', 'Column S Column S')
-
- # Without the fix in place, this test would have failed here,
- # since the pasted chart wouldn't have had any data
- self.assertEqual(aExpectedRowDescriptions, xData.RowDescriptions)
- self.assertEqual(aExpectedColumnDescriptions, xData.ColumnDescriptions)
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
