[Libreoffice] [PATCH] EasyHack 39625 - Make existing cppunittests work

Hi - I'm new to LibreOffice development - I've taken a look at EasyHack
39625 - Make existing cppunittests work - and followed the suggestions in
the bug report. I'm not completely sure that this is all that is required -
I don't know if all the unit tests are being run. I think it will take me a
bit longer to get familiar with the way the unit tests are invoked from the
build system.
Here is my patch, I would be pleased to receive any feedback.

My code changes are contributed under the LGPLv3+/MPL

Cheers
Justin


From 8538582ed568140d1fe3cbfbd7a4581afac3d22e Mon Sep 17 00:00:00 2001
From: Justin Harding <justinh.dev@gmail.com>
Date: Sun, 20 Nov 2011 10:38:00 +0100
Subject: [PATCH] FDO#39625 - EasyHack: make existing cppunittests work

remove references to (already removed) testshl2
---
 configmgr/qa/unit/makefile.mk                      |   42
+-----------------
 configmgr/qa/unit/test.cxx                         |    8 ++-
 configmgr/qa/unit/version.map                      |    2 +-
 sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx             |   22 ++++++----
 sal/qa/rtl/oustring/rtl_OUString2.cxx              |   37 +++++++---------
 sal/qa/rtl/oustring/rtl_ustr.cxx                   |   46
++++++++++---------
 sal/qa/rtl/process/rtl_Process.cxx                 |   10 +++--
 sal/qa/rtl/textenc/rtl_tencinfo.cxx                |   17 ++++---
 sal/qa/rtl/textenc/rtl_textcvt.cxx                 |    8 ++-
 sal/qa/rtl/uri/rtl_Uri.cxx                         |    8 ++-
 sal/qa/rtl/uri/rtl_testuri.cxx                     |    8 ++-
 sal/qa/rtl/uuid/rtl_Uuid.cxx                       |   10 +++--
 sal/qa/rtl_strings/rtl_OString.cxx                 |    4 +-
 sal/qa/rtl_strings/rtl_OUString.cxx                |    4 +-
 sal/qa/rtl_strings/rtl_OUStringBuffer.cxx          |    4 +-
 sal/qa/rtl_strings/rtl_old_testostring.cxx         |    8 ++-
 sal/qa/rtl_strings/rtl_old_testowstring.cxx        |    8 ++-
 sal/qa/rtl_strings/rtl_old_teststrbuf.cxx          |   10 +++--
 sal/qa/systools/test_comtools.cxx                  |    8 ++-
 sal/qa/testHelperFunctions/testHelperFunctions.cxx |   12 +++--
 .../testHelperFunctions/testHelperFunctions2.cxx   |    6 ++-
 salhelper/qa/makefile.mk                           |    5 +--
 salhelper/qa/test_api.cxx                          |    8 ++-
 salhelper/qa/version.map                           |    2 +-
 sdext/source/pdfimport/test/export.map             |    2 +-
 sdext/source/pdfimport/test/tests.cxx              |    8 ++-
 shell/qa/recent_docs.cxx                           |    8 ++-
 unoxml/test/domtest.cxx                            |   10 +++--
 unoxml/test/export.map                             |    2 +-
 writerfilter/qa/cppunittests/odiapi/export.map     |    2 +-
 writerfilter/qa/cppunittests/odiapi/testCore.cxx   |    6 ++-
 .../qa/cppunittests/odiapi/testProperty.cxx        |    8 ++-
 writerfilter/qa/cppunittests/qname/export.map      |    2 +-
 writerfilter/qa/cppunittests/qname/testQName.cxx   |    8 ++-
 34 files changed, 179 insertions(+), 174 deletions(-)

diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index 60c3df7..71b53ca 100755
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
@@ -50,44 +50,4 @@ DEF1NAME = $(SHL1TARGET)

 .INCLUDE: target.mk

