strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sw: drop DECLARE_FODFEXPORT_TEST macro

Browse source 
Change-Id: I0b232aa689ffc70a2cfca1af5ba5529e34060371
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175015
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
This commit is contained in:
Xisco Fauli 2024-10-16 13:35:36 +02:00
parent 2455a0d8e1
commit 49c0e81e7d
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cpp.hint
View file

@ -58,5 +58,4 @@
#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test)
#define DECLARE_ODFEXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test)
#define DECLARE_FODFEXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test)
#define DECLARE_WW8EXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test)

38
sw/qa/extras/fodfexport/fodfexport.cxx
View file

@ -57,28 +57,34 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf113696WriterImage)
"draw:image[@draw:mime-type='image/png']");
}
DECLARE_FODFEXPORT_TEST(testSvgImageRoundtrip, "SvgImageTest.fodt")
CPPUNIT_TEST_FIXTURE(Test, testSvgImageRoundtrip)
{
// Related to tdf#123396
auto verify = [this]() {
// We should have one image (shape)
CPPUNIT_ASSERT_EQUAL(1, getShapes());
// We should have one image (shape)
CPPUNIT_ASSERT_EQUAL(1, getShapes());
// Get the shape and extract the Graphic
uno::Reference<drawing::XShape> xShape = getShape(1);
uno::Reference<beans::XPropertySet> XPropertySet(xShape, uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT(XPropertySet.is());
uno::Reference<graphic::XGraphic> xGraphic;
XPropertySet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
CPPUNIT_ASSERT(xGraphic.is());
Graphic aGraphic(xGraphic);
// Get the shape and extract the Graphic
uno::Reference<drawing::XShape> xShape = getShape(1);
uno::Reference<beans::XPropertySet> XPropertySet(xShape, uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT(XPropertySet.is());
uno::Reference<graphic::XGraphic> xGraphic;
XPropertySet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
CPPUNIT_ASSERT(xGraphic.is());
Graphic aGraphic(xGraphic);
// The graphic should be SVG - so should contain a VectorGraphicData
auto const& pVectorGraphicData = aGraphic.getVectorGraphicData();
CPPUNIT_ASSERT(pVectorGraphicData);
// The graphic should be SVG - so should contain a VectorGraphicData
auto const& pVectorGraphicData = aGraphic.getVectorGraphicData();
CPPUNIT_ASSERT(pVectorGraphicData);
// The VectorGraphicData type should be SVG
CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Svg, pVectorGraphicData->getType());
};
// The VectorGraphicData type should be SVG
CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Svg, pVectorGraphicData->getType());
createSwDoc("SvgImageTest.fodt");
verify();
saveAndReload(mpFilter);
verify();
}
} // end of anonymous namespace

1
sw/qa/inc/swmodeltestbase.hxx
View file

@ -57,7 +57,6 @@
#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test)
#define DECLARE_ODFEXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test)
#define DECLARE_FODFEXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test)
#define DECLARE_WW8EXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test)
class SwXTextDocument;