From 703167d4fb6e1d1e7bb72bfd79cfa0ae140ca89f Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Mon, 17 Jan 2022 18:33:58 +0100 Subject: [PATCH] tdf#146731: sd_layout: Add unittest Change-Id: I50e7c1e89a217c845612d02942a22d9ef1abbea8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128511 Tested-by: Jenkins Reviewed-by: Xisco Fauli --- sd/qa/unit/data/pptx/tdf146731.pptx | Bin 0 -> 33273 bytes sd/qa/unit/layout-tests.cxx | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 sd/qa/unit/data/pptx/tdf146731.pptx diff --git a/sd/qa/unit/data/pptx/tdf146731.pptx b/sd/qa/unit/data/pptx/tdf146731.pptx new file mode 100644 index 0000000000000000000000000000000000000000..3862e45461a32ca3fe3bae4ef3525e96460a9d39 GIT binary patch literal 33273 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 literal 0 HcmV?d00001 diff --git a/sd/qa/unit/layout-tests.cxx b/sd/qa/unit/layout-tests.cxx index 102c6a8153b0..4ea92807c49a 100644 --- a/sd/qa/unit/layout-tests.cxx +++ b/sd/qa/unit/layout-tests.cxx @@ -17,6 +17,7 @@ public: void testTdf128212(); void testColumnsLayout(); void tdf143258_testTbRlLayout(); + void testTdf146731(); CPPUNIT_TEST_SUITE(SdLayoutTest); @@ -26,6 +27,7 @@ public: CPPUNIT_TEST(testTdf128212); CPPUNIT_TEST(testColumnsLayout); CPPUNIT_TEST(tdf143258_testTbRlLayout); + CPPUNIT_TEST(testTdf146731); CPPUNIT_TEST_SUITE_END(); }; @@ -276,6 +278,30 @@ void SdLayoutTest::tdf143258_testTbRlLayout() xDocShRef->DoClose(); } +void SdLayoutTest::testTdf146731() +{ + sd::DrawDocShellRef xDocShRef + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf146731.pptx"), PPTX); + + std::shared_ptr xMetaFile = xDocShRef->GetPreviewMetaFile(); + MetafileXmlDump dumper; + + xmlDocUniquePtr pXmlDoc = XmlTestTools::dumpAndParse(dumper, *xMetaFile); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[3]/polyline[1]", "width", "187"); + assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[4]/polyline[1]", "width", "187"); + assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[5]/polyline[1]", "width", "187"); + + // Without the fix in place, this test would have failed with + // - Expected: 30 + // - Actual : 187 + assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[6]/polyline[1]", "width", "30"); + assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[7]/polyline[1]", "width", "187"); + + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdLayoutTest); CPPUNIT_PLUGIN_IMPLEMENT();