-ALLTAR: TEST
-
-.IF "$(OS)" == "WNT"
-MY_INI = .ini
-.ELSE
-MY_INI = rc
-.ENDIF
-
-$(MISC)/unit.rdb .ERRREMOVE:
-    cp $(SOLARBINDIR)/types.rdb $@
-    $(REGCOMP) -register -r $@ -c $(DLLDEST)/$(DLLPRE)configmgr$(DLLPOST)
-
-TEST .PHONY: $(SHL1TARGETN) $(MISC)/unit.rdb
-    rm -rf $(MISC)/unitdata
-    mkdir $(MISC)/unitdata
-    cp urebootstrap.ini $(MISC)/unitdata
-    mkdir $(MISC)/unitdata/basis
-    mkdir $(MISC)/unitdata/basis/program
-    echo '[Bootstrap]' > $(MISC)/unitdata/basis/program/uno$(MY_INI)
-    echo 'UNO_SHARED_PACKAGES_CACHE = $$BRAND_BASE_DIR' \
-        >> $(MISC)/unitdata/basis/program/uno$(MY_INI)
-    echo 'UNO_USER_PACKAGES_CACHE =' \
-        '$${$$BRAND_BASE_DIR/program/bootstrap$(MY_INI):UserInstallation}'
\
-        >> $(MISC)/unitdata/basis/program/uno$(MY_INI)
-    mkdir $(MISC)/unitdata/basis/share
-    mkdir $(MISC)/unitdata/basis/share/registry
-    cp data.xcd $(MISC)/unitdata/basis/share/registry
-    mkdir $(MISC)/unitdata/brand
-    mkdir $(MISC)/unitdata/brand/program
-    echo '[Bootstrap]' > $(MISC)/unitdata/brand/program/bootstrap$(MY_INI)
-    echo 'UserInstallation = $$ORIGIN/../../user' \
-        >> $(MISC)/unitdata/brand/program/bootstrap$(MY_INI)
-.IF "$(USE_SHELL)" == "bash"
-    export \
-
 URE_BOOTSTRAP=vnd.sun.star.pathname:$(MISC)/unitdata/urebootstrap.ini \
-        && $(TESTSHL2) $(SHL1TARGETN) -forward $(MISC)/unit.rdb
-.ELSE
-    setenv \
-        URE_BOOTSTRAP
vnd.sun.star.pathname:$(MISC)/unitdata/urebootstrap.ini \
-        && $(TESTSHL2) $(SHL1TARGETN) -forward $(MISC)/unit.rdb
-.ENDIF
+.INCLUDE: _cppunit.mk
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index f645517..f62bd05 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -63,7 +63,9 @@
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 namespace {

@@ -659,10 +661,10 @@ css::uno::Reference< css::uno::XInterface >
Test::createUpdateAccess(
         css::uno::Sequence< css::uno::Any >(&arg, 1));
 }

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltest");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);

 }

-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/qa/unit/version.map b/configmgr/qa/unit/version.map
index 6b30413b..00a2846 100755
--- a/configmgr/qa/unit/version.map
+++ b/configmgr/qa/unit/version.map
@@ -27,7 +27,7 @@

 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;

     local:
         *;
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index e0499a4..635b6c2 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -37,9 +37,13 @@
 #include <stdlib.h>
 #include <algorithm> // STL

-#include "testshl/stringhelper.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include <rtl/bootstrap.hxx>

 #include <rtl/ustrbuf.hxx>
@@ -789,13 +793,13 @@ namespace rtl_Bootstrap
         CPPUNIT_TEST_SUITE_END();
     }; // class expandMacros

-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Bootstrap::ctor,
"rtl_Bootstrap");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Bootstrap::getFrom,
"rtl_Bootstrap");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Bootstrap::setIniFilename,
"rtl_Bootstrap");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Bootstrap::getHandle,
"rtl_Bootstrap");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Bootstrap::set,
"rtl_Bootstrap");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Bootstrap::expandMacrosFrom,
"rtl_Bootstrap");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Bootstrap::expandMacros,
"rtl_Bootstrap");
+    CPPUNIT_TEST_SUITE_REGISTRATION(ctor);
+    CPPUNIT_TEST_SUITE_REGISTRATION(getFrom);
+    CPPUNIT_TEST_SUITE_REGISTRATION(setIniFilename);
+    CPPUNIT_TEST_SUITE_REGISTRATION(getHandle);
+    CPPUNIT_TEST_SUITE_REGISTRATION(set);
+    CPPUNIT_TEST_SUITE_REGISTRATION(expandMacrosFrom);
+    CPPUNIT_TEST_SUITE_REGISTRATION(expandMacros);

 } // namespace rtl_Bootstrap

diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx
b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 2c48da7..cf021cc 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -36,7 +36,9 @@

 #include <algorithm> // STL

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include "stringhelper.hxx"
 #include "valueequal.hxx"

