CppunitTest_sc_opencl-2: use CPPUNIT_TEST_FIXTURE()

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

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

1 files changed, 112 insertions, 342 deletions

diff --git a/sc/qa/unit/opencl-test-2.cxx b/sc/qa/unit/opencl-test-2.cxx
index a53613560e71..4c7fbdbcb96d 100644
--- a/sc/qa/unit/opencl-test-2.cxx
+++ b/sc/qa/unit/opencl-test-2.cxx
@@ -20,237 +20,9 @@ class ScOpenCLTest2
 {
 public:
     ScOpenCLTest2();
-
-    void testStatisticalFormulaFDist();
-    void testStatisticalFormulaVar();
-    void testStatisticalFormulaChiDist();
-    void testMathFormulaPower();
-    void testMathFormulaOdd();
-    void testStatisticalFormulaChiSqDist();
-    void testStatisticalFormulaChiSqInv();
-    void testStatisticalFormulaGammaInv();
-    void testMathFormulaFloor();
-    void testStatisticalFormulaFInv();
-    void testStatisticalFormulaFTest();
-    void testStatisticalFormulaB();
-    void testStatisticalFormulaBetaDist();
-    void testMathFormulaCscH();
-    void testMathFormulaExp();
-    void testMathFormulaLog10();
-    void testStatisticalFormulaExpondist();
-    void testMathAverageIfsFormula();
-    void testMathCountIfsFormula();
-    void testMathFormulaCombina();
-    void testMathFormulaEven();
-    void testMathFormulaLog();
-    void testMathFormulaMod();
-    void testMathFormulaTrunc();
-    void testStatisticalFormulaSkew();
-    void testMathFormulaArcTan2();
-    void testMathFormulaBitOr();
-    void testMathFormulaBitLshift();
-    void testMathFormulaBitRshift();
-    void testMathFormulaBitXor();
-    void testStatisticalFormulaChiInv();
-    void testStatisticalFormulaPoisson();
-    void testMathFormulaSumSQ();
-    void testStatisticalFormulaSkewp();
-    void testMathFormulaSqrtPi();
-    void testStatisticalFormulaBinomDist();
-    void testStatisticalFormulaVarP();
-    void testMathFormulaCeil();
-    void testMathFormulaKombin();
-    void testStatisticalFormulaDevSq();
-    void testStatisticalFormulaStDev();
-    void testStatisticalFormulaSlope();
-    void testStatisticalFormulaSTEYX();
-    void testStatisticalFormulaZTest();
-    void testMathFormulaPi();
-    void testMathFormulaRandom();
-    void testMathFormulaConvert();
-    void testMathFormulaProduct();
-    void testStatisticalFormulaHypGeomDist();
-    void testArrayFormulaSumX2MY2();
-    void testArrayFormulaSumX2PY2();
-    void testStatisticalFormulaBetainv();
-    void testStatisticalFormulaTTest();
-    void testStatisticalFormulaTDist();
-    void testStatisticalFormulaTInv();
-    void testArrayFormulaSumXMY2();
-    void testStatisticalFormulaStDevP();
-    void testStatisticalFormulaCovar();
-    void testLogicalFormulaAnd();
-    void testLogicalFormulaOr();
-    void testMathFormulaSumProduct();
-    void testMathFormulaSumProduct2();
-    void testStatisticalParallelCountBug();
-    void testSpreadSheetFormulaVLookup();
-    void testLogicalFormulaNot();
-    void testLogicalFormulaXor();
-    void testDatabaseFormulaDmax();
-    void testDatabaseFormulaDmin();
-    void testDatabaseFormulaDproduct();
-    void testDatabaseFormulaDaverage();
-    void testDatabaseFormulaDstdev();
-    void testDatabaseFormulaDstdevp();
-    void testDatabaseFormulaDsum();
-    void testDatabaseFormulaDvar();
-    void testDatabaseFormulaDvarp();
-    void testMathFormulaAverageIf();
-    void testDatabaseFormulaDcount();
-    void testDatabaseFormulaDcountA();
-    void testMathFormulaDegrees();
-    void testMathFormulaRoundUp();
-    void testMathFormulaRoundDown();
-    void testMathFormulaInt();
-    void testMathFormulaRadians();
-    void testMathFormulaCountIf();
-    void testMathFormulaIsEven();
-    void testMathFormulaIsOdd();
-    void testMathFormulaFact();
-    void testStatisticalFormulaMina();
-    void testStatisticalFormulaCountA();
-    void testStatisticalFormulaMaxa();
-    void testStatisticalFormulaAverageA();
-    void testStatisticalFormulaVarA();
-    void testStatisticalFormulaVarPA();
-    void testStatisticalFormulaStDevA();
-    void testStatisticalFormulaStDevPA();
-    void testMathFormulaSEC();
-    void testMathFormulaSECH();
-    void testMathFormulaMROUND();
-    void testMathFormulaSeriesSum();
-    void testMathFormulaQuotient();
-    void testMathFormulaSumIf();
-    void testAddInFormulaBesseLJ();
-    void testNegSub();
-    void testStatisticalFormulaAvedev();
-    void testMathFormulaAverageIf_Mix();
-    void testStatisticalFormulaKurt1();
-    void testStatisticalFormulaHarMean1();
-    void testStatisticalFormulaVarA1();
-    void testStatisticalFormulaVarPA1();
-    void testStatisticalFormulaStDevA1();
-    void testStatisticalFormulaStDevPA1();
-    void testFinancialMDurationFormula1();
-
-    CPPUNIT_TEST_SUITE(ScOpenCLTest2);
-    CPPUNIT_TEST(testStatisticalFormulaFDist);
-    CPPUNIT_TEST(testStatisticalFormulaVar);
-    CPPUNIT_TEST(testStatisticalFormulaChiDist);
-    CPPUNIT_TEST(testMathFormulaPower);
-    CPPUNIT_TEST(testMathFormulaOdd);
-    CPPUNIT_TEST(testStatisticalFormulaChiSqDist);
-    CPPUNIT_TEST(testStatisticalFormulaChiSqInv);
-    CPPUNIT_TEST(testStatisticalFormulaGammaInv);
-    CPPUNIT_TEST(testMathFormulaFloor);
-    CPPUNIT_TEST(testStatisticalFormulaFInv);
-    CPPUNIT_TEST(testStatisticalFormulaFTest);
-    CPPUNIT_TEST(testStatisticalFormulaB);
-    CPPUNIT_TEST(testStatisticalFormulaBetaDist);
-    CPPUNIT_TEST(testMathFormulaCscH);
-    CPPUNIT_TEST(testMathFormulaExp);
-    CPPUNIT_TEST(testMathFormulaLog10);
-    CPPUNIT_TEST(testStatisticalFormulaExpondist);
-    CPPUNIT_TEST(testMathAverageIfsFormula);
-    CPPUNIT_TEST(testMathCountIfsFormula);
-    CPPUNIT_TEST(testMathFormulaCombina);
-    CPPUNIT_TEST(testMathFormulaEven);
-    CPPUNIT_TEST(testMathFormulaLog);
-    CPPUNIT_TEST(testMathFormulaMod);
-    CPPUNIT_TEST(testMathFormulaTrunc);
-    CPPUNIT_TEST(testStatisticalFormulaSkew);
-    CPPUNIT_TEST(testMathFormulaArcTan2);
-    CPPUNIT_TEST(testMathFormulaBitOr);
-    CPPUNIT_TEST(testMathFormulaBitLshift);
-    CPPUNIT_TEST(testMathFormulaBitRshift);
-    CPPUNIT_TEST(testMathFormulaBitXor);
-    CPPUNIT_TEST(testStatisticalFormulaChiInv);
-    CPPUNIT_TEST(testStatisticalFormulaPoisson);
-    CPPUNIT_TEST(testMathFormulaSumSQ);
-    CPPUNIT_TEST(testStatisticalFormulaSkewp);
-    CPPUNIT_TEST(testMathFormulaSqrtPi);
-    CPPUNIT_TEST(testStatisticalFormulaBinomDist);
-    CPPUNIT_TEST(testStatisticalFormulaVarP);
-    CPPUNIT_TEST(testMathFormulaCeil);
-    CPPUNIT_TEST(testMathFormulaKombin);
-    CPPUNIT_TEST(testStatisticalFormulaDevSq);
-    CPPUNIT_TEST(testStatisticalFormulaStDev);
-    CPPUNIT_TEST(testStatisticalFormulaSlope);
-    CPPUNIT_TEST(testStatisticalFormulaSTEYX);
-    CPPUNIT_TEST(testStatisticalFormulaZTest);
-    CPPUNIT_TEST(testMathFormulaPi);
-    CPPUNIT_TEST(testMathFormulaRandom);
-    CPPUNIT_TEST(testMathFormulaConvert);
-    CPPUNIT_TEST(testMathFormulaProduct);
-    CPPUNIT_TEST(testStatisticalFormulaHypGeomDist);
-    CPPUNIT_TEST(testArrayFormulaSumX2MY2);
-    CPPUNIT_TEST(testArrayFormulaSumX2PY2);
-    CPPUNIT_TEST(testStatisticalFormulaBetainv);
-    CPPUNIT_TEST(testStatisticalFormulaTTest);
-    CPPUNIT_TEST(testStatisticalFormulaTDist);
-    CPPUNIT_TEST(testStatisticalFormulaTInv);
-    CPPUNIT_TEST(testArrayFormulaSumXMY2);
-    CPPUNIT_TEST(testStatisticalFormulaStDevP);
-    CPPUNIT_TEST(testStatisticalFormulaCovar);
-    CPPUNIT_TEST(testLogicalFormulaAnd);
-    CPPUNIT_TEST(testMathFormulaSumProduct);
-    CPPUNIT_TEST(testMathFormulaSumProduct2);
-    CPPUNIT_TEST(testStatisticalParallelCountBug);
-    CPPUNIT_TEST(testSpreadSheetFormulaVLookup);
-    CPPUNIT_TEST(testLogicalFormulaOr);
-    CPPUNIT_TEST(testLogicalFormulaNot);
-    CPPUNIT_TEST(testLogicalFormulaXor);
-    CPPUNIT_TEST(testDatabaseFormulaDmax);
-    CPPUNIT_TEST(testDatabaseFormulaDmin);
-    CPPUNIT_TEST(testDatabaseFormulaDproduct);
-    CPPUNIT_TEST(testDatabaseFormulaDaverage);
-    CPPUNIT_TEST(testDatabaseFormulaDstdev);
-    CPPUNIT_TEST(testDatabaseFormulaDstdevp);
-    CPPUNIT_TEST(testDatabaseFormulaDsum);
-    CPPUNIT_TEST(testDatabaseFormulaDvar);
-    CPPUNIT_TEST(testDatabaseFormulaDvarp);
-    CPPUNIT_TEST(testMathFormulaAverageIf);
-    CPPUNIT_TEST(testDatabaseFormulaDcount);
-    CPPUNIT_TEST(testDatabaseFormulaDcountA);
-    CPPUNIT_TEST(testMathFormulaDegrees);
-    CPPUNIT_TEST(testMathFormulaRoundUp);
-    CPPUNIT_TEST(testMathFormulaRoundDown);
-    CPPUNIT_TEST(testMathFormulaInt);
-    CPPUNIT_TEST(testMathFormulaRadians);
-    CPPUNIT_TEST(testMathFormulaCountIf);
-    CPPUNIT_TEST(testMathFormulaIsEven);
-    CPPUNIT_TEST(testMathFormulaIsOdd);
-    CPPUNIT_TEST(testMathFormulaFact);
-    CPPUNIT_TEST(testStatisticalFormulaMaxa);
-    CPPUNIT_TEST(testStatisticalFormulaMina);
-    CPPUNIT_TEST(testStatisticalFormulaCountA);
-    CPPUNIT_TEST(testStatisticalFormulaAverageA);
-    CPPUNIT_TEST(testStatisticalFormulaVarA);
-    CPPUNIT_TEST(testStatisticalFormulaVarPA);
-    CPPUNIT_TEST(testStatisticalFormulaStDevA);
-    CPPUNIT_TEST(testStatisticalFormulaStDevPA);
-    CPPUNIT_TEST(testMathFormulaSEC);
-    CPPUNIT_TEST(testMathFormulaSECH);
-    CPPUNIT_TEST(testMathFormulaMROUND);
-    CPPUNIT_TEST(testMathFormulaQuotient);
-    CPPUNIT_TEST(testMathFormulaSeriesSum);
-    CPPUNIT_TEST(testMathFormulaSumIf);
-    CPPUNIT_TEST(testAddInFormulaBesseLJ);
-    CPPUNIT_TEST(testNegSub);
-    CPPUNIT_TEST(testStatisticalFormulaAvedev);
-    CPPUNIT_TEST(testMathFormulaAverageIf_Mix);
-    CPPUNIT_TEST(testStatisticalFormulaKurt1);
-    CPPUNIT_TEST(testStatisticalFormulaHarMean1);
-    CPPUNIT_TEST(testStatisticalFormulaVarA1);
-    CPPUNIT_TEST(testStatisticalFormulaVarPA1);
-    CPPUNIT_TEST(testStatisticalFormulaStDevA1);
-    CPPUNIT_TEST(testStatisticalFormulaStDevPA1);
-    CPPUNIT_TEST(testFinancialMDurationFormula1);
-    CPPUNIT_TEST_SUITE_END();
 };
 
