CppunitTest_sd_export_tests-ooxml1: use CPPUNIT_TEST_FIXTURE()

This suite is large enough so that avoiding the
declaration/registration/definition of each test manually saves a lot of
space.

Change-Id: I4b76afd0483957b0061326e584ccbb0d22650c60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147509
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

1 files changed, 73 insertions, 227 deletions

diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx
index b7b43f886ff9..98aa9c79eec7 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -51,158 +51,6 @@ public:
     {
     }
 
-    void testTdf152335();
-    void testTdf149803();
-    void testTdf149311();
-    void testTdf149128();
-    void testTdf66228();
-    void testTdf147919();
-    void testTdf130165();
-    void testTdf124781();
-    void testTdf144914();
-    void testTdf124232();
-    void testTdf143624();
-    void testTdf142648();
-    void testTdf47365();
-    void testTdf125071();
-    void testTdf54037();
-    void testFdo90607();
-    void testTdf127237();
-    void testBnc887230();
-    void testBnc870233_1();
-    void testBnc870233_2();
-    void testN828390_4();
-    void testN828390_5();
-    void testFdo71961();
-    void testLostPlaceholders();
-    void testN828390();
-    void testBnc880763();
-    void testBnc862510_5();
-    void testBnc822347_EmptyBullet();
-    void testFdo83751();
-    void testFdo79731();
-    void testTableCellFillProperties();
-    void testBulletStartNumber();
-    void testLineStyle();
-    void testCellLeftAndRightMargin();
-    void testTdf134862();
-    void testRightToLeftParaghraph();
-    void testTextboxWithHyperlink();
-    void testMergedCells();
-    void testTableCellBorder();
-    void testBulletColor();
-    void testBulletCharAndFont();
-    void testBulletMarginAndIndentation();
-    void testParaMarginAndindentation();
-    void testTdf111884();
-    void testTdf112633();
-    void testTdf128952();
-    void testTdf127090();
-    void testCustomXml();
-    void testTdf94238();
-    void testPictureTransparency();
-    void testTdf125554();
-    void testRoundtripOwnLineStyles();
-    void testRoundtripPrstDash();
-    void testDashOnHairline();
-    void testNarrationNonMediaShape();
-    void testCustomshapeBitmapfillSrcrect();
-    void testTdf100348FontworkBitmapFill();
-    void testTdf100348FontworkGradientGlow();
-    void testTdf128345FullTransparentGradient();
-    void testTdf128345GradientLinear();
-    void testTdf128345GradientRadial();
-    void testTdf128345GradientAxial();
-    void testTdf134969TransparencyOnColorGradient();
-    void testTdf136911();
-    void testArcTo();
-    void testNarrationMimeType();
-    void testTdf140865Wordart3D();
-    void testTdf124457();
-    void testPlaceholderFillAndOutlineExport();
-    void testTdf143126();
-    void testTdf143129();
-    void testTdf118045();
-    void testTdf137675();
-
-    CPPUNIT_TEST_SUITE(SdOOXMLExportTest1);
-
-    CPPUNIT_TEST(testTdf152335);
-    CPPUNIT_TEST(testTdf149803);
-    CPPUNIT_TEST(testTdf149311);
-    CPPUNIT_TEST(testTdf149128);
-    CPPUNIT_TEST(testTdf66228);
-    CPPUNIT_TEST(testTdf147919);
-    CPPUNIT_TEST(testTdf130165);
-    CPPUNIT_TEST(testTdf124781);
-    CPPUNIT_TEST(testTdf144914);
-    CPPUNIT_TEST(testTdf124232);
-    CPPUNIT_TEST(testTdf143624);
-    CPPUNIT_TEST(testTdf142648);
-    CPPUNIT_TEST(testTdf47365);
-    CPPUNIT_TEST(testTdf125071);
-    CPPUNIT_TEST(testTdf54037);
-    CPPUNIT_TEST(testFdo90607);
-    CPPUNIT_TEST(testTdf127237);
-    CPPUNIT_TEST(testBnc887230);
-    CPPUNIT_TEST(testBnc870233_1);
-    CPPUNIT_TEST(testBnc870233_2);
-    CPPUNIT_TEST(testN828390_4);
-    CPPUNIT_TEST(testN828390_5);
-    CPPUNIT_TEST(testFdo71961);
-    CPPUNIT_TEST(testLostPlaceholders);
-    CPPUNIT_TEST(testN828390);
-    CPPUNIT_TEST(testBnc880763);
-    CPPUNIT_TEST(testBnc862510_5);
-    CPPUNIT_TEST(testBnc822347_EmptyBullet);
-    CPPUNIT_TEST(testFdo83751);
-    CPPUNIT_TEST(testFdo79731);
-    CPPUNIT_TEST(testTableCellFillProperties);
-    CPPUNIT_TEST(testBulletStartNumber);
-    CPPUNIT_TEST(testLineStyle);
-    CPPUNIT_TEST(testCellLeftAndRightMargin);
-    CPPUNIT_TEST(testTdf134862);
-    CPPUNIT_TEST(testRightToLeftParaghraph);
-    CPPUNIT_TEST(testTextboxWithHyperlink);
-    CPPUNIT_TEST(testMergedCells);
-    CPPUNIT_TEST(testTableCellBorder);
-    CPPUNIT_TEST(testBulletColor);
-    CPPUNIT_TEST(testBulletCharAndFont);
-    CPPUNIT_TEST(testBulletMarginAndIndentation);
-    CPPUNIT_TEST(testParaMarginAndindentation);
-    CPPUNIT_TEST(testTdf111884);
-    CPPUNIT_TEST(testTdf112633);
-    CPPUNIT_TEST(testTdf128952);
-    CPPUNIT_TEST(testTdf127090);
-    CPPUNIT_TEST(testCustomXml);
-    CPPUNIT_TEST(testTdf94238);
-    CPPUNIT_TEST(testTdf125554);
-    CPPUNIT_TEST(testPictureTransparency);
-    CPPUNIT_TEST(testRoundtripOwnLineStyles);
-    CPPUNIT_TEST(testRoundtripPrstDash);
-    CPPUNIT_TEST(testDashOnHairline);
-    CPPUNIT_TEST(testNarrationNonMediaShape);
-    CPPUNIT_TEST(testCustomshapeBitmapfillSrcrect);
-    CPPUNIT_TEST(testTdf100348FontworkBitmapFill);
-    CPPUNIT_TEST(testTdf100348FontworkGradientGlow);
-    CPPUNIT_TEST(testTdf128345FullTransparentGradient);
-    CPPUNIT_TEST(testTdf128345GradientLinear);
-    CPPUNIT_TEST(testTdf128345GradientRadial);
-    CPPUNIT_TEST(testTdf128345GradientAxial);
-    CPPUNIT_TEST(testTdf134969TransparencyOnColorGradient);
-    CPPUNIT_TEST(testTdf136911);
-    CPPUNIT_TEST(testArcTo);
-    CPPUNIT_TEST(testNarrationMimeType);
-    CPPUNIT_TEST(testTdf140865Wordart3D);
-    CPPUNIT_TEST(testTdf124457);
-    CPPUNIT_TEST(testPlaceholderFillAndOutlineExport);
-    CPPUNIT_TEST(testTdf143126);
-    CPPUNIT_TEST(testTdf143129);
-    CPPUNIT_TEST(testTdf118045);
-    CPPUNIT_TEST(testTdf137675);
-
-    CPPUNIT_TEST_SUITE_END();
-
     virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
     {
         XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
@@ -229,7 +77,7 @@ void checkFontAttributes(const SdrTextObj* pObj, ItemValue nVal, sal_uInt32 nId)
 }
 }
 