@@ -1252,24 +1254,19 @@ void convertFromString::test() {
 }

 //
-----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUString::valueOf,
"rtl_OUString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUString::toInt, "rtl_OUString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUString::toDouble,
"rtl_OUString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUString::toFloat,
"rtl_OUString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUString::lastIndexOf,
"rtl_OUString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUString::getToken,
"rtl_OUString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(
-    rtl_OUString::convertToString, "rtl_OUString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUString::construction,
"rtl_OUString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(
-    rtl_OUString::indexOfAscii, "rtl_OUString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUString::endsWith,
"rtl_OUString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(
-    rtl_OUString::createFromCodePoints, "rtl_OUString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(
-    rtl_OUString::iterateCodePoints, "rtl_OUString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(
-    rtl_OUString::convertFromString, "rtl_OUString");
+CPPUNIT_TEST_SUITE_REGISTRATION(valueOf);
+CPPUNIT_TEST_SUITE_REGISTRATION(toInt);
+CPPUNIT_TEST_SUITE_REGISTRATION(toDouble);
+CPPUNIT_TEST_SUITE_REGISTRATION(toFloat);
+CPPUNIT_TEST_SUITE_REGISTRATION(lastIndexOf);
+CPPUNIT_TEST_SUITE_REGISTRATION(getToken);
+CPPUNIT_TEST_SUITE_REGISTRATION(convertToString);
+CPPUNIT_TEST_SUITE_REGISTRATION(construction);
+CPPUNIT_TEST_SUITE_REGISTRATION(indexOfAscii);
+CPPUNIT_TEST_SUITE_REGISTRATION(endsWith);
+CPPUNIT_TEST_SUITE_REGISTRATION(createFromCodePoints);
+CPPUNIT_TEST_SUITE_REGISTRATION(iterateCodePoints);
+CPPUNIT_TEST_SUITE_REGISTRATION(convertFromString);

 } // namespace rtl_OUString

@@ -1278,6 +1275,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(

 // 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();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx
b/sal/qa/rtl/oustring/rtl_ustr.cxx
index f0cd05c..e7ce302 100644
--- a/sal/qa/rtl/oustring/rtl_ustr.cxx
+++ b/sal/qa/rtl/oustring/rtl_ustr.cxx
@@ -29,7 +29,9 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 /** print a UNI_CODE file name.
 */
@@ -1385,34 +1387,34 @@ namespace rtl_ustr
     }; // class ascii_compareIgnoreAsciiCase

 //
-----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::compare, "rtl_ustr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::compareIgnoreAsciiCase,
"rtl_ustr");
+CPPUNIT_TEST_SUITE_REGISTRATION(compare);
+CPPUNIT_TEST_SUITE_REGISTRATION(compareIgnoreAsciiCase);

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::ascii_compare_WithLength,
"rtl_ustr");
+CPPUNIT_TEST_SUITE_REGISTRATION(ascii_compare_WithLength);

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::shortenedCompareIgnoreAsciiCase_WithLength,
"rtl_ustr");
+CPPUNIT_TEST_SUITE_REGISTRATION(shortenedCompareIgnoreAsciiCase_WithLength);
 // CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::hashCode, "rtl_ustr");

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::indexOfChar, "rtl_ustr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::lastIndexOfChar,
"rtl_ustr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::indexOfStr, "rtl_ustr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::lastIndexOfStr,
"rtl_ustr");
+CPPUNIT_TEST_SUITE_REGISTRATION(indexOfChar);
+CPPUNIT_TEST_SUITE_REGISTRATION(lastIndexOfChar);
+CPPUNIT_TEST_SUITE_REGISTRATION(indexOfStr);
+CPPUNIT_TEST_SUITE_REGISTRATION(lastIndexOfStr);

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::replaceChar, "rtl_ustr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::replaceChar_WithLength,
"rtl_ustr");
+CPPUNIT_TEST_SUITE_REGISTRATION(replaceChar);
+CPPUNIT_TEST_SUITE_REGISTRATION(replaceChar_WithLength);

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::toAsciiLowerCase,
"rtl_ustr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::toAsciiLowerCase_WithLength,
"rtl_ustr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::toAsciiUpperCase,
"rtl_ustr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::toAsciiUpperCase_WithLength,
"rtl_ustr");
+CPPUNIT_TEST_SUITE_REGISTRATION(toAsciiLowerCase);
+CPPUNIT_TEST_SUITE_REGISTRATION(toAsciiLowerCase_WithLength);
+CPPUNIT_TEST_SUITE_REGISTRATION(toAsciiUpperCase);
+CPPUNIT_TEST_SUITE_REGISTRATION(toAsciiUpperCase_WithLength);

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::trim_WithLength,
"rtl_ustr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::valueOfChar, "rtl_ustr");
+CPPUNIT_TEST_SUITE_REGISTRATION(trim_WithLength);
+CPPUNIT_TEST_SUITE_REGISTRATION(valueOfChar);

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::ascii_compare, "rtl_ustr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::ascii_compareIgnoreAsciiCase,
"rtl_ustr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::ascii_compareIgnoreAsciiCase_WithLength,
"rtl_ustr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::ascii_shortenedCompareIgnoreAsciiCase_WithLength,
"rtl_ustr");
+CPPUNIT_TEST_SUITE_REGISTRATION(ascii_compare);
+CPPUNIT_TEST_SUITE_REGISTRATION(ascii_compareIgnoreAsciiCase);
+CPPUNIT_TEST_SUITE_REGISTRATION(ascii_compareIgnoreAsciiCase_WithLength);
+CPPUNIT_TEST_SUITE_REGISTRATION(ascii_shortenedCompareIgnoreAsciiCase_WithLength);

 } // namespace rtl_ustr