-void ScOpenCLTest2::testMathFormulaPi()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaPi)
 {
     initTestEnv(u"xls/opencl/math/pi.xls");
     ScDocument* pDoc = getScDoc();
@@ -265,7 +37,7 @@ void ScOpenCLTest2::testMathFormulaPi()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaRandom()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaRandom)
 {
     initTestEnv(u"xls/opencl/math/random.xls");
     ScDocument* pDoc = getScDoc();
@@ -281,7 +53,7 @@ void ScOpenCLTest2::testMathFormulaRandom()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaSumSQ()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaSumSQ)
 {
     initTestEnv(u"xls/opencl/math/sumsq.xls");
     ScDocument* pDoc = getScDoc();
@@ -296,7 +68,7 @@ void ScOpenCLTest2::testMathFormulaSumSQ()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaVar()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaVar)
 {
     initTestEnv(u"xls/opencl/statistical/Var.xls");
     ScDocument* pDoc = getScDoc();
@@ -312,7 +84,7 @@ void ScOpenCLTest2::testStatisticalFormulaVar()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaSkew()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaSkew)
 {
     initTestEnv(u"xls/opencl/statistical/Skew.xls");
     ScDocument* pDoc = getScDoc();
@@ -328,7 +100,7 @@ void ScOpenCLTest2::testStatisticalFormulaSkew()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaSkewp()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaSkewp)
 {
     initTestEnv(u"xls/opencl/statistical/Skewp.xls");
     ScDocument* pDoc = getScDoc();
@@ -344,7 +116,7 @@ void ScOpenCLTest2::testStatisticalFormulaSkewp()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaTrunc()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaTrunc)
 {
     initTestEnv(u"xls/opencl/math/trunc.xls");
     ScDocument* pDoc = getScDoc();
@@ -359,7 +131,7 @@ void ScOpenCLTest2::testMathFormulaTrunc()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaCovar()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaCovar)
 {
     initTestEnv(u"xls/opencl/statistical/Covar.xls");
     ScDocument* pDoc = getScDoc();
@@ -375,7 +147,7 @@ void ScOpenCLTest2::testStatisticalFormulaCovar()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaDevSq()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaDevSq)
 {
     initTestEnv(u"xls/opencl/statistical/DevSq.xls");
     ScDocument* pDoc = getScDoc();
@@ -391,7 +163,7 @@ void ScOpenCLTest2::testStatisticalFormulaDevSq()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaCscH()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaCscH)
 {
     initTestEnv(u"ods/opencl/math/csch.ods");
     ScDocument* pDoc = getScDoc();
@@ -406,7 +178,7 @@ void ScOpenCLTest2::testMathFormulaCscH()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaPower()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaPower)
 {
     initTestEnv(u"ods/opencl/math/power.ods");
     ScDocument* pDoc = getScDoc();
@@ -421,7 +193,7 @@ void ScOpenCLTest2::testMathFormulaPower()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaChiSqDist()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaChiSqDist)
 {
     initTestEnv(u"ods/opencl/statistical/CHISQDIST.ods");
     ScDocument* pDoc = getScDoc();
@@ -443,7 +215,7 @@ void ScOpenCLTest2::testStatisticalFormulaChiSqDist()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaFDist()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaFDist)
 {
     initTestEnv(u"xls/opencl/statistical/Fdist.xls");
     ScDocument* pDoc = getScDoc();
@@ -459,7 +231,7 @@ void ScOpenCLTest2::testStatisticalFormulaFDist()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaArcTan2()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaArcTan2)
 {
     initTestEnv(u"ods/opencl/math/ArcTan2.ods");
     ScDocument* pDoc = getScDoc();
@@ -475,7 +247,7 @@ void ScOpenCLTest2::testMathFormulaArcTan2()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaChiSqInv()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaChiSqInv)
 {
     initTestEnv(u"ods/opencl/statistical/CHISQINV.ods");
     ScDocument* pDoc = getScDoc();
@@ -491,7 +263,7 @@ void ScOpenCLTest2::testStatisticalFormulaChiSqInv()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaPoisson()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaPoisson)
 {
     initTestEnv(u"xls/opencl/statistical/Poisson.xls");
     ScDocument* pDoc = getScDoc();
@@ -507,7 +279,7 @@ void ScOpenCLTest2::testStatisticalFormulaPoisson()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaExpondist()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaExpondist)
 {
     initTestEnv(u"xls/opencl/statistical/Expondist.xls");
     ScDocument* pDoc = getScDoc();
@@ -523,7 +295,7 @@ void ScOpenCLTest2::testStatisticalFormulaExpondist()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaBitOr()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaBitOr)
 {
     initTestEnv(u"ods/opencl/math/BitOr.ods");
     ScDocument* pDoc = getScDoc();
@@ -539,7 +311,7 @@ void ScOpenCLTest2::testMathFormulaBitOr()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaOdd()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaOdd)
 {
     initTestEnv(u"xls/opencl/math/odd.xls");
     ScDocument* pDoc = getScDoc();
@@ -554,7 +326,7 @@ void ScOpenCLTest2::testMathFormulaOdd()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaMod()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaMod)
 {
     initTestEnv(u"xls/opencl/math/mod.xls");
     ScDocument* pDoc = getScDoc();
@@ -572,7 +344,7 @@ void ScOpenCLTest2::testMathFormulaMod()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaGammaInv()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaGammaInv)
 {
     initTestEnv(u"xls/opencl/statistical/GammaInv.xls");
     ScDocument* pDoc = getScDoc();
@@ -591,7 +363,7 @@ void ScOpenCLTest2::testStatisticalFormulaGammaInv()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaFInv()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaFInv)
 {
     initTestEnv(u"xls/opencl/statistical/FInv.xls");
     ScDocument* pDoc = getScDoc();
@@ -610,7 +382,7 @@ void ScOpenCLTest2::testStatisticalFormulaFInv()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaFTest()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaFTest)
 {
     initTestEnv(u"xls/opencl/statistical/FTest.xls");
     ScDocument* pDoc = getScDoc();
@@ -626,7 +398,7 @@ void ScOpenCLTest2::testStatisticalFormulaFTest()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaB()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaB)
 {
     initTestEnv(u"xls/opencl/statistical/B.xls");
     ScDocument* pDoc = getScDoc();
@@ -645,7 +417,7 @@ void ScOpenCLTest2::testStatisticalFormulaB()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaBetaDist()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaBetaDist)
 {
     initTestEnv(u"ods/opencl/statistical/BetaDist.ods");
     ScDocument* pDoc = getScDoc();
@@ -664,7 +436,7 @@ void ScOpenCLTest2::testStatisticalFormulaBetaDist()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaEven()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaEven)
 {
     initTestEnv(u"xls/opencl/math/even.xls");
     ScDocument* pDoc = getScDoc();
@@ -679,7 +451,7 @@ void ScOpenCLTest2::testMathFormulaEven()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaExp()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaExp)
 {
     initTestEnv(u"ods/opencl/math/exp.ods");
     ScDocument* pDoc = getScDoc();
@@ -694,7 +466,7 @@ void ScOpenCLTest2::testMathFormulaExp()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaChiDist()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaChiDist)
 {
     initTestEnv(u"xls/opencl/statistical/ChiDist.xls");
     ScDocument* pDoc = getScDoc();
@@ -710,7 +482,7 @@ void ScOpenCLTest2::testStatisticalFormulaChiDist()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaBitLshift()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaBitLshift)
 {
     initTestEnv(u"ods/opencl/math/BitLshift.ods");
     ScDocument* pDoc = getScDoc();
@@ -726,7 +498,7 @@ void ScOpenCLTest2::testMathFormulaBitLshift()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaBitRshift()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaBitRshift)
 {
     initTestEnv(u"ods/opencl/math/BitRshift.ods");
     ScDocument* pDoc = getScDoc();
@@ -742,7 +514,7 @@ void ScOpenCLTest2::testMathFormulaBitRshift()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaFloor()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaFloor)
 {
     initTestEnv(u"ods/opencl/math/floor.ods");
     ScDocument* pDoc = getScDoc();
@@ -757,7 +529,7 @@ void ScOpenCLTest2::testMathFormulaFloor()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaLog()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaLog)
 {
     initTestEnv(u"xls/opencl/math/log.xls");
     ScDocument* pDoc = getScDoc();
@@ -772,7 +544,7 @@ void ScOpenCLTest2::testMathFormulaLog()
     }
 }
 