-void SdOOXMLExportTest1::testTdf152335()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf152335)
 {
     createSdImpressDoc("pptx/tdf152335.pptx");
     save("Impress Office Open XML");
@@ -239,7 +87,7 @@ void SdOOXMLExportTest1::testTdf152335()
         pXmlDocTheme, "/a:theme/a:themeElements/a:fmtScheme/a:effectStyleLst/a:effectStyle[3]", 1);
 }
 
-void SdOOXMLExportTest1::testTdf149803()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf149803)
 {
     createSdImpressDoc("pptx/tdf149803.pptx");
     save("Impress Office Open XML");
@@ -248,7 +96,7 @@ void SdOOXMLExportTest1::testTdf149803()
     assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp", "useBgFill", "1");
 }
 
-void SdOOXMLExportTest1::testTdf149311()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf149311)
 {
     createSdImpressDoc("odp/tdf149311.odp");
     save("Impress Office Open XML");
@@ -259,7 +107,7 @@ void SdOOXMLExportTest1::testTdf149311()
                 "slide2.xml");
 }
 
-void SdOOXMLExportTest1::testTdf149128()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf149128)
 {
     createSdImpressDoc("odp/tdf149128.odp");
     save("Impress Office Open XML");
@@ -275,7 +123,7 @@ void SdOOXMLExportTest1::testTdf149128()
                 "2");
 }
 
