CppunitTest_sc_vba_macro_test: use CPPUNIT_TEST_FIXTURE()

Avoid the declaration/registration/definition of each
test manually saves a lot of space.

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

1 files changed, 24 insertions, 77 deletions

diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx
index 73dab6bba921..ffe77d21fe7d 100644
--- a/sc/qa/extras/vba-macro-test.cxx
+++ b/sc/qa/extras/vba-macro-test.cxx
@@ -47,61 +47,9 @@ public:
         : UnoApiTest("/sc/qa/extras/testdocuments")
     {
     }
-
-    void testSimpleCopyAndPaste();
-    void testMultiDocumentCopyAndPaste();
-    void testSheetAndColumnSelectAndHide();
-    void testPrintArea();
-    void testSelectAllChaged();
-    void testRangeSelect();
-    void testWindowState();
-    void testScroll();
-    void testMacroKeyBinding();
-
-    void testVba();
-    void testTdf149579();
-    void testVbaRangeSort();
-    void testTdf107885();
-    void testTdf131562();
-    void testTdf52602();
-    void testTdf107902();
-    void testTdf90278();
-    void testTdf149531();
-    void testTdf118247();
-    void testTdf126457();
-    void testVbaPDFExport();
-    void testForEachInSelection();
-    void testNonAsciiMacroIRI();
-
-    CPPUNIT_TEST_SUITE(VBAMacroTest);
-    CPPUNIT_TEST(testSimpleCopyAndPaste);
-    CPPUNIT_TEST(testMultiDocumentCopyAndPaste);
-    CPPUNIT_TEST(testSheetAndColumnSelectAndHide);
-    CPPUNIT_TEST(testPrintArea);
-    CPPUNIT_TEST(testSelectAllChaged);
-    CPPUNIT_TEST(testRangeSelect);
-    CPPUNIT_TEST(testWindowState);
-    CPPUNIT_TEST(testScroll);
-    CPPUNIT_TEST(testMacroKeyBinding);
-
-    CPPUNIT_TEST(testVba);
-    CPPUNIT_TEST(testTdf149579);
-    CPPUNIT_TEST(testVbaRangeSort);
-    CPPUNIT_TEST(testTdf107885);
-    CPPUNIT_TEST(testTdf131562);
-    CPPUNIT_TEST(testTdf52602);
-    CPPUNIT_TEST(testTdf107902);
-    CPPUNIT_TEST(testTdf90278);
-    CPPUNIT_TEST(testTdf149531);
-    CPPUNIT_TEST(testTdf118247);
-    CPPUNIT_TEST(testTdf126457);
-    CPPUNIT_TEST(testVbaPDFExport);
-    CPPUNIT_TEST(testForEachInSelection);
-    CPPUNIT_TEST(testNonAsciiMacroIRI);
-    CPPUNIT_TEST_SUITE_END();
 };
 
-void VBAMacroTest::testSimpleCopyAndPaste()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testSimpleCopyAndPaste)
 {
     // Copy-paste values in the same sheet
 
@@ -138,7 +86,7 @@ void VBAMacroTest::testSimpleCopyAndPaste()
     CPPUNIT_ASSERT_EQUAL(30.0, rDoc.GetValue(ScAddress(1, 5, 0)));
 }
 
-void VBAMacroTest::testMultiDocumentCopyAndPaste()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testMultiDocumentCopyAndPaste)
 {
     // Creates a new workbook (document) and copy-pastes values
     // between the documents.
@@ -172,7 +120,7 @@ void VBAMacroTest::testMultiDocumentCopyAndPaste()
     CPPUNIT_ASSERT_EQUAL(0.0, rDoc.GetValue(ScAddress(1, 3, 0)));
 }
 
-void VBAMacroTest::testSheetAndColumnSelectAndHide()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testSheetAndColumnSelectAndHide)
 {
     loadFromURL(u"SheetAndColumnSelectAndHide.xlsm");
 
@@ -233,7 +181,7 @@ void VBAMacroTest::testSheetAndColumnSelectAndHide()
     CPPUNIT_ASSERT_EQUAL(SCTAB(0), rViewData.GetTabNo());
 }
 
-void VBAMacroTest::testPrintArea()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testPrintArea)
 {
     // Sets the print area to A1:B5
     // ActiveSheet.PageSetup.PrintArea = "$A$1:$B$5"
@@ -258,7 +206,7 @@ void VBAMacroTest::testPrintArea()
     }
 }
 
-void VBAMacroTest::testSelectAllChaged()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testSelectAllChaged)
 {
     // Columns("A:A").Select
     // Range(Selection, Selection.End(xlToRight)).Select
@@ -280,7 +228,7 @@ void VBAMacroTest::testSelectAllChaged()
     CPPUNIT_ASSERT_EQUAL(ScRange(0, 0, 0, 4, MAXROW, 0), pViewData.GetMarkData().GetMarkArea());
 }
 
-void VBAMacroTest::testRangeSelect()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testRangeSelect)
 {
     // Range("B2").Select
     // Range(Selection, Selection.End(xlToRight)).Select
@@ -302,7 +250,7 @@ void VBAMacroTest::testRangeSelect()
     CPPUNIT_ASSERT_EQUAL(ScRange(1, 1, 0, 4, 1, 0), pViewData.GetMarkData().GetMarkArea());
 }
 
-void VBAMacroTest::testWindowState()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testWindowState)
 {
     // Application.WindowState = xlMinimized
     // Application.WindowState = xlMaximized
@@ -313,7 +261,7 @@ void VBAMacroTest::testWindowState()
                  "location=document");
 }
 