-void ScOpenCLTest2::testSpreadSheetFormulaVLookup()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testSpreadSheetFormulaVLookup)
 {
     initTestEnv(u"xls/opencl/spreadsheet/VLookup.xls");
     ScDocument* pDoc = getScDoc();
@@ -794,7 +566,7 @@ void ScOpenCLTest2::testSpreadSheetFormulaVLookup()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaChiInv()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaChiInv)
 {
     initTestEnv(u"xls/opencl/statistical/ChiInv.xls");
     ScDocument* pDoc = getScDoc();
@@ -810,7 +582,7 @@ void ScOpenCLTest2::testStatisticalFormulaChiInv()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaConvert()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaConvert)
 {
     initTestEnv(u"xls/opencl/math/convert.xls");
     ScDocument* pDoc = getScDoc();
@@ -825,7 +597,7 @@ void ScOpenCLTest2::testMathFormulaConvert()
     }
 }
 
-void ScOpenCLTest2::testMathCountIfsFormula()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathCountIfsFormula)
 {
     initTestEnv(u"xls/opencl/math/countifs.xls");
     ScDocument* pDoc = getScDoc();
@@ -841,7 +613,7 @@ void ScOpenCLTest2::testMathCountIfsFormula()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaBitXor()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaBitXor)
 {
     initTestEnv(u"ods/opencl/math/BitXor.ods");
     ScDocument* pDoc = getScDoc();
@@ -857,7 +629,7 @@ void ScOpenCLTest2::testMathFormulaBitXor()
     }
 }
 