-void SdOOXMLExportTest1::testTdf66228()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf66228)
 {
     createSdImpressDoc("odp/tdf66228.odp");
     save("Impress Office Open XML");
@@ -285,7 +133,7 @@ void SdOOXMLExportTest1::testTdf66228()
                 "bentConnector3");
 }
 
-void SdOOXMLExportTest1::testTdf147919()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf147919)
 {
     createSdImpressDoc("odp/tdf147919.odp");
     save("Impress Office Open XML");
@@ -354,7 +202,7 @@ void SdOOXMLExportTest1::testTdf147919()
                 "curvedConnector5");
 }
 
-void SdOOXMLExportTest1::testTdf130165()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf130165)
 {
     createSdImpressDoc("pptx/tdf146223.pptx");
     save("Impress Office Open XML");
@@ -363,7 +211,7 @@ void SdOOXMLExportTest1::testTdf130165()
     assertXPath(pXmlDoc, "/p:sld", "showMasterSp", "0");
 }
 
-void SdOOXMLExportTest1::testTdf124781()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf124781)
 {
     createSdImpressDoc("odp/tdf124781.odp");
     save("Impress Office Open XML");
@@ -377,7 +225,7 @@ void SdOOXMLExportTest1::testTdf124781()
                 "-8000");
 }
 
-void SdOOXMLExportTest1::testTdf144914()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf144914)
 {
     createSdImpressDoc("pptx/tdf144616.pptx");
     save("Impress Office Open XML");
@@ -417,7 +265,7 @@ void SdOOXMLExportTest1::testTdf144914()
                 "http://www.example.com/");
 }
 
-void SdOOXMLExportTest1::testTdf124232()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf124232)
 {
     createSdImpressDoc("pptx/tdf141704.pptx");
     save("Impress Office Open XML");
@@ -457,7 +305,7 @@ void SdOOXMLExportTest1::testTdf124232()
                 "ppaction://hlinkshowjump?jump=firstslide");
 }
 
-void SdOOXMLExportTest1::testTdf143624()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf143624)
 {
     createSdImpressDoc("pptx/tdf143624.pptx");
     save("Impress Office Open XML");
@@ -469,7 +317,7 @@ void SdOOXMLExportTest1::testTdf143624()
     assertXPath(pXmlDoc, "/p:presentationPr/p:showPr", "showNarration", "1");
 }
 
-void SdOOXMLExportTest1::testTdf142648()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf142648)
 {
     createSdImpressDoc("pptx/tdf142648.pptx");
 
@@ -488,7 +336,7 @@ void SdOOXMLExportTest1::testTdf142648()
                 "slide1.xml");
 }
 
-void SdOOXMLExportTest1::testTdf47365()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf47365)
 {
     createSdImpressDoc("pptx/loopNoPause.pptx");
     save("Impress Office Open XML");
@@ -500,7 +348,7 @@ void SdOOXMLExportTest1::testTdf47365()
     assertXPath(pXmlDoc, "/p:presentationPr/p:showPr", "showNarration", "1");
 }
 
-void SdOOXMLExportTest1::testTdf125071()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf125071)
 {
     createSdImpressDoc("pptx/tdf125071.pptx");
     save("Impress Office Open XML");
@@ -511,7 +359,7 @@ void SdOOXMLExportTest1::testTdf125071()
     assertXPath(pXmlDoc, "/p:presentation/p:custShowLst/p:custShow[2]", "name", "Custom2");
 }
 
-void SdOOXMLExportTest1::testTdf54037()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf54037)
 {
     createSdImpressDoc("pptx/tdf54037.pptx");
     save("Impress Office Open XML");
@@ -529,7 +377,7 @@ void SdOOXMLExportTest1::testTdf54037()
                 "slide2.xml");
 }
 
-void SdOOXMLExportTest1::testTdf127237()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf127237)
 {
     createSdImpressDoc("pptx/tdf127237.pptx");
     saveAndReload("impress8");
@@ -548,7 +396,7 @@ void SdOOXMLExportTest1::testTdf127237()
     CPPUNIT_ASSERT_EQUAL(Color(0x0070C0), nFillColor);
 }
 