@@ -1420,7 +1422,7 @@
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::ascii_shortenedCompareIgnoreAsci

 // 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();


 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/process/rtl_Process.cxx
b/sal/qa/rtl/process/rtl_Process.cxx
index 426bddf..6b9a485 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -34,7 +34,9 @@
 #include <string.h>
 #include <sal/types.h>

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include <rtl/ustring.hxx>
 #include <rtl/string.hxx>
 #include <rtl/process.h>
@@ -289,14 +291,14 @@ public:

 } // namespace rtl_Process

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Process::getAppCommandArg,
"rtl_Process");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Process::getGlobalProcessId,
"rtl_Process");
+CPPUNIT_TEST_SUITE_REGISTRATION(getAppCommandArg);
+CPPUNIT_TEST_SUITE_REGISTRATION(getGlobalProcessId);


 //
-----------------------------------------------------------------------------

 // 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();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx
b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
index 0f89147..3a80eb3 100644
--- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx
+++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
@@ -34,7 +34,9 @@
 #include <osl/thread.h>
 #include <rtl/tencinfo.h>

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 //
-----------------------------------------------------------------------------

@@ -1890,15 +1892,14 @@ private:

 //
-----------------------------------------------------------------------------

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_tencinfo::getBestMime,
 "rtl_tencinfo" );
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_tencinfo::getBestUnix,
 "rtl_tencinfo" );
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_tencinfo::getBestWindows,
"rtl_tencinfo" );
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_tencinfo::getTextEncodingInfo,
"rtl_tencinfo" );
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(
-    TestEncodingFromUnix, "TestEncodingFromUnix");
+CPPUNIT_TEST_SUITE_REGISTRATION( getBestMime);
+CPPUNIT_TEST_SUITE_REGISTRATION( getBestUnix);
+CPPUNIT_TEST_SUITE_REGISTRATION( getBestWindows);
+CPPUNIT_TEST_SUITE_REGISTRATION( getTextEncodingInfo);
+CPPUNIT_TEST_SUITE_REGISTRATION(TestEncodingFromUnix);

 //
-----------------------------------------------------------------------------

-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx
b/sal/qa/rtl/textenc/rtl_textcvt.cxx
index 4ed39fb..5d42f03 100644
--- a/sal/qa/rtl/textenc/rtl_textcvt.cxx
+++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx
@@ -34,7 +34,9 @@
 #include <cstddef>
 #include <cstring>

-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include "rtl/string.hxx"
 #include "rtl/tencinfo.h"
 #include "rtl/textcvt.h"
@@ -2896,10 +2898,10 @@ void Test::testInfo() {
     }
 }

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "rtl_textcvt");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);

 }

-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 741bab9..c5d9508 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -36,7 +36,9 @@
 #include <osl/thread.h>
 #include <osl/file.hxx>

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 //
-----------------------------------------------------------------------------

@@ -291,10 +293,10 @@ namespace Stringtest
 }