-void ScOpenCLTest2::testMathAverageIfsFormula()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathAverageIfsFormula)
 {
     initTestEnv(u"xls/opencl/math/averageifs.xls");
     ScDocument* pDoc = getScDoc();
@@ -874,7 +646,7 @@ void ScOpenCLTest2::testMathAverageIfsFormula()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaLog10()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaLog10)
 {
     initTestEnv(u"ods/opencl/math/log10.ods");
     ScDocument* pDoc = getScDoc();
@@ -889,7 +661,7 @@ void ScOpenCLTest2::testMathFormulaLog10()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaCombina()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaCombina)
 {
     initTestEnv(u"xls/opencl/math/combina.xls");
     ScDocument* pDoc = getScDoc();
@@ -904,7 +676,7 @@ void ScOpenCLTest2::testMathFormulaCombina()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaCeil()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaCeil)
 {
     initTestEnv(u"ods/opencl/math/Ceil.ods");
     ScDocument* pDoc = getScDoc();
@@ -920,7 +692,7 @@ void ScOpenCLTest2::testMathFormulaCeil()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaSqrtPi()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaSqrtPi)
 {
     initTestEnv(u"xls/opencl/math/sqrtpi.xls");
     ScDocument* pDoc = getScDoc();
@@ -935,7 +707,7 @@ void ScOpenCLTest2::testMathFormulaSqrtPi()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaVarP()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaVarP)
 {
     initTestEnv(u"xls/opencl/statistical/VarP.xls");
     ScDocument* pDoc = getScDoc();
@@ -951,7 +723,7 @@ void ScOpenCLTest2::testStatisticalFormulaVarP()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaStDev()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaStDev)
 {
     initTestEnv(u"xls/opencl/statistical/StDev.xls");
     ScDocument* pDoc = getScDoc();
@@ -967,7 +739,7 @@ void ScOpenCLTest2::testStatisticalFormulaStDev()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaStDevP()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaStDevP)
 {
     initTestEnv(u"xls/opencl/statistical/StDevP.xls");
     ScDocument* pDoc = getScDoc();
@@ -983,7 +755,7 @@ void ScOpenCLTest2::testStatisticalFormulaStDevP()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaSlope()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaSlope)
 {
     initTestEnv(u"xls/opencl/statistical/Slope.xls");
     ScDocument* pDoc = getScDoc();
@@ -999,7 +771,7 @@ void ScOpenCLTest2::testStatisticalFormulaSlope()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaSTEYX()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaSTEYX)
 {
     initTestEnv(u"xls/opencl/statistical/STEYX.xls");
     ScDocument* pDoc = getScDoc();
@@ -1015,7 +787,7 @@ void ScOpenCLTest2::testStatisticalFormulaSTEYX()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaZTest()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaZTest)
 {
     initTestEnv(u"xls/opencl/statistical/ZTest.xls");
     ScDocument* pDoc = getScDoc();
@@ -1031,7 +803,7 @@ void ScOpenCLTest2::testStatisticalFormulaZTest()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaTTest()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaTTest)
 {
     initTestEnv(u"xls/opencl/statistical/TTest.xls");
     ScDocument* pDoc = getScDoc();
@@ -1047,7 +819,7 @@ void ScOpenCLTest2::testStatisticalFormulaTTest()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaTDist()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaTDist)
 {
     initTestEnv(u"xls/opencl/statistical/TDist.xls");
     ScDocument* pDoc = getScDoc();
@@ -1063,7 +835,7 @@ void ScOpenCLTest2::testStatisticalFormulaTDist()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaTInv()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaTInv)
 {
     initTestEnv(u"xls/opencl/statistical/TInv.xls");
     ScDocument* pDoc = getScDoc();
@@ -1079,7 +851,7 @@ void ScOpenCLTest2::testStatisticalFormulaTInv()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaBinomDist()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaBinomDist)
 {
     initTestEnv(u"xls/opencl/statistical/BinomDist.xls");
     ScDocument* pDoc = getScDoc();
@@ -1095,7 +867,7 @@ void ScOpenCLTest2::testStatisticalFormulaBinomDist()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaProduct()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaProduct)
 {
     initTestEnv(u"xls/opencl/math/product.xls");
     ScDocument* pDoc = getScDoc();
@@ -1110,7 +882,7 @@ void ScOpenCLTest2::testMathFormulaProduct()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaKombin()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaKombin)
 {
     initTestEnv(u"ods/opencl/math/Kombin.ods");
     ScDocument* pDoc = getScDoc();
@@ -1126,7 +898,7 @@ void ScOpenCLTest2::testMathFormulaKombin()
     }
 }
 