-void SdOOXMLExportTest1::testBnc887230()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testBnc887230)
 {
     createSdImpressDoc("pptx/bnc887230.pptx");
     saveAndReload("Impress Office Open XML");
@@ -562,7 +410,7 @@ void SdOOXMLExportTest1::testBnc887230()
     checkFontAttributes<Color, SvxColorItem>(pObj, Color(0x0000ff), EE_CHAR_COLOR);
 }
 
-void SdOOXMLExportTest1::testBnc870233_1()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testBnc870233_1)
 {
     createSdImpressDoc("pptx/bnc870233_1.pptx");
     saveAndReload("Impress Office Open XML");
@@ -586,7 +434,7 @@ void SdOOXMLExportTest1::testBnc870233_1()
     }
 }
 
-void SdOOXMLExportTest1::testBnc870233_2()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testBnc870233_2)
 {
     createSdImpressDoc("pptx/bnc870233_2.pptx");
     saveAndReload("Impress Office Open XML");
@@ -620,7 +468,7 @@ void SdOOXMLExportTest1::testBnc870233_2()
     }
 }
 
-void SdOOXMLExportTest1::testN828390_4()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testN828390_4)
 {
     bool bPassed = false;
     createSdImpressDoc("n828390_4.odp");
@@ -659,7 +507,7 @@ void SdOOXMLExportTest1::testN828390_4()
     CPPUNIT_ASSERT(bPassed);
 }
 
-void SdOOXMLExportTest1::testN828390_5()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testN828390_5)
 {
     createSdImpressDoc("n828390_5.odp");
 
@@ -677,7 +525,7 @@ void SdOOXMLExportTest1::testN828390_5()
     }
 }
 
-void SdOOXMLExportTest1::testLostPlaceholders()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testLostPlaceholders)
 {
     createSdImpressDoc("pptx/LostPlaceholder.odp");
 
@@ -707,7 +555,7 @@ void SdOOXMLExportTest1::testLostPlaceholders()
     // Actual: false
 }
 
-void SdOOXMLExportTest1::testPlaceholderFillAndOutlineExport()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testPlaceholderFillAndOutlineExport)
 {
     createSdImpressDoc("pptx/LostPlaceholderFill.odp");
 
@@ -766,7 +614,7 @@ void SdOOXMLExportTest1::testPlaceholderFillAndOutlineExport()
     }
 }
 
-void SdOOXMLExportTest1::testFdo71961()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testFdo71961)
 {
     createSdImpressDoc("fdo71961.odp");
 
@@ -794,7 +642,7 @@ void SdOOXMLExportTest1::testFdo71961()
     CPPUNIT_ASSERT_EQUAL(true, pTxtObj->GetMergedItem(SDRATTR_TEXT_WORDWRAP).GetValue());
 }
 
-void SdOOXMLExportTest1::testN828390()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testN828390)
 {
     bool bPassed = false;
     createSdImpressDoc("pptx/n828390.pptx");
@@ -819,7 +667,7 @@ void SdOOXMLExportTest1::testN828390()
     CPPUNIT_ASSERT_MESSAGE("Subscript not exported properly", bPassed);
 }
 
-void SdOOXMLExportTest1::testBnc880763()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testBnc880763)
 {
     createSdImpressDoc("pptx/bnc880763.pptx");
     saveAndReload("Impress Office Open XML");
@@ -844,7 +692,7 @@ void SdOOXMLExportTest1::testBnc880763()
         (static_cast<const XColorItem&>(pObj->GetMergedItem(XATTR_FILLCOLOR))).GetColorValue());
 }
 
-void SdOOXMLExportTest1::testBnc862510_5()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testBnc862510_5)
 {
     createSdImpressDoc("pptx/bnc862510_5.pptx");
     saveAndReload("Impress Office Open XML");
@@ -865,7 +713,7 @@ void SdOOXMLExportTest1::testBnc862510_5()
 // In numbering a bullet could be defined as empty (no character).
 // When exporting to OOXML make sure that the bullet is ignored and
 // not written into the file.
-void SdOOXMLExportTest1::testBnc822347_EmptyBullet()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testBnc822347_EmptyBullet)
 {
     createSdImpressDoc("bnc822347_EmptyBullet.odp");
     saveAndReload("Impress Office Open XML");
@@ -895,7 +743,7 @@ void SdOOXMLExportTest1::testBnc822347_EmptyBullet()
 }
 
 //Bullets not having  any text following them are not getting exported to pptx correctly.
-void SdOOXMLExportTest1::testFdo90607()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testFdo90607)
 {
     createSdImpressDoc("fdo90607.pptx");
     saveAndReload("Impress Office Open XML");
@@ -908,7 +756,7 @@ void SdOOXMLExportTest1::testFdo90607()
     CPPUNIT_ASSERT_MESSAGE("not equal", nDepth != -1);
 }
 
-void SdOOXMLExportTest1::testFdo83751()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testFdo83751)
 {
     createSdImpressDoc("pptx/fdo83751.pptx");
     saveAndReload("Impress Office Open XML");
@@ -924,7 +772,7 @@ void SdOOXMLExportTest1::testFdo83751()
     CPPUNIT_ASSERT_EQUAL(OUString("Document"), propValue);
 }
 
-void SdOOXMLExportTest1::testFdo79731()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testFdo79731)
 {
     createSdImpressDoc("fdo79731.odp");
     saveAndReload("Impress Office Open XML");
@@ -934,7 +782,7 @@ void SdOOXMLExportTest1::testFdo79731()
     CPPUNIT_ASSERT(pDoc);
 }
 
-void SdOOXMLExportTest1::testTableCellFillProperties()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTableCellFillProperties)
 {
     std::shared_ptr<comphelper::ConfigurationChanges> batch(
         comphelper::ConfigurationChanges::create());
@@ -972,7 +820,7 @@ void SdOOXMLExportTest1::testTableCellFillProperties()
     CPPUNIT_ASSERT_EQUAL(int(drawing::FillStyle_GRADIENT), static_cast<int>(aFillStyle));
 }
 
-void SdOOXMLExportTest1::testBulletStartNumber()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testBulletStartNumber)
 {
     createSdImpressDoc("pptx/n90255.pptx");
     saveAndReload("Impress Office Open XML");
@@ -987,7 +835,7 @@ void SdOOXMLExportTest1::testBulletStartNumber()
                                  sal_Int16(pNumFmt->GetNumRule().GetLevel(0).GetStart()));
 }
 
-void SdOOXMLExportTest1::testLineStyle()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testLineStyle)
 {
     createSdImpressDoc("pptx/lineStyle.pptx");
     saveAndReload("Impress Office Open XML");
@@ -1001,7 +849,7 @@ void SdOOXMLExportTest1::testLineStyle()
                                  static_cast<int>(rStyleItem.GetValue()));
 }
 
-void SdOOXMLExportTest1::testTdf134862()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf134862)
 {
     createSdImpressDoc("pptx/tdf134862.pptx");
     uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0));
@@ -1029,7 +877,7 @@ void SdOOXMLExportTest1::testTdf134862()
                                  nWritingMode);
 }
 
-void SdOOXMLExportTest1::testRightToLeftParaghraph()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testRightToLeftParaghraph)
 {
     createSdImpressDoc("pptx/rightToLeftParagraph.pptx");
 
@@ -1046,7 +894,7 @@ void SdOOXMLExportTest1::testRightToLeftParaghraph()
                                  nWritingMode);
 }
 
-void SdOOXMLExportTest1::testTextboxWithHyperlink()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTextboxWithHyperlink)
 {
     createSdImpressDoc("pptx/hyperlinktest.pptx");
 
@@ -1070,7 +918,7 @@ void SdOOXMLExportTest1::testTextboxWithHyperlink()
     CPPUNIT_ASSERT_EQUAL_MESSAGE("URLs don't match", OUString("http://www.xkcd.com/"), aURL);
 }
 
-void SdOOXMLExportTest1::testTdf136911()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf136911)
 {
     createSdImpressDoc("ppt/tdf136911.ppt");
 
@@ -1094,7 +942,7 @@ void SdOOXMLExportTest1::testTdf136911()
     CPPUNIT_ASSERT_EQUAL_MESSAGE("URLs don't match", OUString("http://google.com"), aURL);
 }
 
-void SdOOXMLExportTest1::testBulletColor()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testBulletColor)
 {
     createSdImpressDoc("pptx/bulletColor.pptx");
 
@@ -1112,7 +960,7 @@ void SdOOXMLExportTest1::testBulletColor()
                                  pNumFmt->GetNumRule().GetLevel(0).GetBulletColor());
 }
 
-void SdOOXMLExportTest1::testBulletCharAndFont()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testBulletCharAndFont)
 {
     createSdImpressDoc("odp/bulletCharAndFont.odp");
     saveAndReload("Impress Office Open XML");
@@ -1141,7 +989,7 @@ void SdOOXMLExportTest1::testBulletCharAndFont()
     }
 }
 