-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Stringtest::Convert, "Stringtest" );
+CPPUNIT_TEST_SUITE_REGISTRATION( Convert);

 // LLA: doku anpassen!!!

-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index b5cc1ca..6f4b21a 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -37,7 +37,9 @@
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"

-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 #include <cstddef>
 #include <stdio.h>
@@ -542,7 +544,7 @@ void Test::test_Uri() {

 }

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "rtl_testuri");
-NOADDITIONAL;
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+CPPUNIT_PLUGIN_IMPLEMENT();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index a3efeda..f5e38e8 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -32,7 +32,9 @@
 #include <math.h>
 #include <stdio.h>

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include <rtl/uuid.h>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
@@ -217,15 +219,15 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class createNamedUuid

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Uuid::createUuid, "rtl_Uuid");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Uuid::createNamedUuid,
"rtl_Uuid");
+CPPUNIT_TEST_SUITE_REGISTRATION(createUuid);
+CPPUNIT_TEST_SUITE_REGISTRATION(createNamedUuid);
 } // namespace rtl_Uuid

 //
-----------------------------------------------------------------------------

 // 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();


 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_OString.cxx
b/sal/qa/rtl_strings/rtl_OString.cxx
index b72197e..5f1d915 100644
--- a/sal/qa/rtl_strings/rtl_OString.cxx
+++ b/sal/qa/rtl_strings/rtl_OString.cxx
@@ -34,7 +34,9 @@
     #include <sal/types.h>
 #endif

-#include <testshl/tresstatewrapper.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 #ifndef _RTL_STRING_HXX_
     #include <rtl/string.hxx>
diff --git a/sal/qa/rtl_strings/rtl_OUString.cxx
b/sal/qa/rtl_strings/rtl_OUString.cxx
index b585c04..990913e 100644
--- a/sal/qa/rtl_strings/rtl_OUString.cxx
+++ b/sal/qa/rtl_strings/rtl_OUString.cxx
@@ -31,7 +31,9 @@
 #include <sal/types.h>

 //#     #include <rtl/tres.h>
-#include <testshl/tresstatewrapper.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include "stringhelper.hxx"
 #include <rtl/string.hxx>
 #include <rtl/ustring.h>
diff --git a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
index 73403d1..efb5b3c 100644
--- a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
+++ b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
@@ -33,7 +33,9 @@
     #include <sal/types.h>
 #endif

-#include <testshl/tresstatewrapper.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 #ifndef _RTL_STRING_HXX_
     #include <rtl/string.hxx>
diff --git a/sal/qa/rtl_strings/rtl_old_testostring.cxx
b/sal/qa/rtl_strings/rtl_old_testostring.cxx
index 214b228..22c3aca 100644
--- a/sal/qa/rtl_strings/rtl_old_testostring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testostring.cxx
@@ -38,7 +38,9 @@

 #include <rtl/string.hxx>

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 #define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))
 using ::rtl::OString;
@@ -238,9 +240,9 @@ void oldtests::test_OString()
 } // namespace rtl_OString

 //
-----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_OString::oldtests,
"rtl_OString" );
+CPPUNIT_TEST_SUITE_REGISTRATION(oldtests);

 //
-----------------------------------------------------------------------------
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx
b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
index 082be3c..ced98c0 100644
--- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
@@ -46,7 +46,9 @@

 #include <rtl/locale.hxx>

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 #define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))

@@ -392,10 +394,10 @@ void oldtests::test_OString2OUStringAndViceVersa()
 } // namespace rtl_OUString

 //
-----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_OUString::oldtests,
"rtl_OUString" );
+CPPUNIT_TEST_SUITE_REGISTRATION(oldtests);

 //
-----------------------------------------------------------------------------
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();


 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
index f1bec70..f2a7a7b 100644
--- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
+++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
@@ -40,7 +40,9 @@

 #include <rtl/ustrbuf.hxx>

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 using ::rtl::OUString;
 using ::rtl::OString;
@@ -234,10 +236,10 @@ void oldtests::test_OUStringBuffer()


 //
-----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_OUStringBuffer::oldtests,
"rtl_OUStringBuffer" );
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_OStringBuffer::oldtests,
"rtl_OStringBuffer" );
+CPPUNIT_TEST_SUITE_REGISTRATION(oldtests);
+CPPUNIT_TEST_SUITE_REGISTRATION(oldtests);

 //
-----------------------------------------------------------------------------
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/systools/test_comtools.cxx
b/sal/qa/systools/test_comtools.cxx
index f09a7b4..02cdc42 100644
--- a/sal/qa/systools/test_comtools.cxx
+++ b/sal/qa/systools/test_comtools.cxx
@@ -31,7 +31,9 @@
 #include "precompiled_sal.hxx"
 // autogenerated file with codegen.pl

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include <systools/win32/comtools.hxx>

 class COMObject : public IUnknown
@@ -240,13 +242,13 @@ namespace test_comtools
     };

 //
-----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_comtools::test_COMReference,
"test_comtools");
+CPPUNIT_TEST_SUITE_REGISTRATION(test_COMReference);

 } // namespace rtl_OUString


 // 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();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/testHelperFunctions/testHelperFunctions.cxx
b/sal/qa/testHelperFunctions/testHelperFunctions.cxx
index 6341fe3..44da051 100644
--- a/sal/qa/testHelperFunctions/testHelperFunctions.cxx
+++ b/sal/qa/testHelperFunctions/testHelperFunctions.cxx
@@ -36,7 +36,9 @@

 #include "stringhelper.hxx"

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 // void isJaBloed()
 // {
@@ -447,11 +449,11 @@ void test_TimeValues::t_time3()
 } // namespace testOfHelperFunctions

 //
-----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(
testOfHelperFunctions::test_t_print, "helperFunctions" );
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(
testOfHelperFunctions::test_t_abs64, "helperFunctions" );
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(
testOfHelperFunctions::test_TimeValues, "helperFunctions" );
+CPPUNIT_TEST_SUITE_REGISTRATION(test_t_print);
+CPPUNIT_TEST_SUITE_REGISTRATION(test_t_abs64);
+CPPUNIT_TEST_SUITE_REGISTRATION(test_TimeValues);

 //
-----------------------------------------------------------------------------
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
index 52ec091..b6bda50 100644
--- a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
+++ b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
@@ -29,7 +29,9 @@

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include "stringhelper.hxx"

 namespace testOfHelperFunctions
@@ -55,7 +57,7 @@ namespace testOfHelperFunctions
 } // namespace testOfHelperFunctions

 //
-----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(
testOfHelperFunctions::test_valueequal, "helperFunctions" );
+CPPUNIT_TEST_SUITE_REGISTRATION(test_valueequal);

 //
-----------------------------------------------------------------------------
 // This is only allowed to be in one file!
diff --git a/salhelper/qa/makefile.mk b/salhelper/qa/makefile.mk
index fae96cf..0beb292 100644
--- a/salhelper/qa/makefile.mk
+++ b/salhelper/qa/makefile.mk
@@ -46,7 +46,4 @@ SLOFILES = $(SHL1OBJS)

 .INCLUDE: target.mk

-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-    cd $(SHL1TARGETN:d) && $(TESTSHL2) $(SHL1TARGETN:f)
+.INCLUDE: _cppunit.mk
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx
index dfdbee5..fd00742 100644
--- a/salhelper/qa/test_api.cxx
+++ b/salhelper/qa/test_api.cxx
@@ -57,7 +57,9 @@ std::type_info const & getSimpleReferenceObjectTypeInfo()

 }

-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include "osl/mutex.hxx"
 #include "salhelper/condition.hxx"
 #include "salhelper/dynload.hxx"
@@ -244,10 +246,10 @@ void Test::testDerivedSimpleReferenceObject() {
     }
 }

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);

 }

-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/qa/version.map b/salhelper/qa/version.map
index de41d83..896d751 100755
--- a/salhelper/qa/version.map
+++ b/salhelper/qa/version.map
@@ -1,6 +1,6 @@
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
     local:
         *;
 };
diff --git a/sdext/source/pdfimport/test/export.map
b/sdext/source/pdfimport/test/export.map
index 7321bbc..3308588 100755
--- a/sdext/source/pdfimport/test/export.map
+++ b/sdext/source/pdfimport/test/export.map
@@ -27,7 +27,7 @@

 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;

     local:
         *;
diff --git a/sdext/source/pdfimport/test/tests.cxx
b/sdext/source/pdfimport/test/tests.cxx
index 145f9387..7136ccf 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -47,7 +47,9 @@
 #include <rtl/math.hxx>
 #include <osl/file.hxx>
 #include <osl/process.h>
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/basemutex.hxx>
@@ -572,13 +574,13 @@ namespace

 // =======================================================================