-void ScOpenCLTest2:: testArrayFormulaSumX2MY2()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testArrayFormulaSumX2MY2)
 {
     initTestEnv(u"xls/opencl/array/SUMX2MY2.xls");
     ScDocument* pDoc = getScDoc();
@@ -1147,7 +919,7 @@ void ScOpenCLTest2:: testArrayFormulaSumX2MY2()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaHypGeomDist()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaHypGeomDist)
 {
     initTestEnv(u"xls/opencl/statistical/HypGeomDist.xls");
     ScDocument* pDoc = getScDoc();
@@ -1163,7 +935,7 @@ void ScOpenCLTest2::testStatisticalFormulaHypGeomDist()
     }
 }
 
-void ScOpenCLTest2:: testArrayFormulaSumX2PY2()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testArrayFormulaSumX2PY2)
 {
     initTestEnv(u"xls/opencl/array/SUMX2PY2.xls");
     ScDocument* pDoc = getScDoc();
@@ -1184,7 +956,7 @@ void ScOpenCLTest2:: testArrayFormulaSumX2PY2()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaBetainv()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaBetainv)
 {
     initTestEnv(u"xls/opencl/statistical/Betainv.xls");
     ScDocument* pDoc = getScDoc();
@@ -1200,7 +972,7 @@ void ScOpenCLTest2::testStatisticalFormulaBetainv()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaMina()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaMina)
 {
     initTestEnv(u"xls/opencl/statistical/Mina.xls");
     ScDocument* pDoc = getScDoc();
@@ -1215,7 +987,7 @@ void ScOpenCLTest2::testStatisticalFormulaMina()
     }
 }
 