-void SdOOXMLExportTest1::testBulletMarginAndIndentation()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testBulletMarginAndIndentation)
 {
     createSdImpressDoc("pptx/bulletMarginAndIndent.pptx");
     saveAndReload("Impress Office Open XML");
@@ -1162,7 +1010,7 @@ void SdOOXMLExportTest1::testBulletMarginAndIndentation()
                                  pNumFmt->GetNumRule().GetLevel(0).GetFirstLineOffset());
 }
 
-void SdOOXMLExportTest1::testParaMarginAndindentation()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testParaMarginAndindentation)
 {
     createSdImpressDoc("pptx/paraMarginAndIndentation.pptx");
 
@@ -1182,7 +1030,7 @@ void SdOOXMLExportTest1::testParaMarginAndindentation()
     CPPUNIT_ASSERT_EQUAL(sal_Int32(-1270), nParaFirstLineIndent);
 }
 
-void SdOOXMLExportTest1::testCellLeftAndRightMargin()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testCellLeftAndRightMargin)
 {
     createSdImpressDoc("pptx/n90223.pptx");
     saveAndReload("Impress Office Open XML");
@@ -1212,7 +1060,7 @@ void SdOOXMLExportTest1::testCellLeftAndRightMargin()
     CPPUNIT_ASSERT_EQUAL(sal_Int32(45720), nRightMargin);
 }
 
-void SdOOXMLExportTest1::testMergedCells()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testMergedCells)
 {
     createSdImpressDoc("odp/cellspan.odp");
     saveAndReload("Impress Office Open XML");
@@ -1229,7 +1077,7 @@ void SdOOXMLExportTest1::testMergedCells()
     CPPUNIT_ASSERT_EQUAL(OUString("2,3"), xText2->getString());
 }
 
-void SdOOXMLExportTest1::testTableCellBorder()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTableCellBorder)
 {
     createSdImpressDoc("pptx/n90190.pptx");
     saveAndReload("Impress Office Open XML");
@@ -1273,7 +1121,7 @@ void SdOOXMLExportTest1::testTableCellBorder()
     CPPUNIT_ASSERT_EQUAL(Color(0x00b0f0), Color(ColorTransparency, aBorderLine.Color));
 }
 
-void SdOOXMLExportTest1::testTdf111884()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf111884)
 {
     createSdImpressDoc("pptx/tdf111884.pptx");
     saveAndReload("Impress Office Open XML");
@@ -1286,7 +1134,7 @@ void SdOOXMLExportTest1::testTdf111884()
     CPPUNIT_ASSERT_EQUAL(SdrObjKind::Group, pShape->GetObjIdentifier());
 }
 
-void SdOOXMLExportTest1::testTdf112633()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf112633)
 {
     // Load document and export it to a temporary file
     createSdImpressDoc("pptx/tdf112633.pptx");
@@ -1317,7 +1165,7 @@ void SdOOXMLExportTest1::testTdf112633()
     CPPUNIT_ASSERT_EQUAL(true, bool(xNameAccess->hasByName("ppt/media/hdphoto1.wdp")));
 }
 
-void SdOOXMLExportTest1::testTdf128952()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf128952)
 {
     createSdImpressDoc("pptx/tdf128952.pptx");
     save("Impress Office Open XML");
@@ -1330,7 +1178,7 @@ void SdOOXMLExportTest1::testTdf128952()
     assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:xfrm/a:ext", "cy", "1462680");
 }
 
-void SdOOXMLExportTest1::testTdf127090()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf127090)
 {
     createSdImpressDoc("pptx/tdf127090.odp");
     save("Impress Office Open XML");
@@ -1340,7 +1188,7 @@ void SdOOXMLExportTest1::testTdf127090()
     assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:bodyPr", "rot", "-5400000");
 }
 
-void SdOOXMLExportTest1::testCustomXml()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testCustomXml)
 {
     // Load document and export it to a temporary file
     createSdImpressDoc("pptx/customxml.pptx");
@@ -1360,7 +1208,7 @@ void SdOOXMLExportTest1::testCustomXml()
     CPPUNIT_ASSERT(pStream);
 }
 
-void SdOOXMLExportTest1::testTdf94238()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf94238)
 {
     // Load document and export it to a temporary file.
     createSdImpressDoc("pptx/tdf94238.pptx");
@@ -1393,7 +1241,7 @@ void SdOOXMLExportTest1::testTdf94238()
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0x8B8B8B), aGradient.EndColor);
 }
 