-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(PDFITest, "PDFITest");
+CPPUNIT_TEST_SUITE_REGISTRATION(PDFITest);


 //
-----------------------------------------------------------------------------

 // 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();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx
index e0907db..572dc66 100644
--- a/shell/qa/recent_docs.cxx
+++ b/shell/qa/recent_docs.cxx
@@ -29,7 +29,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 #include "systemshell.hxx"
 #include "osl/file.hxx"
@@ -217,8 +219,8 @@ public:


 // register test suites
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test_AddToRecentDocs,
"Test_AddToRecentDocs");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test_AddToRecentDocs);

-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/test/domtest.cxx b/unoxml/test/domtest.cxx
index ff44e2b..29e32f9 100644
--- a/unoxml/test/domtest.cxx
+++ b/unoxml/test/domtest.cxx
@@ -28,7 +28,9 @@

 // autogenerated file with codegen.pl

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 #include <rtl/ref.hxx>
 #include <osl/file.hxx>
@@ -387,8 +389,8 @@ struct SerializerTest : public CppUnit::TestFixture
 };

 //
-----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BasicTest, "BasicTest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(SerializerTest, "SerializerTest");
+CPPUNIT_TEST_SUITE_REGISTRATION(BasicTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(SerializerTest);
 }


@@ -396,6 +398,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(SerializerTest,
"SerializerTest");

 // 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();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/test/export.map b/unoxml/test/export.map
index 7321bbc..d0e9a48 100644
--- a/unoxml/test/export.map
+++ b/unoxml/test/export.map
@@ -27,7 +27,7 @@

 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+ cppunitTestPlugIn;

     local:
         *;
diff --git a/writerfilter/qa/cppunittests/odiapi/export.map
b/writerfilter/qa/cppunittests/odiapi/export.map
index 7321bbc..3308588 100644
--- a/writerfilter/qa/cppunittests/odiapi/export.map
+++ b/writerfilter/qa/cppunittests/odiapi/export.map
@@ -27,7 +27,7 @@

 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;

     local:
         *;
diff --git a/writerfilter/qa/cppunittests/odiapi/testCore.cxx
b/writerfilter/qa/cppunittests/odiapi/testCore.cxx
index a88f424..965ad4f 100644
--- a/writerfilter/qa/cppunittests/odiapi/testCore.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/testCore.cxx
@@ -27,7 +27,9 @@
  ************************************************************************/


-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include <odiapi/core/Node.hxx>
 #include <odiapi/props/Properties.hxx>

@@ -168,7 +170,7 @@ public:

 //#####################################
 // register test suites
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestCore, "TestCore");
+CPPUNIT_TEST_SUITE_REGISTRATION(TestCore);

 //NOADDITIONAL;

diff --git a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
index 3ec3448..987ef3f 100644
--- a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
@@ -26,7 +26,9 @@
  *
  ************************************************************************/

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include <odiapi/props/Properties.hxx>
 #include "FileLoggerImpl.hxx"
 #include "ExternalViewLogger.hxx"
@@ -681,8 +683,8 @@ public:

 //#####################################
 // register test suites
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestProperty, "TestProperty");
+CPPUNIT_TEST_SUITE_REGISTRATION(TestProperty);

-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/qname/export.map
b/writerfilter/qa/cppunittests/qname/export.map
index 7321bbc..3308588 100644
--- a/writerfilter/qa/cppunittests/qname/export.map
+++ b/writerfilter/qa/cppunittests/qname/export.map
@@ -27,7 +27,7 @@

 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;

     local:
         *;
diff --git a/writerfilter/qa/cppunittests/qname/testQName.cxx
b/writerfilter/qa/cppunittests/qname/testQName.cxx
index 2a2b26e..bc5de0f 100644
--- a/writerfilter/qa/cppunittests/qname/testQName.cxx
+++ b/writerfilter/qa/cppunittests/qname/testQName.cxx
@@ -26,7 +26,9 @@
  *
  ************************************************************************/

-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include <odiapi/qname/QName.hxx>
 #include <stdio.h>
 #include <rtl/string.hxx>
@@ -7529,8 +7531,8 @@ public:

 //#####################################
 // register test suites
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestQName, "TestQName");
+CPPUNIT_TEST_SUITE_REGISTRATION(TestQName);

-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
1.7.5.4