-void ScOpenCLTest2:: testArrayFormulaSumXMY2()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testArrayFormulaSumXMY2)
 {
     initTestEnv(u"xls/opencl/array/SUMXMY2.xls");
     ScDocument* pDoc = getScDoc();
@@ -1236,7 +1008,7 @@ void ScOpenCLTest2:: testArrayFormulaSumXMY2()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaCountA()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaCountA)
 {
     initTestEnv(u"xls/opencl/statistical/counta.xls");
     ScDocument* pDoc = getScDoc();
@@ -1251,7 +1023,7 @@ void ScOpenCLTest2::testStatisticalFormulaCountA()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaMaxa()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaMaxa)
 {
     initTestEnv(u"xls/opencl/statistical/Maxa.xls");
     ScDocument* pDoc = getScDoc();
@@ -1266,7 +1038,7 @@ void ScOpenCLTest2::testStatisticalFormulaMaxa()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaSumProduct()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaSumProduct)
 {
     initTestEnv(u"xls/opencl/math/sumproduct_mixSliding.xls");
     ScDocument* pDoc = getScDoc();
@@ -1295,7 +1067,7 @@ void ScOpenCLTest2::testMathFormulaSumProduct()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaAverageIf()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaAverageIf)
 {
     initTestEnv(u"xls/opencl/math/averageif.xls");
     ScDocument* pDoc = getScDoc();
@@ -1310,7 +1082,7 @@ void ScOpenCLTest2::testMathFormulaAverageIf()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaAverageA()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaAverageA)
 {
     initTestEnv(u"xls/opencl/statistical/AverageA.xls");
     ScDocument* pDoc = getScDoc();
@@ -1325,7 +1097,7 @@ void ScOpenCLTest2::testStatisticalFormulaAverageA()
     }
 }
 
-void ScOpenCLTest2:: testLogicalFormulaAnd()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testLogicalFormulaAnd)
 {
     initTestEnv(u"xls/opencl/logical/and.xls");
     ScDocument* pDoc = getScDoc();
@@ -1346,7 +1118,7 @@ void ScOpenCLTest2:: testLogicalFormulaAnd()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaVarA()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaVarA)
 {
     initTestEnv(u"xls/opencl/statistical/VarA.xls");
     ScDocument* pDoc = getScDoc();
@@ -1362,7 +1134,7 @@ void ScOpenCLTest2::testStatisticalFormulaVarA()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaVarPA()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaVarPA)
 {
     initTestEnv(u"xls/opencl/statistical/VarPA.xls");
     ScDocument* pDoc = getScDoc();
@@ -1377,7 +1149,7 @@ void ScOpenCLTest2::testStatisticalFormulaVarPA()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaStDevA()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaStDevA)
 {
     initTestEnv(u"xls/opencl/statistical/StDevA.xls");
     ScDocument* pDoc = getScDoc();
@@ -1393,7 +1165,7 @@ void ScOpenCLTest2::testStatisticalFormulaStDevA()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaStDevPA()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaStDevPA)
 {
     initTestEnv(u"xls/opencl/statistical/StDevPA.xls");
     ScDocument* pDoc = getScDoc();
@@ -1409,7 +1181,7 @@ void ScOpenCLTest2::testStatisticalFormulaStDevPA()
     }
 }
 
-void ScOpenCLTest2:: testFinancialMDurationFormula1()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testFinancialMDurationFormula1)
 {
     initTestEnv(u"xls/opencl/financial/MDuration1.xls");
     ScDocument* pDoc = getScDoc();
@@ -1424,7 +1196,7 @@ void ScOpenCLTest2:: testFinancialMDurationFormula1()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaSumProduct2()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaSumProduct2)
 {
     initTestEnv(u"xls/opencl/math/sumproductTest.xls");
     ScDocument* pDoc = getScDoc();
@@ -1440,7 +1212,7 @@ void ScOpenCLTest2::testMathFormulaSumProduct2()
     }
 }
 
-void ScOpenCLTest2:: testStatisticalParallelCountBug()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalParallelCountBug)
 {
     initTestEnv(u"ods/opencl/statistical/parallel_count_bug_243.ods");
     ScDocument* pDoc = getScDoc();
@@ -1455,7 +1227,7 @@ void ScOpenCLTest2:: testStatisticalParallelCountBug()
     }
 }
 
-void ScOpenCLTest2:: testLogicalFormulaOr()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testLogicalFormulaOr)
 {
     initTestEnv(u"xls/opencl/logical/or.xls");
     ScDocument* pDoc = getScDoc();
@@ -1470,7 +1242,7 @@ void ScOpenCLTest2:: testLogicalFormulaOr()
     }
 }
 
-void ScOpenCLTest2:: testLogicalFormulaNot()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testLogicalFormulaNot)
 {
     initTestEnv(u"xls/opencl/logical/not.xls");
     ScDocument* pDoc = getScDoc();
@@ -1485,7 +1257,7 @@ void ScOpenCLTest2:: testLogicalFormulaNot()
     }
 }
 