-void SdOOXMLExportTest1::testPictureTransparency()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testPictureTransparency)
 {
     // Load document and export it to a temporary file.
     createSdImpressDoc("odp/image_transparency.odp");
@@ -1412,7 +1260,7 @@ void SdOOXMLExportTest1::testPictureTransparency()
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(51), nTransparency);
 }
 
-void SdOOXMLExportTest1::testTdf125554()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf125554)
 {
     createSdImpressDoc("pptx/tdf125554.pptx");
     saveAndReload("Impress Office Open XML");
@@ -1426,7 +1274,7 @@ void SdOOXMLExportTest1::testTdf125554()
     CPPUNIT_ASSERT(!aFillTransparenceGradientName.get<OUString>().isEmpty());
 }
 
-void SdOOXMLExportTest1::testRoundtripOwnLineStyles()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testRoundtripOwnLineStyles)
 {
     // Load odp document and read the LineDash values.
     createSdImpressDoc("odp/LineStylesOwn.odp");
@@ -1467,7 +1315,7 @@ void SdOOXMLExportTest1::testRoundtripOwnLineStyles()
     }
 }
 
-void SdOOXMLExportTest1::testRoundtripPrstDash()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testRoundtripPrstDash)
 {
     // load and save document, compare prstDash values in saved document with original.
     createSdImpressDoc("pptx/presetDashDot.pptx");
@@ -1504,7 +1352,7 @@ void SdOOXMLExportTest1::testRoundtripPrstDash()
     }
 }
 
-void SdOOXMLExportTest1::testDashOnHairline()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testDashOnHairline)
 {
     // load and save document, make sure the custDash has 11 child elements.
     createSdImpressDoc("odp/tdf127267DashOnHairline.odp");
@@ -1514,7 +1362,7 @@ void SdOOXMLExportTest1::testDashOnHairline()
     assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:ln/a:custDash/a:ds", 11);
 }
 
-void SdOOXMLExportTest1::testNarrationNonMediaShape()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testNarrationNonMediaShape)
 {
     createSdImpressDoc("pptx/narration-non-media-shape.pptx");
     // Without the accompanying fix in place, this test would have failed,
@@ -1522,7 +1370,7 @@ void SdOOXMLExportTest1::testNarrationNonMediaShape()
     saveAndReload("Impress Office Open XML");
 }
 
-void SdOOXMLExportTest1::testCustomshapeBitmapfillSrcrect()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testCustomshapeBitmapfillSrcrect)
 {
     createSdImpressDoc("pptx/customshape-bitmapfill-srcrect.pptx");
     save("Impress Office Open XML");
@@ -1553,7 +1401,7 @@ void SdOOXMLExportTest1::testCustomshapeBitmapfillSrcrect()
     assertXPathNoAttribute(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:blipFill/a:srcRect", "b");
 }
 
-void SdOOXMLExportTest1::testTdf100348FontworkBitmapFill()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf100348FontworkBitmapFill)
 {
     createSdImpressDoc("odp/tdf100348_FontworkBitmapFill.odp");
     save("Impress Office Open XML");
@@ -1566,7 +1414,7 @@ void SdOOXMLExportTest1::testTdf100348FontworkBitmapFill()
     assertXPath(pXmlDoc, sPathStart + "/a:ln/a:solidFill/a:srgbClr", "val", "ffbf00");
 }
 
-void SdOOXMLExportTest1::testTdf100348FontworkGradientGlow()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf100348FontworkGradientGlow)
 {
     createSdImpressDoc("odp/tdf100348_FontworkGradientGlow.odp");
     save("Impress Office Open XML");
@@ -1580,7 +1428,7 @@ void SdOOXMLExportTest1::testTdf100348FontworkGradientGlow()
     assertXPath(pXmlDoc, sPathStart + "/a:effectLst/a:glow/a:srgbClr", "val", "ff4500");
 }
 
-void SdOOXMLExportTest1::testTdf128345FullTransparentGradient()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf128345FullTransparentGradient)
 {
     createSdImpressDoc("odp/tdf128345_FullTransparentGradient.odp");
     save("Impress Office Open XML");
@@ -1590,7 +1438,7 @@ void SdOOXMLExportTest1::testTdf128345FullTransparentGradient()
     assertXPath(pXmlDoc, "//p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:noFill");
 }
 
