diff options
| -rw-r--r-- | chart2/qa/extras/data/ods/tdf62057.ods (renamed from sc/qa/uitest/data/tdf62057.ods) | bin | 16852 -> 16852 bytes | |||
| -rw-r--r-- | chart2/qa/extras/uichart.cxx | 13 | ||||
| -rw-r--r-- | sc/qa/uitest/chart/tdf62057.py | 56 |
3 files changed, 13 insertions, 56 deletions
diff --git a/sc/qa/uitest/data/tdf62057.ods b/chart2/qa/extras/data/ods/tdf62057.ods Binary files differindex 3945c41d0318..3945c41d0318 100644 --- a/sc/qa/uitest/data/tdf62057.ods +++ b/chart2/qa/extras/data/ods/tdf62057.ods diff --git a/chart2/qa/extras/uichart.cxx b/chart2/qa/extras/uichart.cxx index 391d5012a1b7..ec250f80bb27 100644 --- a/chart2/qa/extras/uichart.cxx +++ b/chart2/qa/extras/uichart.cxx @@ -188,6 +188,19 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf136011) testCopyPasteToNewSheet(xChartDoc2, "Object 2", 3, 9); } +CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf62057) +{ + loadFromURL(u"ods/tdf62057.ods"); + uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0, mxComponent), + uno::UNO_QUERY_THROW); + + // Without the fix in place, this test would have failed with + // - Expected: 2 + // - Actual : 7 + // - Incorrect number of columns in destination file + testCopyPasteToNewSheet(xChartDoc, "Object 1", 2, 6); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/uitest/chart/tdf62057.py b/sc/qa/uitest/chart/tdf62057.py deleted file mode 100644 index b11dd1c5dd92..000000000000 --- a/sc/qa/uitest/chart/tdf62057.py +++ /dev/null @@ -1,56 +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.calc.document import get_cell_by_position -from libreoffice.uno.propertyvalue import mkPropertyValues -from uitest.uihelper.common import get_url_for_data_file - -class tdf62057(UITestCase): - - def test_tdf62057(self): - with self.ui_test.load_file(get_url_for_data_file("tdf62057.ods")) as calc_doc: - xCalcDoc = self.xUITest.getTopFocusWindow() - gridwin = xCalcDoc.getChild("grid_window") - - - xDataMatrix = [] - for column in range(1, 3): - xColumn = [] - for row in range(0, 6): - xColumn.append(round(get_cell_by_position(calc_doc, 0, column, row).getValue(), 5)) - xDataMatrix.append(xColumn) - - xRowDescriptions = [] - for row in range(0, 6): - xRowDescriptions.append(get_cell_by_position(calc_doc, 0, 0, row).getString()) - - gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"})) - - 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 - - xNewDataMatrix = [] - xNewDataMatrix.append([round(item[0], 5) for item in xData.Data]) - xNewDataMatrix.append([round(item[1], 5) for item in xData.Data]) - - # Without the fix in place, this test would have failed with - # AssertionError: Lists differ: ['10m', '11v', '12m', '13m', '14m', '15v'] != ['55.3796', '35.0989'] - self.assertEqual(xRowDescriptions, list(xData.RowDescriptions)) - - self.assertEqual(xDataMatrix, xNewDataMatrix) - -# vim: set shiftwidth=4 softtabstop=4 expandtab: |