summaryrefslogtreecommitdiff
path: root/chart2/qa/extras/xshape/chart2xshape.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/qa/extras/xshape/chart2xshape.cxx')
-rw-r--r--chart2/qa/extras/xshape/chart2xshape.cxx200
1 files changed, 140 insertions, 60 deletions
diff --git a/chart2/qa/extras/xshape/chart2xshape.cxx b/chart2/qa/extras/xshape/chart2xshape.cxx
index 18141a9ede88..b968a29c8940 100644
--- a/chart2/qa/extras/xshape/chart2xshape.cxx
+++ b/chart2/qa/extras/xshape/chart2xshape.cxx
@@ -21,54 +21,71 @@
class Chart2XShapeTest : public ChartTest
{
public:
+ Chart2XShapeTest()
+ : ChartTest("/chart2/qa/extras/xshape/data/")
+ {
+ }
+
+ void testTdf150832();
+ void testTdf149204();
+ void testTdf151424();
void testFdo75075();
void testPropertyMappingBarChart();
void testPieChartLabels1();
void testPieChartLabels2();
void testPieChartLabels3();
void testPieChartLabels4();
+ void testChart();
void testTdf76649TrendLineBug();
void testTdf88154LabelRotatedLayout();
CPPUNIT_TEST_SUITE(Chart2XShapeTest);
+ CPPUNIT_TEST(testTdf150832);
+ CPPUNIT_TEST(testTdf149204);
+ CPPUNIT_TEST(testTdf151424);
CPPUNIT_TEST(testFdo75075);
CPPUNIT_TEST(testPropertyMappingBarChart);
CPPUNIT_TEST(testPieChartLabels1);
CPPUNIT_TEST(testPieChartLabels2);
CPPUNIT_TEST(testPieChartLabels3);
CPPUNIT_TEST(testPieChartLabels4);
+ CPPUNIT_TEST(testChart);
CPPUNIT_TEST(testTdf76649TrendLineBug);
CPPUNIT_TEST(testTdf88154LabelRotatedLayout);
CPPUNIT_TEST_SUITE_END();
private:
- void compareAgainstReference(std::u16string_view rReferenceFile);
+ void compareAgainstReference(std::u16string_view rDump, std::u16string_view rReferenceFile);
OUString getXShapeDumpString();
xmlDocUniquePtr getXShapeDumpXmlDoc();
};
namespace
{
-bool checkDumpAgainstFile(const OUString& rDump, std::u16string_view aFilePath,
+OUString getShapeDump(css::uno::Reference<css::chart::XChartDocument> const& doc)
+{
+ return css::uno::Reference<css::qa::XDumper>(doc, css::uno::UNO_QUERY_THROW)->dump("shapes");
+}
+
+bool checkDumpAgainstFile(std::u16string_view rDump, std::u16string_view aFilePath,
char const* toleranceFile)
{
OString aOFile = OUStringToOString(aFilePath, RTL_TEXTENCODING_UTF8);
- CPPUNIT_ASSERT_MESSAGE("dump is empty", !rDump.isEmpty());
+ CPPUNIT_ASSERT_MESSAGE("dump is empty", !rDump.empty());
OString aDump = OUStringToOString(rDump, RTL_TEXTENCODING_UTF8);
- return doXMLDiff(aOFile.getStr(), aDump.getStr(), static_cast<int>(rDump.getLength()),
+ return doXMLDiff(aOFile.getStr(), aDump.getStr(), static_cast<int>(rDump.size()),
toleranceFile);
}
}
OUString Chart2XShapeTest::getXShapeDumpString()
{
- uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, mxComponent),
+ uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0, mxComponent),
UNO_QUERY_THROW);
- uno::Reference<qa::XDumper> xDumper(xChartDoc, UNO_QUERY_THROW);
- return xDumper->dump();
+ return getShapeDump(xChartDoc);
}
xmlDocUniquePtr Chart2XShapeTest::getXShapeDumpXmlDoc()
@@ -78,33 +95,86 @@ xmlDocUniquePtr Chart2XShapeTest::getXShapeDumpXmlDoc()
return xmlDocUniquePtr(xmlParseDoc(reinterpret_cast<const xmlChar*>(aXmlDump.getStr())));
}
-void Chart2XShapeTest::compareAgainstReference(std::u16string_view rReferenceFile)
+void Chart2XShapeTest::compareAgainstReference(std::u16string_view rDump,
+ std::u16string_view rReferenceFile)
{
checkDumpAgainstFile(
- getXShapeDumpString(),
- OUStringConcatenation(
- m_directories.getPathFromSrc(u"/chart2/qa/extras/xshape/data/reference/")
- + rReferenceFile),
+ rDump,
+ Concat2View(m_directories.getPathFromSrc(u"/chart2/qa/extras/xshape/data/reference/")
+ + rReferenceFile),
OUStringToOString(
m_directories.getPathFromSrc(u"/chart2/qa/extras/xshape/data/reference/tolerance.xml"),
RTL_TEXTENCODING_UTF8)
.getStr());
}
+void Chart2XShapeTest::testTdf150832()
+{
+ // FIXME: the DPI check should be removed when either (1) the test is fixed to work with
+ // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin.
+ if (!IsDefaultDPI())
+ return;
+
+ // Without the fix in place, this test would have failed with
+ // - Expected: 319
+ // - Actual : 0
+ loadFromFile(u"xls/tdf150832.xls");
+ compareAgainstReference(getXShapeDumpString(), u"tdf150832.xml");
+}
+
+void Chart2XShapeTest::testTdf149204()
+{
+ // FIXME: the DPI check should be removed when either (1) the test is fixed to work with
+ // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin.
+ if (!IsDefaultDPI())
+ return;
+
+ // Without the fix in place, this test would have failed with
+ // - Expected: 12230
+ // - Actual : 12940
+ // - Node: /XShapes/XShape[2]
+ // - Attr: sizeX
+ loadFromFile(u"pptx/tdf149204.pptx");
+ uno::Reference<chart::XChartDocument> xChartDoc = getChartDocFromDrawImpress(0, 0);
+ compareAgainstReference(getShapeDump(xChartDoc), u"tdf149204.xml");
+}
+
+void Chart2XShapeTest::testTdf151424()
+{
+ // FIXME: the DPI check should be removed when either (1) the test is fixed to work with
+ // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin.
+ if (!IsDefaultDPI())
+ return;
+
+ // Without the fix in place, this test would have failed with
+ // - Expected: 3717
+ // - Actual : 3530
+ // - Node: /XShapes/XShape[2]/XShapes/XShape[1]
+ // - Attr: positionX
+ loadFromFile(u"ods/tdf151424.ods");
+ compareAgainstReference(getXShapeDumpString(), u"tdf151424.xml");
+}
+
void Chart2XShapeTest::testFdo75075()
{
-#if 0
- load("chart2/qa/extras/xshape/data/ods/", "fdo75075.ods");
- compareAgainstReference("fdo75075.xml");
-#endif
+ // FIXME: the DPI check should be removed when either (1) the test is fixed to work with
+ // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin.
+ if (!IsDefaultDPI())
+ return;
+
+ loadFromFile(u"ods/fdo75075.ods");
+ compareAgainstReference(getXShapeDumpString(), u"fdo75075.xml");
}
void Chart2XShapeTest::testPropertyMappingBarChart()
{
-#if 0
- load("chart2/qa/extras/xshape/data/ods/", "property-mapping-bar.ods");
- compareAgainstReference("property-mapping-bar.xml");
-#endif
+ // FIXME: the DPI check should be removed when either (1) the test is fixed to work with
+ // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin.
+ if (!IsDefaultDPI())
+ return;
+
+ loadFromFile(u"ods/property-mapping-bar.ods");
+ compareAgainstReference(getXShapeDumpString(), u"property-mapping-bar.xml");
}
void Chart2XShapeTest::testPieChartLabels1()
@@ -115,8 +185,8 @@ void Chart2XShapeTest::testPieChartLabels1()
return;
// inside placement for the best fit case
- load(u"chart2/qa/extras/xshape/data/xlsx/", "tdf90839-1.xlsx");
- compareAgainstReference(u"tdf90839-1.xml");
+ loadFromFile(u"xlsx/tdf90839-1.xlsx");
+ compareAgainstReference(getXShapeDumpString(), u"tdf90839-1.xml");
}
void Chart2XShapeTest::testPieChartLabels2()
@@ -126,9 +196,9 @@ void Chart2XShapeTest::testPieChartLabels2()
if (!IsDefaultDPI())
return;
- // text wrap: wrap all text labels except one
- load(u"chart2/qa/extras/xshape/data/xlsx/", "tdf90839-2.xlsx");
- compareAgainstReference(u"tdf90839-2.xml");
+ // text wrap: wrap all text labels except Yellow one
+ loadFromFile(u"xlsx/tdf90839-2.xlsx");
+ compareAgainstReference(getXShapeDumpString(), u"tdf90839-2.xml");
}
void Chart2XShapeTest::testPieChartLabels3()
@@ -138,9 +208,9 @@ void Chart2XShapeTest::testPieChartLabels3()
if (!IsDefaultDPI())
return;
- // text wrap: wrap no text label except one
- load(u"chart2/qa/extras/xshape/data/xlsx/", "tdf90839-3.xlsx");
- compareAgainstReference(u"tdf90839-3.xml");
+ // text wrap: wrap no text label except Yellow one
+ loadFromFile(u"xlsx/tdf90839-3.xlsx");
+ compareAgainstReference(getXShapeDumpString(), u"tdf90839-3.xml");
}
void Chart2XShapeTest::testPieChartLabels4()
@@ -151,8 +221,19 @@ void Chart2XShapeTest::testPieChartLabels4()
return;
// data value and percent value are centered horizontally
- load(u"chart2/qa/extras/xshape/data/ods/", "tdf90839-4.ods");
- compareAgainstReference(u"tdf90839-4.xml");
+ loadFromFile(u"ods/tdf90839-4.ods");
+ compareAgainstReference(getXShapeDumpString(), u"tdf90839-4.xml");
+}
+
+void Chart2XShapeTest::testChart()
+{
+ // FIXME: the DPI check should be removed when either (1) the test is fixed to work with
+ // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin.
+ if (!IsDefaultDPI())
+ return;
+
+ loadFromFile(u"ods/testChart.ods");
+ compareAgainstReference(getXShapeDumpString(), u"testChart.xml");
}
void Chart2XShapeTest::testTdf76649TrendLineBug()
@@ -160,75 +241,74 @@ void Chart2XShapeTest::testTdf76649TrendLineBug()
// This bug prevents that the trendline (regression curve) is drawn
// if the first cell is empty. See tdf#76649 for details.
- load(u"chart2/qa/extras/xshape/data/ods/", "tdf76649_TrendLineBug.ods");
+ loadFromFile(u"ods/tdf76649_TrendLineBug.ods");
xmlDocUniquePtr pXmlDoc = getXShapeDumpXmlDoc();
// Check if the regression curve exists (which means a XShape with a certain
// name should exist in the dump)
- assertXPath(pXmlDoc, "//XShape[@name='CID/D=0:CS=0:CT=0:Series=0:Curve=0']", 1);
+ assertXPath(pXmlDoc, "//XShape[@name='CID/D=0:CS=0:CT=0:Series=0:Curve=0']"_ostr, 1);
}
void Chart2XShapeTest::testTdf88154LabelRotatedLayout()
{
- load(u"chart2/qa/extras/xshape/data/pptx/", "tdf88154_LabelRotatedLayout.pptx");
+ loadFromFile(u"pptx/tdf88154_LabelRotatedLayout.pptx");
uno::Reference<chart::XChartDocument> xChartDoc = getChartDocFromDrawImpress(0, 5);
- uno::Reference<qa::XDumper> xDumper(xChartDoc, UNO_QUERY_THROW);
- OUString rDump = xDumper->dump();
+ OUString rDump = getShapeDump(xChartDoc);
OString aXmlDump = OUStringToOString(rDump, RTL_TEXTENCODING_UTF8);
xmlDocUniquePtr pXmlDoc(xmlParseDoc(reinterpret_cast<const xmlChar*>(aXmlDump.getStr())));
{
- OString aPath("//XShape[@text='Oct-12']/Transformation");
+ OString aPath("//XShape[@text='Oct-12']/Transformation"_ostr);
assertXPath(pXmlDoc, aPath, 1);
- double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble();
- double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble();
- double fT21 = getXPath(pXmlDoc, aPath + "/Line2", "column1").toDouble();
- double fT22 = getXPath(pXmlDoc, aPath + "/Line2", "column2").toDouble();
+ double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1"_ostr).toDouble();
+ double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2"_ostr).toDouble();
+ double fT21 = getXPath(pXmlDoc, aPath + "/Line2", "column1"_ostr).toDouble();
+ double fT22 = getXPath(pXmlDoc, aPath + "/Line2", "column2"_ostr).toDouble();
CPPUNIT_ASSERT_DOUBLES_EQUAL(fT11, -fT21, 1e-8);
CPPUNIT_ASSERT_DOUBLES_EQUAL(fT12, fT22, 1e-8);
}
{
- OString aPath("//XShape[@text='Nov-12']/Transformation");
+ OString aPath("//XShape[@text='Nov-12']/Transformation"_ostr);
assertXPath(pXmlDoc, aPath, 1);
- double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble();
- double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble();
- double fT21 = getXPath(pXmlDoc, aPath + "/Line2", "column1").toDouble();
- double fT22 = getXPath(pXmlDoc, aPath + "/Line2", "column2").toDouble();
+ double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1"_ostr).toDouble();
+ double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2"_ostr).toDouble();
+ double fT21 = getXPath(pXmlDoc, aPath + "/Line2", "column1"_ostr).toDouble();
+ double fT22 = getXPath(pXmlDoc, aPath + "/Line2", "column2"_ostr).toDouble();
CPPUNIT_ASSERT_DOUBLES_EQUAL(fT11, -fT21, 1e-8);
CPPUNIT_ASSERT_DOUBLES_EQUAL(fT12, fT22, 1e-8);
}
{
- OString aPath("//XShape[@text='Dec-12']/Transformation");
+ OString aPath("//XShape[@text='Dec-12']/Transformation"_ostr);
assertXPath(pXmlDoc, aPath, 1);
- double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble();
- double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble();
- double fT21 = getXPath(pXmlDoc, aPath + "/Line2", "column1").toDouble();
- double fT22 = getXPath(pXmlDoc, aPath + "/Line2", "column2").toDouble();
+ double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1"_ostr).toDouble();
+ double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2"_ostr).toDouble();
+ double fT21 = getXPath(pXmlDoc, aPath + "/Line2", "column1"_ostr).toDouble();
+ double fT22 = getXPath(pXmlDoc, aPath + "/Line2", "column2"_ostr).toDouble();
CPPUNIT_ASSERT_DOUBLES_EQUAL(fT11, -fT21, 1e-8);
CPPUNIT_ASSERT_DOUBLES_EQUAL(fT12, fT22, 1e-8);
}
{
- OString aPath("//XShape[@text='May-13']/Transformation");
+ OString aPath("//XShape[@text='May-13']/Transformation"_ostr);
assertXPath(pXmlDoc, aPath, 1);
- double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble();
- double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble();
- double fT21 = getXPath(pXmlDoc, aPath + "/Line2", "column1").toDouble();
- double fT22 = getXPath(pXmlDoc, aPath + "/Line2", "column2").toDouble();
+ double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1"_ostr).toDouble();
+ double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2"_ostr).toDouble();
+ double fT21 = getXPath(pXmlDoc, aPath + "/Line2", "column1"_ostr).toDouble();
+ double fT22 = getXPath(pXmlDoc, aPath + "/Line2", "column2"_ostr).toDouble();
CPPUNIT_ASSERT_DOUBLES_EQUAL(fT11, -fT21, 1e-8);
CPPUNIT_ASSERT_DOUBLES_EQUAL(fT12, fT22, 1e-8);
}
{
- OString aPath("//XShape[@text='Jan-14']/Transformation");
+ OString aPath("//XShape[@text='Jan-14']/Transformation"_ostr);
assertXPath(pXmlDoc, aPath, 1);
- double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble();
- double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble();
- double fT21 = getXPath(pXmlDoc, aPath + "/Line2", "column1").toDouble();
- double fT22 = getXPath(pXmlDoc, aPath + "/Line2", "column2").toDouble();
+ double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1"_ostr).toDouble();
+ double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2"_ostr).toDouble();
+ double fT21 = getXPath(pXmlDoc, aPath + "/Line2", "column1"_ostr).toDouble();
+ double fT22 = getXPath(pXmlDoc, aPath + "/Line2", "column2"_ostr).toDouble();
CPPUNIT_ASSERT_DOUBLES_EQUAL(fT11, -fT21, 1e-8);
CPPUNIT_ASSERT_DOUBLES_EQUAL(fT12, fT22, 1e-8);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 11:14:35 +0000