-void SdOOXMLExportTest1::testTdf128345GradientLinear()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf128345GradientLinear)
 {
     createSdImpressDoc("odp/tdf128345_GradientLinear.odp");
     save("Impress Office Open XML");
@@ -1608,7 +1456,7 @@ void SdOOXMLExportTest1::testTdf128345GradientLinear()
     assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val", "80000");
 }
 
-void SdOOXMLExportTest1::testTdf128345GradientRadial()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf128345GradientRadial)
 {
     createSdImpressDoc("odp/tdf128345_GradientRadial.odp");
     save("Impress Office Open XML");
@@ -1624,7 +1472,7 @@ void SdOOXMLExportTest1::testTdf128345GradientRadial()
     assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val", "0");
 }
 
-void SdOOXMLExportTest1::testTdf128345GradientAxial()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf128345GradientAxial)
 {
     // Without the patch, symmetric linear gradient with full transparence outside and
     // full opak in the middle were imported as full transparent.
@@ -1639,7 +1487,7 @@ void SdOOXMLExportTest1::testTdf128345GradientAxial()
     CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_AXIAL, aTransparenceGradient.Style);
 }
 
-void SdOOXMLExportTest1::testTdf134969TransparencyOnColorGradient()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf134969TransparencyOnColorGradient)
 {
     createSdImpressDoc("odp/tdf134969_TransparencyOnColorGradient.odp");
     save("Impress Office Open XML");
@@ -1652,7 +1500,7 @@ void SdOOXMLExportTest1::testTdf134969TransparencyOnColorGradient()
     assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val", "60000");
 }
 
-void SdOOXMLExportTest1::testArcTo()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testArcTo)
 {
     createSdImpressDoc("pptx/arc-validiert.pptx");
     save("Impress Office Open XML");
@@ -1665,7 +1513,7 @@ void SdOOXMLExportTest1::testArcTo()
     assertXPath(pXmlDoc, sPath, "swAng", "2700000");
 }
 
-void SdOOXMLExportTest1::testNarrationMimeType()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testNarrationMimeType)
 {
     createSdImpressDoc("pptx/narration.pptx");
     save("Impress Office Open XML");
@@ -1727,7 +1575,7 @@ void SdOOXMLExportTest1::testNarrationMimeType()
     assertXPath(pSlideDoc, "//p:childTnLst/p:audio", "isNarration", "1");
 }
 
-void SdOOXMLExportTest1::testTdf140865Wordart3D()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf140865Wordart3D)
 {
     createSdImpressDoc("pptx/tdf140865Wordart3D.pptx");
     save("Impress Office Open XML");
@@ -1745,7 +1593,7 @@ void SdOOXMLExportTest1::testTdf140865Wordart3D()
     assertXPath(pXmlDoc, sPathStart + "/a:sp3d/a:contourClr/a:srgbClr", "val", "009876");
 }
 
-void SdOOXMLExportTest1::testTdf124457()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf124457)
 {
     createSdImpressDoc("pptx/tdf124457.pptx");
     save("Impress Office Open XML");
@@ -1763,7 +1611,7 @@ void SdOOXMLExportTest1::testTdf124457()
                 "repeatCount", "indefinite");
 }
 
-void SdOOXMLExportTest1::testTdf143126()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf143126)
 {
     createSdImpressDoc("pptx/tdf143126.pptx");
     save("Impress Office Open XML");
@@ -1775,7 +1623,7 @@ void SdOOXMLExportTest1::testTdf143126()
     assertXPath(pXmlDoc, "/p:presentationPr/p:showPr/p:sldRg", "end", "3");
 }
 
-void SdOOXMLExportTest1::testTdf143129()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf143129)
 {
     createSdImpressDoc("pptx/tdf143129.pptx");
     save("Impress Office Open XML");
@@ -1786,7 +1634,7 @@ void SdOOXMLExportTest1::testTdf143129()
     assertXPath(pXmlDoc, "/p:presentationPr/p:showPr/p:custShow", "id", "0");
 }
 
-void SdOOXMLExportTest1::testTdf118045()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf118045)
 {
     createSdImpressDoc("odp/tdf118045.odp");
     save("Impress Office Open XML");
@@ -1796,7 +1644,7 @@ void SdOOXMLExportTest1::testTdf118045()
                 "110000");
 }
 
-void SdOOXMLExportTest1::testTdf137675()
+CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf137675)
 {
     createSdImpressDoc("pptx/tdf137675.pptx");
     save("Impress Office Open XML");
@@ -1806,8 +1654,6 @@ void SdOOXMLExportTest1::testTdf137675()
                 "none");
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest1);
-
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */