sb118: merged in DEV300_m68

23 files changed, 89 insertions, 121 deletions

diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index d4d836a4b553..52693a41f129 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -30,7 +30,10 @@
 
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/point/b2ipoint.hxx>
@@ -294,13 +297,7 @@ public:
 };
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BasicTest, "BasicTest");
+CPPUNIT_TEST_SUITE_REGISTRATION(BasicTest);
 }
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
-
+CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index 1b9e4ca0c68f..9c622157ca8f 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -30,7 +30,9 @@
 
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irange.hxx>
@@ -180,7 +182,7 @@ public:
 };
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BmpMaskTest, "BmpMaskTest");
+CPPUNIT_TEST_SUITE_REGISTRATION(BmpMaskTest);
 }
 
 
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index 978c4bbe6243..92d0c9b50f67 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.cxx
@@ -30,7 +30,9 @@
 
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irange.hxx>
@@ -207,7 +209,7 @@ public:
 };
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BmpTest, "BmpTest");
+CPPUNIT_TEST_SUITE_REGISTRATION(BmpTest);
 }
 
 
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index 41da8cac617a..89cd7ede6293 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.cxx
@@ -30,7 +30,9 @@
 
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/point/b2ipoint.hxx>
@@ -274,7 +276,7 @@ public:
 };
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(ClipTest, "ClipTest");
+CPPUNIT_TEST_SUITE_REGISTRATION(ClipTest);
 }
 
 
diff --git a/basebmp/test/export.map b/basebmp/test/export.map
index bfd13f454044..ac406a4096dd 100644
--- a/basebmp/test/export.map
+++ b/basebmp/test/export.map
@@ -31,7 +31,7 @@
 
 UDK_3.1 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index ba25cfa9044e..e2e5b32f7fed 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.cxx
@@ -30,7 +30,9 @@
 
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2drange.hxx>
@@ -268,7 +270,7 @@ public:
 };
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(FillTest, "FillTest");
+CPPUNIT_TEST_SUITE_REGISTRATION(FillTest);
 }
 
 
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index b78175128eba..488c6cf7c91b 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.cxx
@@ -30,7 +30,9 @@
 
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/point/b2ipoint.hxx>
@@ -216,7 +218,7 @@ public:
 };
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(LineTest, "LineTest");
+CPPUNIT_TEST_SUITE_REGISTRATION(LineTest);
 }
 
 
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index f7a5dded4cf1..25cb06eb413d 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -88,7 +88,6 @@ SHL1OBJS=  \
 # source/makefile.mk
 SHL1TARGET= tests
 SHL1STDLIBS= 	$(SALLIB)		 \
-                                $(TESTSHL2LIB)\
                 $(CPPUNITLIB)	 \
                 $(BASEGFXLIB)
 
@@ -125,7 +124,6 @@ SLOFILES=$(SHL1OBJS)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
 
 # --- Enable test execution in normal build ------------------------
 .IF "$(L10N_framework)"==""
@@ -134,7 +132,7 @@ unittest : $(SHL1TARGETN)
         @echo ----------------------------------------------------------
         @echo - start unit test on library $(SHL1TARGETN)
         @echo ----------------------------------------------------------
-        $(TESTSHL2) -sf $(mktmp ) $(SHL1TARGETN)
+        $(CPPUNITTESTER) $(SHL1TARGETN)
 
 ALLTAR : unittest
 .ENDIF
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index 94e5bc42a5ea..f00ac66aff39 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -30,7 +30,9 @@
 
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irange.hxx>
@@ -168,7 +170,7 @@ public:
 };
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(MaskTest, "MaskTest");
+CPPUNIT_TEST_SUITE_REGISTRATION(MaskTest);
 }
 
 
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index da118e4b6d8a..c1e066eac562 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -30,7 +30,9 @@
 
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irange.hxx>
@@ -288,7 +290,7 @@ public:
 };
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(PolyTest, "PolyTest");
+CPPUNIT_TEST_SUITE_REGISTRATION(PolyTest);
 }
 
 
diff --git a/basegfx/prj/build.lst b/basegfx/prj/build.lst
index 418b3822a7ee..e4122616e769 100644
--- a/basegfx/prj/build.lst
+++ b/basegfx/prj/build.lst
@@ -1,4 +1,4 @@
-fx	basegfx	:	o3tl sal offuh cppuhelper cppu testshl2 NULL
+fx	basegfx	:	o3tl sal offuh cppuhelper cppu cppunit NULL
 fx	basegfx									usr1	-	all	fx_mkout NULL
 fx	basegfx\inc								nmake	-	all	fx_inc NULL
 fx	basegfx\prj								get		-	all	fx_prj NULL
diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx
index 454ed23289b2..8a10f3a77102 100644
--- a/basegfx/test/basegfx1d.cxx
+++ b/basegfx/test/basegfx1d.cxx
@@ -33,7 +33,10 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
 
 namespace basegfx1d
 {
@@ -55,7 +58,6 @@ public:
     void EmptyMethod()
     {
           // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-       CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -68,13 +70,7 @@ public:
 }; // class b1drange
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx1d::b1drange, "basegfx1d");
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx1d::b1drange);
 } // namespace basegfx1d
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
-
+CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index ab6715467dba..0e0159dfab08 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -33,7 +33,9 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -753,7 +755,6 @@ public:
     {
         // this is demonstration code
         // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-        CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -1105,7 +1106,6 @@ public:
     // insert your test code here.
     void EmptyMethod()
     {
-        CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -1135,7 +1135,6 @@ public:
     void EmptyMethod()
     {
           // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-       CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -1317,7 +1316,6 @@ public:
     // insert your test code here.
     void EmptyMethod()
     {
-        CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -1347,7 +1345,6 @@ public:
     void EmptyMethod()
     {
           // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-       CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -1375,7 +1372,6 @@ public:
     // insert your test code here.
     void EmptyMethod()
     {
-        CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -1405,7 +1401,6 @@ public:
     void EmptyMethod()
     {
           // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-       CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -1433,7 +1428,6 @@ public:
     // insert your test code here.
     void EmptyMethod()
     {
-        CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -1618,21 +1612,21 @@ public:
 }; // class b2dvector
 
 // -----------------------------------------------------------------------------
-//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dmultirange, "basegfx2d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dsvgdimpex, "basegfx2d");
-//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dbeziertools, "basegfx2d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dcubicbezier, "basegfx2d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dhommatrix, "basegfx2d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dhompoint, "basegfx2d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dpoint, "basegfx2d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dpolygon, "basegfx2d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dpolygontools, "basegfx2d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dpolypolygon, "basegfx2d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dquadraticbezier, "basegfx2d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2drange, "basegfx2d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dtuple, "basegfx2d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::b2dvector, "basegfx2d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx2d::bcolor, "basegfx2d");
+//CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dmultirange);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dsvgdimpex);
+//CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dbeziertools);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dcubicbezier);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dhommatrix);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dhompoint);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpoint);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolygon);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolygontools);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolypolygon);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dquadraticbezier);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2drange);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dtuple);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dvector);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::bcolor);
 } // namespace basegfx2d
 
 
diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx
index f0fe463ce23d..4272fd6a8615 100644
--- a/basegfx/test/basegfx3d.cxx
+++ b/basegfx/test/basegfx3d.cxx
@@ -33,7 +33,9 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
 
 namespace basegfx3d
 {
@@ -55,7 +57,6 @@ public:
     void EmptyMethod()
     {
           // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-       CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -83,7 +84,6 @@ public:
     // insert your test code here.
     void EmptyMethod()
     {
-        CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -113,7 +113,6 @@ public:
     void EmptyMethod()
     {
           // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-       CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -141,7 +140,6 @@ public:
     // insert your test code here.
     void EmptyMethod()
     {
-        CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -171,7 +169,6 @@ public:
     void EmptyMethod()
     {
           // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-       CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -199,7 +196,6 @@ public:
     // insert your test code here.
     void EmptyMethod()
     {
-        CPPUNIT_ASSERT_STUB();
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -212,12 +208,12 @@ public:
 }; // class b3dvector
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dhommatrix, "basegfx3d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dhompoint, "basegfx3d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dpoint, "basegfx3d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3drange, "basegfx3d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dtuple, "basegfx3d");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(basegfx3d::b3dvector, "basegfx3d");
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dhommatrix);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dhompoint);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dpoint);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3drange);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dtuple);
+CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dvector);
 } // namespace basegfx3d
 
 
diff --git a/basegfx/test/export.map b/basegfx/test/export.map
index 37f3bf2c55d2..eef13a7090fb 100644
--- a/basegfx/test/export.map
+++ b/basegfx/test/export.map
@@ -31,7 +31,7 @@
 
 UDK_3.1 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index da61c60f9308..5165952a0e4b 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -66,7 +66,6 @@ SHL1STDLIBS= \
                 $(SALLIB)        \
                 $(CPPUHELPERLIB) \
                         $(CPPULIB)       \
-                                $(TESTSHL2LIB) \
                 $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
@@ -83,7 +82,6 @@ SLOFILES=$(SHL1OBJS)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
 
 # --- Enable testshl2 execution in normal build ------------------------
 
@@ -91,7 +89,7 @@ $(MISC)$/unittest_succeeded : $(SHL1TARGETN)
         @echo ----------------------------------------------------------
         @echo - start unit test on library $(SHL1TARGETN)
         @echo ----------------------------------------------------------
-        $(TESTSHL2) -sf $(mktmp ) -forward $(BIN)$/ $(SHL1TARGETN)
+        $(CPPUNITTESTER) $(SHL1TARGETN)
         $(TOUCH) $@
 
 ALLTAR : $(MISC)$/unittest_succeeded
diff --git a/basegfx/test/tests.txt b/basegfx/test/tests.txt
deleted file mode 100644
index fc2d33ab51d5..000000000000
--- a/basegfx/test/tests.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Jobfile
-basegfx1d.b1drange
-basegfx2d.b2dcubicbezier
-basegfx2d.b2dhommatrix
-basegfx2d.b2dhompoint
-basegfx2d.b2dpoint
-basegfx2d.b2dpolygon
-basegfx2d.b2dpolygontools
-basegfx2d.b2dpolypolygon
-basegfx2d.b2dquadraticbezier
-basegfx2d.b2drange
-basegfx2d.b2dtuple
-basegfx2d.b2dvector
-basegfx3d.b3dhommatrix
-basegfx3d.b3dhompoint
-basegfx3d.b3dhompoint
-basegfx3d.b3dpoint
-basegfx3d.b3drange
-basegfx3d.b3dtuple
-basegfx3d.b3dvector
diff --git a/o3tl/prj/build.lst b/o3tl/prj/build.lst
index 98293257e4bd..fe6b53d1c732 100644
--- a/o3tl/prj/build.lst
+++ b/o3tl/prj/build.lst
@@ -1,4 +1,4 @@
-ot	o3tl	:	sal testshl2 BOOST:boost NULL
+ot	o3tl	:	sal cppunit BOOST:boost NULL
 ot	o3tl									usr1	-	all	ot_mkout NULL
 ot	o3tl\inc								get		-	all	ot_inc NULL
 ot	o3tl\prj								get		-	all	ot_prj NULL
diff --git a/o3tl/qa/export.map b/o3tl/qa/export.map
index bfd13f454044..ac406a4096dd 100644
--- a/o3tl/qa/export.map
+++ b/o3tl/qa/export.map
@@ -31,7 +31,7 @@
 
 UDK_3.1 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk
index b592790516da..a27c99a74df9 100644
--- a/o3tl/qa/makefile.mk
+++ b/o3tl/qa/makefile.mk
@@ -51,7 +51,6 @@ SHL1OBJS=  \
 
 SHL1TARGET= tests
 SHL1STDLIBS= 	$(SALLIB)		 \
-    $(TESTSHL2LIB)\
                 $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
@@ -69,7 +68,6 @@ SLOFILES=$(SHL1OBJS)
 .ENDIF 		# L10N_framework
 
 .INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
 
 # --- Enable test execution in normal build ------------------------
 .IF "$(L10N_framework)"==""
@@ -77,7 +75,7 @@ unittest : $(SHL1TARGETN)
         @echo ----------------------------------------------------------
         @echo - start unit test on library $(SHL1TARGETN)
         @echo ----------------------------------------------------------
-        $(TESTSHL2) -sf $(mktmp ) $(SHL1TARGETN)
+        $(CPPUNITTESTER) $(SHL1TARGETN)
 
 ALLTAR : unittest
 .ENDIF 		# L10N_framework
diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx
index eebbb633f82b..84d615fca3db 100644
--- a/o3tl/qa/test-cow_wrapper.cxx
+++ b/o3tl/qa/test-cow_wrapper.cxx
@@ -1,6 +1,9 @@
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
 
 #include "cow_wrapper_clients.hxx"
 
@@ -119,15 +122,6 @@ public:
 };
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(cow_wrapper_test, "cow_wrapper_test");
-
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-void RegisterAdditionalFunctions(FktRegFuncPtr )
-{
-}
-// NOADDITIONAL;
+CPPUNIT_TEST_SUITE_REGISTRATION(cow_wrapper_test);
 
+CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx
index 25f2209c94f5..3c50c68872d2 100644
--- a/o3tl/qa/test-heap_ptr.cxx
+++ b/o3tl/qa/test-heap_ptr.cxx
@@ -28,7 +28,9 @@
  *
  ************************************************************************/
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
 
 #include <o3tl/heap_ptr.hxx>
 
@@ -163,4 +165,4 @@ class heap_ptr_test : public CppUnit::TestFixture
 }; // class heap_ptr_test
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(heap_ptr_test, "o3tltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(heap_ptr_test);
diff --git a/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx
index fa956db96005..326f8d4e06ef 100644
--- a/o3tl/qa/test-range.cxx
+++ b/o3tl/qa/test-range.cxx
@@ -28,8 +28,9 @@
  *
  ************************************************************************/
 
-
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
 
 #include <o3tl/range.hxx>
 #include <vector>
@@ -233,4 +234,4 @@ public:
 }; // class range_test
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(range_test, "o3tltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(range_test);