-void ScOpenCLTest2:: testLogicalFormulaXor()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testLogicalFormulaXor)
 {
     initTestEnv(u"xls/opencl/logical/xor.xls");
     ScDocument* pDoc = getScDoc();
@@ -1500,7 +1272,7 @@ void ScOpenCLTest2:: testLogicalFormulaXor()
     }
 }
 
-void ScOpenCLTest2::testDatabaseFormulaDcount()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testDatabaseFormulaDcount)
 {
     initTestEnv(u"xls/opencl/database/dcount.xls");
     ScDocument* pDoc = getScDoc();
@@ -1516,7 +1288,7 @@ void ScOpenCLTest2::testDatabaseFormulaDcount()
     }
 }
 
-void ScOpenCLTest2::testDatabaseFormulaDcountA()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testDatabaseFormulaDcountA)
 {
     initTestEnv(u"xls/opencl/database/dcountA.xls");
     ScDocument* pDoc = getScDoc();
@@ -1532,7 +1304,7 @@ void ScOpenCLTest2::testDatabaseFormulaDcountA()
     }
 }
 
-void ScOpenCLTest2::testDatabaseFormulaDmax()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testDatabaseFormulaDmax)
 {
     initTestEnv(u"xls/opencl/database/dmax.xls");
     ScDocument* pDoc = getScDoc();
@@ -1548,7 +1320,7 @@ void ScOpenCLTest2::testDatabaseFormulaDmax()
     }
 }
 
-void ScOpenCLTest2::testDatabaseFormulaDmin()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testDatabaseFormulaDmin)
 {
     initTestEnv(u"xls/opencl/database/dmin.xls");
     ScDocument* pDoc = getScDoc();
@@ -1564,7 +1336,7 @@ void ScOpenCLTest2::testDatabaseFormulaDmin()
     }
 }
 
-void ScOpenCLTest2::testDatabaseFormulaDproduct()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testDatabaseFormulaDproduct)
 {
     initTestEnv(u"xls/opencl/database/dproduct.xls");
     ScDocument* pDoc = getScDoc();
@@ -1580,7 +1352,7 @@ void ScOpenCLTest2::testDatabaseFormulaDproduct()
     }
 }
 
-void ScOpenCLTest2::testDatabaseFormulaDaverage()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testDatabaseFormulaDaverage)
 {
     initTestEnv(u"xls/opencl/database/daverage.xls");
     ScDocument* pDoc = getScDoc();
@@ -1597,7 +1369,7 @@ void ScOpenCLTest2::testDatabaseFormulaDaverage()
     }
 }
 
-void ScOpenCLTest2::testDatabaseFormulaDstdev()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testDatabaseFormulaDstdev)
 {
     initTestEnv(u"xls/opencl/database/dstdev.xls");
     ScDocument* pDoc = getScDoc();
@@ -1614,7 +1386,7 @@ void ScOpenCLTest2::testDatabaseFormulaDstdev()
     }
 }
 
-void ScOpenCLTest2::testDatabaseFormulaDstdevp()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testDatabaseFormulaDstdevp)
 {
     initTestEnv(u"xls/opencl/database/dstdevp.xls");
     ScDocument* pDoc = getScDoc();
@@ -1631,7 +1403,7 @@ void ScOpenCLTest2::testDatabaseFormulaDstdevp()
     }
 }
 
-void ScOpenCLTest2::testDatabaseFormulaDsum()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testDatabaseFormulaDsum)
 {
     initTestEnv(u"xls/opencl/database/dsum.xls");
     ScDocument* pDoc = getScDoc();
@@ -1648,7 +1420,7 @@ void ScOpenCLTest2::testDatabaseFormulaDsum()
     }
 }
 
-void ScOpenCLTest2::testDatabaseFormulaDvar()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testDatabaseFormulaDvar)
 {
     initTestEnv(u"xls/opencl/database/dvar.xls");
     ScDocument* pDoc = getScDoc();
@@ -1665,7 +1437,7 @@ void ScOpenCLTest2::testDatabaseFormulaDvar()
     }
 }
 
-void ScOpenCLTest2::testDatabaseFormulaDvarp()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testDatabaseFormulaDvarp)
 {
     initTestEnv(u"xls/opencl/database/dvarp.xls");
     ScDocument* pDoc = getScDoc();
@@ -1681,7 +1453,7 @@ void ScOpenCLTest2::testDatabaseFormulaDvarp()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaRoundUp()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaRoundUp)
 {
     initTestEnv(u"xls/opencl/math/roundup.xls");
     ScDocument* pDoc = getScDoc();
@@ -1697,7 +1469,7 @@ void ScOpenCLTest2::testMathFormulaRoundUp()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaRoundDown()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaRoundDown)
 {
     initTestEnv(u"xls/opencl/math/rounddown.xls");
     ScDocument* pDoc = getScDoc();
@@ -1713,7 +1485,7 @@ void ScOpenCLTest2::testMathFormulaRoundDown()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaInt()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaInt)
 {
     initTestEnv(u"xls/opencl/math/int.xls");
     ScDocument* pDoc = getScDoc();
@@ -1729,7 +1501,7 @@ void ScOpenCLTest2::testMathFormulaInt()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaRadians()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaRadians)
 {
     initTestEnv(u"xls/opencl/math/radians.xls");
     ScDocument* pDoc = getScDoc();
@@ -1745,7 +1517,7 @@ void ScOpenCLTest2::testMathFormulaRadians()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaDegrees()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaDegrees)
 {
     initTestEnv(u"xls/opencl/math/degrees.xls");
     ScDocument* pDoc = getScDoc();
@@ -1760,7 +1532,7 @@ void ScOpenCLTest2::testMathFormulaDegrees()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaIsEven()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaIsEven)
 {
     initTestEnv(u"xls/opencl/math/iseven.xls");
     ScDocument* pDoc = getScDoc();
@@ -1776,7 +1548,7 @@ void ScOpenCLTest2::testMathFormulaIsEven()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaCountIf()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaCountIf)
 {
     initTestEnv(u"xls/opencl/math/countif.xls");
     ScDocument* pDoc = getScDoc();
@@ -1791,7 +1563,7 @@ void ScOpenCLTest2::testMathFormulaCountIf()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaIsOdd()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaIsOdd)
 {
     initTestEnv(u"xls/opencl/math/isodd.xls");
     ScDocument* pDoc = getScDoc();
@@ -1807,7 +1579,7 @@ void ScOpenCLTest2::testMathFormulaIsOdd()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaFact()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaFact)
 {
     initTestEnv(u"xls/opencl/math/fact.xls");
     ScDocument* pDoc = getScDoc();
@@ -1822,7 +1594,7 @@ void ScOpenCLTest2::testMathFormulaFact()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaSEC()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaSEC)
 {
     initTestEnv(u"ods/opencl/math/sec.ods");
     ScDocument* pDoc = getScDoc();
@@ -1837,7 +1609,7 @@ void ScOpenCLTest2::testMathFormulaSEC()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaSECH()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaSECH)
 {
     initTestEnv(u"ods/opencl/math/sech.ods");
     ScDocument* pDoc = getScDoc();
@@ -1852,7 +1624,7 @@ void ScOpenCLTest2::testMathFormulaSECH()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaMROUND()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaMROUND)
 {
     initTestEnv(u"xls/opencl/math/MROUND.xls");
     ScDocument* pDoc = getScDoc();
@@ -1867,7 +1639,7 @@ void ScOpenCLTest2::testMathFormulaMROUND()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaQuotient()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaQuotient)
 {
     initTestEnv(u"ods/opencl/math/Quotient.ods");
     ScDocument* pDoc = getScDoc();
@@ -1883,7 +1655,7 @@ void ScOpenCLTest2::testMathFormulaQuotient()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaSeriesSum()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaSeriesSum)
 {
     initTestEnv(u"xls/opencl/math/seriessum.xls");
     ScDocument* pDoc = getScDoc();
@@ -1898,7 +1670,7 @@ void ScOpenCLTest2::testMathFormulaSeriesSum()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaSumIf()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaSumIf)
 {
     initTestEnv(u"xls/opencl/math/sumif.xls");
     ScDocument* pDoc = getScDoc();
@@ -1913,7 +1685,7 @@ void ScOpenCLTest2::testMathFormulaSumIf()
     }
 }
 
-void ScOpenCLTest2::testAddInFormulaBesseLJ()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testAddInFormulaBesseLJ)
 {
     initTestEnv(u"xls/opencl/addin/besselj.xls");
     ScDocument* pDoc = getScDoc();
@@ -1929,7 +1701,7 @@ void ScOpenCLTest2::testAddInFormulaBesseLJ()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaAvedev()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaAvedev)
 {
     initTestEnv(u"xls/opencl/statistical/Avedev.xls");
     ScDocument* pDoc = getScDoc();
@@ -1945,7 +1717,7 @@ void ScOpenCLTest2::testStatisticalFormulaAvedev()
     }
 }
 
-void ScOpenCLTest2::testNegSub()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testNegSub)
 {
     initTestEnv(u"xls/opencl/math/NegSub.xls");
     ScDocument* pDoc = getScDoc();
@@ -1961,7 +1733,7 @@ void ScOpenCLTest2::testNegSub()
     }
 }
 
-void ScOpenCLTest2::testMathFormulaAverageIf_Mix()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testMathFormulaAverageIf_Mix)
 {
     initTestEnv(u"xls/opencl/math/averageif_mix.xls");
     ScDocument* pDoc = getScDoc();
@@ -1976,7 +1748,7 @@ void ScOpenCLTest2::testMathFormulaAverageIf_Mix()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaKurt1()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaKurt1)
 {
     initTestEnv(u"xls/opencl/statistical/Kurt1.xls");
     ScDocument* pDoc = getScDoc();
@@ -1992,7 +1764,7 @@ void ScOpenCLTest2::testStatisticalFormulaKurt1()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaHarMean1()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaHarMean1)
 {
     initTestEnv(u"xls/opencl/statistical/HarMean1.xls");
     ScDocument* pDoc = getScDoc();
@@ -2008,7 +1780,7 @@ void ScOpenCLTest2::testStatisticalFormulaHarMean1()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaVarA1()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaVarA1)
 {
     initTestEnv(u"xls/opencl/statistical/VarA1.xls");
     ScDocument* pDoc = getScDoc();
@@ -2024,7 +1796,7 @@ void ScOpenCLTest2::testStatisticalFormulaVarA1()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaVarPA1()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaVarPA1)
 {
     initTestEnv(u"xls/opencl/statistical/VarPA1.xls");
     ScDocument* pDoc = getScDoc();
@@ -2040,7 +1812,7 @@ void ScOpenCLTest2::testStatisticalFormulaVarPA1()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaStDevA1()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaStDevA1)
 {
     initTestEnv(u"xls/opencl/statistical/StDevA1.xls");
     ScDocument* pDoc = getScDoc();
@@ -2056,7 +1828,7 @@ void ScOpenCLTest2::testStatisticalFormulaStDevA1()
     }
 }
 
-void ScOpenCLTest2::testStatisticalFormulaStDevPA1()
+CPPUNIT_TEST_FIXTURE(ScOpenCLTest2, testStatisticalFormulaStDevPA1)
 {
     initTestEnv(u"xls/opencl/statistical/StDevPA1.xls");
     ScDocument* pDoc = getScDoc();
@@ -2077,8 +1849,6 @@ ScOpenCLTest2::ScOpenCLTest2()
 {
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION(ScOpenCLTest2);
-
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */