ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

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 15:28:13 +02:00
parent 2455a0d8e1
commit 49c0e81e7d
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp.hint
-1
View File
@@ -58,5 +58,4 @@
#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test) #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_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) #define DECLARE_WW8EXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test)
sw/qa/extras/fodfexport/fodfexport.cxx
+8 -2
View File
@@ -57,10 +57,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf113696WriterImage)
"draw:image[@draw:mime-type='image/png']"); "draw:image[@draw:mime-type='image/png']");
} }
DECLARE_FODFEXPORT_TEST(testSvgImageRoundtrip, "SvgImageTest.fodt") CPPUNIT_TEST_FIXTURE(Test, testSvgImageRoundtrip)
{ {
// Related to tdf#123396 // Related to tdf#123396
auto verify = [this]() {
// We should have one image (shape) // We should have one image (shape)
CPPUNIT_ASSERT_EQUAL(1, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getShapes());
@@ -79,6 +79,12 @@ DECLARE_FODFEXPORT_TEST(testSvgImageRoundtrip, "SvgImageTest.fodt")
// The VectorGraphicData type should be SVG // The VectorGraphicData type should be SVG
CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Svg, pVectorGraphicData->getType()); CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Svg, pVectorGraphicData->getType());
};
createSwDoc("SvgImageTest.fodt");
verify();
saveAndReload(mpFilter);
verify();
} }
} // end of anonymous namespace } // end of anonymous namespace
sw/qa/inc/swmodeltestbase.hxx
-1
View File
@@ -57,7 +57,6 @@
#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test) #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_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) #define DECLARE_WW8EXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test)
class SwXTextDocument; class SwXTextDocument;