-void VBAMacroTest::testScroll()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testScroll)
 {
     // ActiveWindow.ScrollColumn = 30
     // ActiveWindow.ScrollRow = 100
@@ -340,7 +288,7 @@ void VBAMacroTest::testScroll()
     CPPUNIT_ASSERT_EQUAL(SCROW(99), rViewData.GetPosY(ScVSplitPos::SC_SPLIT_BOTTOM));
 }
 
-void VBAMacroTest::testMacroKeyBinding()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testMacroKeyBinding)
 {
     // key_U() -> CTRL+U
     // key_T() -> CTRL+T
@@ -375,7 +323,7 @@ void VBAMacroTest::testMacroKeyBinding()
         xAccelerator->getCommandByKeyEvent(aCtrlT));
 }
 
-void VBAMacroTest::testVba()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba)
 {
     TestMacroInfo testInfo[] = {
         { OUString("TestAddress."),
@@ -520,7 +468,7 @@ void VBAMacroTest::testVba()
     }
 }
 
-void VBAMacroTest::testTdf149579()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf149579)
 {
     mxComponent = loadFromDesktop("private:factory/scalc");
 
@@ -553,7 +501,7 @@ void VBAMacroTest::testTdf149579()
     CPPUNIT_ASSERT_EQUAL(10.0, rDoc.GetValue(ScAddress(0, 2, 0)));
 }
 
-void VBAMacroTest::testVbaRangeSort()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVbaRangeSort)
 {
     mxComponent = loadFromDesktop("private:factory/scalc");
 
@@ -601,7 +549,7 @@ void VBAMacroTest::testVbaRangeSort()
     CPPUNIT_ASSERT_EQUAL(0.5, rDoc.GetValue(ScAddress(0, 2, 0)));
 }
 
-void VBAMacroTest::testTdf107885()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf107885)
 {
     loadFromURL(u"tdf107885.xlsm");
 
@@ -636,7 +584,7 @@ void VBAMacroTest::testTdf107885()
     CPPUNIT_ASSERT(!rDoc.RowHidden(4, 0));
 }
 
-void VBAMacroTest::testTdf131562()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf131562)
 {
     loadFromURL(u"tdf131562.xlsm");
 
@@ -657,7 +605,7 @@ void VBAMacroTest::testTdf131562()
     CPPUNIT_ASSERT_EQUAL(OUString("1 .cat"), rDoc.GetString(ScAddress(0, 3, 0)));
 }
 
-void VBAMacroTest::testTdf52602()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf52602)
 {
     loadFromURL(u"tdf52602.xls");
 
@@ -684,7 +632,8 @@ void VBAMacroTest::testTdf52602()
     CPPUNIT_ASSERT_EQUAL(OUString("1/ Mar 2012"), rDoc.GetString(ScAddress(5, 0, 0)));
     CPPUNIT_ASSERT_EQUAL(OUString("1/ Mar 2012"), rDoc.GetString(ScAddress(5, 1, 0)));
 }
-void VBAMacroTest::testTdf107902()
+
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf107902)
 {
     loadFromURL(u"tdf107902.xlsm");
 
@@ -712,7 +661,7 @@ void VBAMacroTest::testTdf107902()
     CPPUNIT_ASSERT(rDoc.RowHidden(4, 0));
 }
 
-void VBAMacroTest::testTdf90278()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf90278)
 {
     loadFromURL(u"tdf90278.xls");
 
@@ -727,7 +676,7 @@ void VBAMacroTest::testTdf90278()
     CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aReturnValue);
 }
 
-void VBAMacroTest::testTdf149531()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf149531)
 {
     loadFromURL(u"tdf149531.xls");
 
@@ -750,7 +699,7 @@ void VBAMacroTest::testTdf149531()
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(25749), nWidth);
 }
 
-void VBAMacroTest::testTdf118247()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf118247)
 {
     loadFromURL(u"tdf118247.xlsm");
 
@@ -780,7 +729,7 @@ void VBAMacroTest::testTdf118247()
     }
 }
 
-void VBAMacroTest::testTdf126457()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf126457)
 {
     auto xComponent = loadFromDesktop("private:factory/scalc");
 
@@ -842,7 +791,7 @@ void VBAMacroTest::testTdf126457()
     pDocSh->DoClose();
 }
 
-void VBAMacroTest::testVbaPDFExport()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVbaPDFExport)
 {
     mxComponent = loadFromDesktop("private:factory/scalc");
 
@@ -879,7 +828,7 @@ void VBAMacroTest::testVbaPDFExport()
     CPPUNIT_ASSERT_MESSAGE("Failed to get the pdf document", aDocument.Read(aStream));
 }
 
-void VBAMacroTest::testForEachInSelection()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testForEachInSelection)
 {
     loadFromURL(u"ForEachInSelection.ods");
     SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent);
@@ -906,7 +855,7 @@ void VBAMacroTest::testForEachInSelection()
     CPPUNIT_ASSERT_EQUAL(OUString("zab"), rDoc.GetString(ScAddress(0, 2, 0)));
 }
 
-void VBAMacroTest::testNonAsciiMacroIRI()
+CPPUNIT_TEST_FIXTURE(VBAMacroTest, testNonAsciiMacroIRI)
 {
     loadFromURL(u"ForEachInSelection.ods");
     SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent);
@@ -933,8 +882,6 @@ void VBAMacroTest::testNonAsciiMacroIRI()
     CPPUNIT_ASSERT_EQUAL(OUString("zab"), rDoc.GetString(ScAddress(0, 2, 0)));
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION(VBAMacroTest);
-
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */