[PATCH] FDO#39625 - EasyHack: make existing cppunittests work
Justin Harding
justinh.dev at gmail.com
Sun Nov 20 01:38:00 PST 2011
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
--0016e6d7e827a2105b04b2281552
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Hi - I'm new to LibreOffice development - I've taken a look at=A0Ea=
syHack 39625 - Make existing cppunittests work - and followed the suggestio=
ns 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.<div>
Here is my patch, I would be pleased to receive any feedback.</div><div><br=
></div><div>My code changes are contributed under the LGPLv3+/MPL</div><div=
><br></div><div>Cheers</div><div>Justin</div><div><br><div><br></div><div>
<div>From 8538582ed568140d1fe3cbfbd7a4581afac3d22e Mon Sep 17 00:00:00 2001=
</div><div>From: Justin Harding <<a href=3D"mailto:justinh.dev at gmail.com=
">justinh.dev at gmail.com</a>></div><div>Date: Sun, 20 Nov 2011 10:38:00 +=
0100</div>
<div>Subject: [PATCH] FDO#39625 - EasyHack: make existing cppunittests work=
</div><div><br></div><div>remove references to (already removed) testshl2</=
div><div>---</div><div>=A0configmgr/qa/unit/<a href=3D"http://makefile.mk">=
makefile.mk</a> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0| =A0 42 +------=
-----------</div>
<div>=A0configmgr/qa/unit/test.cxx =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 | =A0 =A08 ++-</div><div>=A0configmgr/qa/unit/version.map =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0| =A0 =A02 +-</div><div>=A0sal/qa/rtl/bo=
otstrap/rtl_Bootstrap.cxx =A0 =A0 =A0 =A0 =A0 =A0 | =A0 22 ++++++----</div>
<div>=A0sal/qa/rtl/oustring/rtl_OUString2.cxx =A0 =A0 =A0 =A0 =A0 =A0 =A0| =
=A0 37 +++++++---------</div><div>=A0sal/qa/rtl/oustring/rtl_ustr.cxx =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 | =A0 46 ++++++++++---------</div><div>=A0s=
al/qa/rtl/process/rtl_Process.cxx =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 | =A0 10 =
+++--</div>
<div>=A0sal/qa/rtl/textenc/rtl_tencinfo.cxx =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
| =A0 17 ++++---</div><div>=A0sal/qa/rtl/textenc/rtl_textcvt.cxx =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 | =A0 =A08 ++-</div><div>=A0sal/qa/rtl/uri/rtl_Uri.=
cxx =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 | =A0 =A08 ++-</div>
<div>=A0sal/qa/rtl/uri/rtl_testuri.cxx =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 | =A0 =A08 ++-</div><div>=A0sal/qa/rtl/uuid/rtl_Uuid.cxx =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 | =A0 10 +++--</div><div>=A0sal/qa/rtl_stri=
ngs/rtl_OString.cxx =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 | =A0 =A04 +-</div><div=
>
=A0sal/qa/rtl_strings/rtl_OUString.cxx =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0| =A0=
=A04 +-</div><div>=A0sal/qa/rtl_strings/rtl_OUStringBuffer.cxx =A0 =A0 =A0=
=A0 =A0| =A0 =A04 +-</div><div>=A0sal/qa/rtl_strings/rtl_old_testostring.c=
xx =A0 =A0 =A0 =A0 | =A0 =A08 ++-</div><div>=A0sal/qa/rtl_strings/rtl_old_t=
estowstring.cxx =A0 =A0 =A0 =A0| =A0 =A08 ++-</div>
<div>=A0sal/qa/rtl_strings/rtl_old_teststrbuf.cxx =A0 =A0 =A0 =A0 =A0| =A0 =
10 +++--</div><div>=A0sal/qa/systools/test_comtools.cxx =A0 =A0 =A0 =A0 =A0=
=A0 =A0 =A0 =A0| =A0 =A08 ++-</div><div>=A0sal/qa/testHelperFunctions/test=
HelperFunctions.cxx | =A0 12 +++--</div>
<div>=A0.../testHelperFunctions/testHelperFunctions2.cxx =A0 | =A0 =A06 ++-=
</div><div>=A0salhelper/qa/<a href=3D"http://makefile.mk">makefile.mk</a> =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 | =A0 =A05 +--</div><di=
v>=A0salhelper/qa/test_api.cxx =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0| =A0 =A08 ++-</div>
<div>=A0salhelper/qa/version.map =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 | =A0 =A02 +-</div><div>=A0sdext/source/pdfimport/test/export.m=
ap =A0 =A0 =A0 =A0 =A0 =A0 | =A0 =A02 +-</div><div>=A0sdext/source/pdfimpor=
t/test/tests.cxx =A0 =A0 =A0 =A0 =A0 =A0 =A0| =A0 =A08 ++-</div><div>
=A0shell/qa/recent_docs.cxx =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
=A0 | =A0 =A08 ++-</div><div>=A0unoxml/test/domtest.cxx =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0| =A0 10 +++--</div><div>=A0unoxml/t=
est/export.map =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 | =
=A0 =A02 +-</div><div>=A0writerfilter/qa/cppunittests/odiapi/export.map =A0=
=A0 | =A0 =A02 +-</div>
<div>=A0writerfilter/qa/cppunittests/odiapi/testCore.cxx =A0 | =A0 =A06 ++-=
</div><div>=A0.../qa/cppunittests/odiapi/testProperty.cxx =A0 =A0 =A0 =A0| =
=A0 =A08 ++-</div><div>=A0writerfilter/qa/cppunittests/qname/export.map =A0=
=A0 =A0| =A0 =A02 +-</div><div>
=A0writerfilter/qa/cppunittests/qname/testQName.cxx =A0 | =A0 =A08 ++-</div=
><div>=A034 files changed, 179 insertions(+), 174 deletions(-)</div><div><b=
r></div><div>diff --git a/configmgr/qa/unit/<a href=3D"http://makefile.mk">=
makefile.mk</a> b/configmgr/qa/unit/<a href=3D"http://makefile.mk">makefile=
.mk</a></div>
<div>index 60c3df7..71b53ca 100755</div><div>--- a/configmgr/qa/unit/<a hre=
f=3D"http://makefile.mk">makefile.mk</a></div><div>+++ b/configmgr/qa/unit/=
<a href=3D"http://makefile.mk">makefile.mk</a></div><div>@@ -50,44 +50,4 @@=
DEF1NAME =3D $(SHL1TARGET)</div>
<div>=A0</div><div>=A0.INCLUDE: <a href=3D"http://target.mk">target.mk</a><=
/div><div>=A0</div><div>-ALLTAR: TEST</div><div>-</div><div>-.IF "$(OS=
)" =3D=3D "WNT"</div><div>-MY_INI =3D .ini</div><div>-.ELSE<=
/div><div>
-MY_INI =3D rc</div><div>-.ENDIF</div><div>-</div><div>-$(MISC)/unit.rdb .E=
RRREMOVE:</div><div>- =A0 =A0cp $(SOLARBINDIR)/types.rdb $@</div><div>- =A0=
=A0$(REGCOMP) -register -r $@ -c $(DLLDEST)/$(DLLPRE)configmgr$(DLLPOST)</=
div><div>
-</div><div>-TEST .PHONY: $(SHL1TARGETN) $(MISC)/unit.rdb</div><div>- =A0 =
=A0rm -rf $(MISC)/unitdata</div><div>- =A0 =A0mkdir $(MISC)/unitdata</div><=
div>- =A0 =A0cp urebootstrap.ini $(MISC)/unitdata</div><div>- =A0 =A0mkdir =
$(MISC)/unitdata/basis</div>
<div>- =A0 =A0mkdir $(MISC)/unitdata/basis/program</div><div>- =A0 =A0echo =
'[Bootstrap]' > $(MISC)/unitdata/basis/program/uno$(MY_INI)</div=
><div>- =A0 =A0echo 'UNO_SHARED_PACKAGES_CACHE =3D $$BRAND_BASE_DIR'=
; \</div><div>
- =A0 =A0 =A0 =A0>> $(MISC)/unitdata/basis/program/uno$(MY_INI)</div>=
<div>- =A0 =A0echo 'UNO_USER_PACKAGES_CACHE =3D' \</div><div>- =A0 =
=A0 =A0 =A0'$${$$BRAND_BASE_DIR/program/bootstrap$(MY_INI):UserInstalla=
tion}' \</div>
<div>- =A0 =A0 =A0 =A0>> $(MISC)/unitdata/basis/program/uno$(MY_INI)<=
/div><div>- =A0 =A0mkdir $(MISC)/unitdata/basis/share</div><div>- =A0 =A0mk=
dir $(MISC)/unitdata/basis/share/registry</div><div>- =A0 =A0cp data.xcd $(=
MISC)/unitdata/basis/share/registry</div>
<div>- =A0 =A0mkdir $(MISC)/unitdata/brand</div><div>- =A0 =A0mkdir $(MISC)=
/unitdata/brand/program</div><div>- =A0 =A0echo '[Bootstrap]' > =
$(MISC)/unitdata/brand/program/bootstrap$(MY_INI)</div><div>- =A0 =A0echo &=
#39;UserInstallation =3D $$ORIGIN/../../user' \</div>
<div>- =A0 =A0 =A0 =A0>> $(MISC)/unitdata/brand/program/bootstrap$(MY=
_INI)</div><div>-.IF "$(USE_SHELL)" =3D=3D "bash"</div>=
<div>- =A0 =A0export \</div><div>- =A0 =A0 =A0 =A0URE_BOOTSTRAP=3Dvnd.sun.s=
tar.pathname:$(MISC)/unitdata/urebootstrap.ini \</div>
<div>- =A0 =A0 =A0 =A0&& $(TESTSHL2) $(SHL1TARGETN) -forward $(MISC=
)/unit.rdb</div><div>-.ELSE</div><div>- =A0 =A0setenv \</div><div>- =A0 =A0=
=A0 =A0URE_BOOTSTRAP vnd.sun.star.pathname:$(MISC)/unitdata/urebootstrap.i=
ni \</div><div>- =A0 =A0 =A0 =A0&& $(TESTSHL2) $(SHL1TARGETN) -forw=
ard $(MISC)/unit.rdb</div>
<div>-.ENDIF</div><div>+.INCLUDE: _<a href=3D"http://cppunit.mk">cppunit.mk=
</a></div><div>diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/=
test.cxx</div><div>index f645517..f62bd05 100644</div><div>--- a/configmgr/=
qa/unit/test.cxx</div>
<div>+++ b/configmgr/qa/unit/test.cxx</div><div>@@ -63,7 +63,9 @@</div><div=
>=A0#include "rtl/ustring.h"</div><div>=A0#include "rtl/ustr=
ing.hxx"</div><div>=A0#include "sal/types.h"</div><div>-#inc=
lude "testshl/simpleheader.hxx"</div>
<div>+#include <cppunit/TestFixture.h></div><div>+#include <cppuni=
t/extensions/HelperMacros.h></div><div>+#include <cppunit/plugin/Test=
PlugIn.h></div><div>=A0</div><div>=A0namespace {</div><div>=A0</div><div=
>@@ -659,10 +661,10 @@ css::uno::Reference< css::uno::XInterface > Te=
st::createUpdateAccess(</div>
<div>=A0 =A0 =A0 =A0 =A0css::uno::Sequence< css::uno::Any >(&arg,=
1));</div><div>=A0}</div><div>=A0</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGI=
STRATION(Test, "alltest");</div><div>+CPPUNIT_TEST_SUITE_REGISTRA=
TION(Test);</div>
<div>=A0</div><div>=A0}</div><div>=A0</div><div>-NOADDITIONAL;</div><div>+C=
PPUNIT_PLUGIN_IMPLEMENT();</div><div>=A0</div><div>=A0/* vim:set shiftwidth=
=3D4 softtabstop=3D4 expandtab: */</div><div>diff --git a/configmgr/qa/unit=
/version.map b/configmgr/qa/unit/version.map</div>
<div>index 6b30413b..00a2846 100755</div><div>--- a/configmgr/qa/unit/versi=
on.map</div><div>+++ b/configmgr/qa/unit/version.map</div><div>@@ -27,7 +27=
,7 @@</div><div>=A0</div><div>=A0UDK_3_0_0 {</div><div>=A0 =A0 =A0global:</=
div><div>
- =A0 =A0 =A0 =A0registerAllTestFunction;</div><div>+ =A0 =A0 =A0 =A0cppuni=
tTestPlugIn;</div><div>=A0</div><div>=A0 =A0 =A0local:</div><div>=A0 =A0 =
=A0 =A0 =A0*;</div><div>diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx=
b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx</div>
<div>index e0499a4..635b6c2 100644</div><div>--- a/sal/qa/rtl/bootstrap/rtl=
_Bootstrap.cxx</div><div>+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx</div>=
<div>@@ -37,9 +37,13 @@</div><div>=A0#include <stdlib.h></div><div>
=A0#include <algorithm> // STL</div><div>=A0</div><div>-#include &quo=
t;testshl/stringhelper.hxx"</div><div>+#include <cppunit/TestFixtur=
e.h></div><div>+#include <cppunit/extensions/HelperMacros.h></div>
<div>+#include <cppunit/plugin/TestPlugIn.h></div><div>=A0</div><div>=
-#include <testshl/simpleheader.hxx></div><div>+#include <cppunit/=
TestFixture.h></div><div>+#include <cppunit/extensions/HelperMacros.h=
></div>
<div>+#include <cppunit/plugin/TestPlugIn.h></div><div>=A0#include &l=
t;rtl/bootstrap.hxx></div><div>=A0</div><div>=A0#include <rtl/ustrbuf=
.hxx></div><div>@@ -789,13 +793,13 @@ namespace rtl_Bootstrap</div><div>=
=A0 =A0 =A0 =A0 =A0CPPUNIT_TEST_SUITE_END();</div>
<div>=A0 =A0 =A0}; // class expandMacros</div><div>=A0</div><div>- =A0 =A0C=
PPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Bootstrap::ctor, "rtl_Bootstr=
ap");</div><div>- =A0 =A0CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Boo=
tstrap::getFrom, "rtl_Bootstrap");</div>
<div>- =A0 =A0CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Bootstrap::setIniFi=
lename, "rtl_Bootstrap");</div><div>- =A0 =A0CPPUNIT_TEST_SUITE_N=
AMED_REGISTRATION(rtl_Bootstrap::getHandle, "rtl_Bootstrap");</di=
v><div>
- =A0 =A0CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Bootstrap::set, "rt=
l_Bootstrap");</div><div>- =A0 =A0CPPUNIT_TEST_SUITE_NAMED_REGISTRATIO=
N(rtl_Bootstrap::expandMacrosFrom, "rtl_Bootstrap");</div><div>- =
=A0 =A0CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Bootstrap::expandMacros, &=
quot;rtl_Bootstrap");</div>
<div>+ =A0 =A0CPPUNIT_TEST_SUITE_REGISTRATION(ctor);</div><div>+ =A0 =A0CPP=
UNIT_TEST_SUITE_REGISTRATION(getFrom);</div><div>+ =A0 =A0CPPUNIT_TEST_SUIT=
E_REGISTRATION(setIniFilename);</div><div>+ =A0 =A0CPPUNIT_TEST_SUITE_REGIS=
TRATION(getHandle);</div>
<div>+ =A0 =A0CPPUNIT_TEST_SUITE_REGISTRATION(set);</div><div>+ =A0 =A0CPPU=
NIT_TEST_SUITE_REGISTRATION(expandMacrosFrom);</div><div>+ =A0 =A0CPPUNIT_T=
EST_SUITE_REGISTRATION(expandMacros);</div><div>=A0</div><div>=A0} // names=
pace rtl_Bootstrap</div>
<div>=A0</div><div>diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal=
/qa/rtl/oustring/rtl_OUString2.cxx</div><div>index 2c48da7..cf021cc 100644<=
/div><div>--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx</div><div>+++ b/sal/q=
a/rtl/oustring/rtl_OUString2.cxx</div>
<div>@@ -36,7 +36,9 @@</div><div>=A0</div><div>=A0#include <algorithm>=
; // STL</div><div>=A0</div><div>-#include <testshl/simpleheader.hxx>=
</div><div>+#include <cppunit/TestFixture.h></div><div>+#include <=
cppunit/extensions/HelperMacros.h></div>
<div>+#include <cppunit/plugin/TestPlugIn.h></div><div>=A0#include &q=
uot;stringhelper.hxx"</div><div>=A0#include "valueequal.hxx"=
</div><div>=A0</div><div>@@ -1252,24 +1254,19 @@ void convertFromString::te=
st() {</div>
<div>=A0}</div><div>=A0</div><div>=A0// -----------------------------------=
------------------------------------------</div><div>-CPPUNIT_TEST_SUITE_NA=
MED_REGISTRATION(rtl_OUString::valueOf, "rtl_OUString");</div><di=
v>
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUString::toInt, "rtl_OUStr=
ing");</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUString::=
toDouble, "rtl_OUString");</div><div>-CPPUNIT_TEST_SUITE_NAMED_RE=
GISTRATION(rtl_OUString::toFloat, "rtl_OUString");</div>
<div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUString::lastIndexOf, &quo=
t;rtl_OUString");</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl=
_OUString::getToken, "rtl_OUString");</div><div>-CPPUNIT_TEST_SUI=
TE_NAMED_REGISTRATION(</div>
<div>- =A0 =A0rtl_OUString::convertToString, "rtl_OUString");</di=
v><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUString::construction, &=
quot;rtl_OUString");</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(=
</div>
<div>- =A0 =A0rtl_OUString::indexOfAscii, "rtl_OUString");</div><=
div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUString::endsWith, "rt=
l_OUString");</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(</div><=
div>
- =A0 =A0rtl_OUString::createFromCodePoints, "rtl_OUString");</di=
v><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(</div><div>- =A0 =A0rtl_OUStr=
ing::iterateCodePoints, "rtl_OUString");</div><div>-CPPUNIT_TEST_=
SUITE_NAMED_REGISTRATION(</div>
<div>- =A0 =A0rtl_OUString::convertFromString, "rtl_OUString");</=
div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(valueOf);</div><div>+CPPUNIT_TEST=
_SUITE_REGISTRATION(toInt);</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(toDo=
uble);</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(toFloat);</div><div>+CPPUNIT_TEST_SUI=
TE_REGISTRATION(lastIndexOf);</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(ge=
tToken);</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(convertToString);</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(construction);</div><div>+CPPUNIT_TES=
T_SUITE_REGISTRATION(indexOfAscii);</div><div>+CPPUNIT_TEST_SUITE_REGISTRAT=
ION(endsWith);</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(createFromCodePoi=
nts);</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(iterateCodePoints);</div><div>+CPPUNI=
T_TEST_SUITE_REGISTRATION(convertFromString);</div><div>=A0</div><div>=A0} =
// namespace rtl_OUString</div><div>=A0</div><div>@@ -1278,6 +1275,6 @@ CPP=
UNIT_TEST_SUITE_NAMED_REGISTRATION(</div>
<div>=A0</div><div>=A0// this macro creates an empty function, which will c=
alled by the RegisterAllFunctions()</div><div>=A0// to let the user the pos=
sibility to also register some functions by hand.</div><div>-NOADDITIONAL;<=
/div>
<div>+CPPUNIT_PLUGIN_IMPLEMENT();</div><div>=A0</div><div>=A0/* vim:set shi=
ftwidth=3D4 softtabstop=3D4 expandtab: */</div><div>diff --git a/sal/qa/rtl=
/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx</div><div>index f=
0cd05c..e7ce302 100644</div>
<div>--- a/sal/qa/rtl/oustring/rtl_ustr.cxx</div><div>+++ b/sal/qa/rtl/oust=
ring/rtl_ustr.cxx</div><div>@@ -29,7 +29,9 @@</div><div>=A0</div><div>=A0//=
MARKER(update_precomp.py): autogen include statement, do not remove</div><=
div>
=A0#include "precompiled_sal.hxx"</div><div>-#include <testshl=
/simpleheader.hxx></div><div>+#include <cppunit/TestFixture.h></di=
v><div>+#include <cppunit/extensions/HelperMacros.h></div><div>+#incl=
ude <cppunit/plugin/TestPlugIn.h></div>
<div>=A0</div><div>=A0/** print a UNI_CODE file name.</div><div>=A0*/</div>=
<div>@@ -1385,34 +1387,34 @@ namespace rtl_ustr</div><div>=A0 =A0 =A0}; // =
class ascii_compareIgnoreAsciiCase</div><div>=A0</div><div>=A0// ----------=
-------------------------------------------------------------------</div>
<div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::compare, "rtl_us=
tr");</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::compa=
reIgnoreAsciiCase, "rtl_ustr");</div><div>+CPPUNIT_TEST_SUITE_REG=
ISTRATION(compare);</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(compareIgnoreAsciiCase);</div><div>=
=A0</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::ascii_compar=
e_WithLength, "rtl_ustr");</div><div>+CPPUNIT_TEST_SUITE_REGISTRA=
TION(ascii_compare_WithLength);</div>
<div>=A0</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::shorten=
edCompareIgnoreAsciiCase_WithLength, "rtl_ustr");</div><div>+CPPU=
NIT_TEST_SUITE_REGISTRATION(shortenedCompareIgnoreAsciiCase_WithLength);</d=
iv>
<div>=A0// CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::hashCode, "=
rtl_ustr");</div><div>=A0</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRA=
TION(rtl_ustr::indexOfChar, "rtl_ustr");</div><div>-CPPUNIT_TEST_=
SUITE_NAMED_REGISTRATION(rtl_ustr::lastIndexOfChar, "rtl_ustr");<=
/div>
<div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::indexOfStr, "rtl=
_ustr");</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::la=
stIndexOfStr, "rtl_ustr");</div><div>+CPPUNIT_TEST_SUITE_REGISTRA=
TION(indexOfChar);</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(lastIndexOfChar);</div><div>+CPPUNIT_=
TEST_SUITE_REGISTRATION(indexOfStr);</div><div>+CPPUNIT_TEST_SUITE_REGISTRA=
TION(lastIndexOfStr);</div><div>=A0</div><div>-CPPUNIT_TEST_SUITE_NAMED_REG=
ISTRATION(rtl_ustr::replaceChar, "rtl_ustr");</div>
<div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::replaceChar_WithLengt=
h, "rtl_ustr");</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(replac=
eChar);</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(replaceChar_WithLength);=
</div>
<div>=A0</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::toAscii=
LowerCase, "rtl_ustr");</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGIS=
TRATION(rtl_ustr::toAsciiLowerCase_WithLength, "rtl_ustr");</div>
<div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::toAsciiUpperCase, &qu=
ot;rtl_ustr");</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_us=
tr::toAsciiUpperCase_WithLength, "rtl_ustr");</div><div>+CPPUNIT_=
TEST_SUITE_REGISTRATION(toAsciiLowerCase);</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(toAsciiLowerCase_WithLength);</div><d=
iv>+CPPUNIT_TEST_SUITE_REGISTRATION(toAsciiUpperCase);</div><div>+CPPUNIT_T=
EST_SUITE_REGISTRATION(toAsciiUpperCase_WithLength);</div><div>=A0</div><di=
v>
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::trim_WithLength, "rtl=
_ustr");</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::va=
lueOfChar, "rtl_ustr");</div><div>+CPPUNIT_TEST_SUITE_REGISTRATIO=
N(trim_WithLength);</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(valueOfChar);</div><div>=A0</div><div=
>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::ascii_compare, "rtl_=
ustr");</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::asc=
ii_compareIgnoreAsciiCase, "rtl_ustr");</div>
<div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::ascii_compareIgnoreAs=
ciiCase_WithLength, "rtl_ustr");</div><div>-CPPUNIT_TEST_SUITE_NA=
MED_REGISTRATION(rtl_ustr::ascii_shortenedCompareIgnoreAsciiCase_WithLength=
, "rtl_ustr");</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(ascii_compare);</div><div>+CPPUNIT_TE=
ST_SUITE_REGISTRATION(ascii_compareIgnoreAsciiCase);</div><div>+CPPUNIT_TES=
T_SUITE_REGISTRATION(ascii_compareIgnoreAsciiCase_WithLength);</div><div>
+CPPUNIT_TEST_SUITE_REGISTRATION(ascii_shortenedCompareIgnoreAsciiCase_With=
Length);</div><div>=A0</div><div>=A0} // namespace rtl_ustr</div><div>=A0</=
div><div>@@ -1420,7 +1422,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_us=
tr::ascii_shortenedCompareIgnoreAsci</div>
<div>=A0</div><div>=A0// this macro creates an empty function, which will c=
alled by the RegisterAllFunctions()</div><div>=A0// to let the user the pos=
sibility to also register some functions by hand.</div><div>-NOADDITIONAL;<=
/div>
<div>+CPPUNIT_PLUGIN_IMPLEMENT();</div><div>=A0</div><div>=A0</div><div>=A0=
/* vim:set shiftwidth=3D4 softtabstop=3D4 expandtab: */</div><div>diff --gi=
t a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx=
</div>
<div>index 426bddf..6b9a485 100644</div><div>--- a/sal/qa/rtl/process/rtl_P=
rocess.cxx</div><div>+++ b/sal/qa/rtl/process/rtl_Process.cxx</div><div>@@ =
-34,7 +34,9 @@</div><div>=A0#include <string.h></div><div>=A0#include=
<sal/types.h></div>
<div>=A0</div><div>-#include <testshl/simpleheader.hxx></div><div>+#i=
nclude <cppunit/TestFixture.h></div><div>+#include <cppunit/extens=
ions/HelperMacros.h></div><div>+#include <cppunit/plugin/TestPlugIn.h=
></div>
<div>=A0#include <rtl/ustring.hxx></div><div>=A0#include <rtl/stri=
ng.hxx></div><div>=A0#include <rtl/process.h></div><div>@@ -289,14=
+291,14 @@ public:</div><div>=A0</div><div>=A0} // namespace rtl_Process</=
div><div>
=A0</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Process::getAppCom=
mandArg, "rtl_Process");</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGI=
STRATION(rtl_Process::getGlobalProcessId, "rtl_Process");</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(getAppCommandArg);</div><div>+CPPUNIT=
_TEST_SUITE_REGISTRATION(getGlobalProcessId);</div><div>=A0</div><div>=A0</=
div><div>=A0// ------------------------------------------------------------=
-----------------</div>
<div>=A0</div><div>=A0// this macro creates an empty function, which will c=
alled by the RegisterAllFunctions()</div><div>=A0// to let the user the pos=
sibility to also register some functions by hand.</div><div>-NOADDITIONAL;<=
/div>
<div>+CPPUNIT_PLUGIN_IMPLEMENT();</div><div>=A0</div><div>=A0/* vim:set shi=
ftwidth=3D4 softtabstop=3D4 expandtab: */</div><div>diff --git a/sal/qa/rtl=
/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx</div><div>i=
ndex 0f89147..3a80eb3 100644</div>
<div>--- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx</div><div>+++ b/sal/qa/rtl/t=
extenc/rtl_tencinfo.cxx</div><div>@@ -34,7 +34,9 @@</div><div>=A0#include &=
lt;osl/thread.h></div><div>=A0#include <rtl/tencinfo.h></div><div>
=A0</div><div>-#include <testshl/simpleheader.hxx></div><div>+#includ=
e <cppunit/TestFixture.h></div><div>+#include <cppunit/extensions/=
HelperMacros.h></div><div>+#include <cppunit/plugin/TestPlugIn.h><=
/div>
<div>=A0</div><div>=A0// --------------------------------------------------=
---------------------------</div><div>=A0</div><div>@@ -1890,15 +1892,14 @@=
private:</div><div>=A0</div><div>=A0// -----------------------------------=
------------------------------------------</div>
<div>=A0</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_tencinfo::ge=
tBestMime, =A0 =A0"rtl_tencinfo" );</div><div>-CPPUNIT_TEST_SUITE=
_NAMED_REGISTRATION( rtl_tencinfo::getBestUnix, =A0 =A0"rtl_tencinfo&q=
uot; );</div>
<div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_tencinfo::getBestWindows, =
"rtl_tencinfo" );</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATIO=
N( rtl_tencinfo::getTextEncodingInfo, "rtl_tencinfo" );</div>
<div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(</div><div>- =A0 =A0TestEncodin=
gFromUnix, "TestEncodingFromUnix");</div><div>+CPPUNIT_TEST_SUITE=
_REGISTRATION( getBestMime);</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION( ge=
tBestUnix);</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION( getBestWindows);</div><div>+CPPUNIT_=
TEST_SUITE_REGISTRATION( getTextEncodingInfo);</div><div>+CPPUNIT_TEST_SUIT=
E_REGISTRATION(TestEncodingFromUnix);</div><div>=A0</div><div>=A0// -------=
----------------------------------------------------------------------</div=
>
<div>=A0</div><div>-NOADDITIONAL;</div><div>+CPPUNIT_PLUGIN_IMPLEMENT();</d=
iv><div>=A0</div><div>=A0/* vim:set shiftwidth=3D4 softtabstop=3D4 expandta=
b: */</div><div>diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rt=
l/textenc/rtl_textcvt.cxx</div>
<div>index 4ed39fb..5d42f03 100644</div><div>--- a/sal/qa/rtl/textenc/rtl_t=
extcvt.cxx</div><div>+++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx</div><div>@@ =
-34,7 +34,9 @@</div><div>=A0#include <cstddef></div><div>=A0#include =
<cstring></div>
<div>=A0</div><div>-#include "testshl/simpleheader.hxx"</div><div=
>+#include <cppunit/TestFixture.h></div><div>+#include <cppunit/ex=
tensions/HelperMacros.h></div><div>+#include <cppunit/plugin/TestPlug=
In.h></div>
<div>=A0#include "rtl/string.hxx"</div><div>=A0#include "rtl=
/tencinfo.h"</div><div>=A0#include "rtl/textcvt.h"</div><div=
>@@ -2896,10 +2898,10 @@ void Test::testInfo() {</div><div>=A0 =A0 =A0}</di=
v><div>=A0}</div>
<div>=A0</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "rtl_t=
extcvt");</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(Test);</div><div>=
=A0</div><div>=A0}</div><div>=A0</div><div>-NOADDITIONAL;</div><div>+CPPUNI=
T_PLUGIN_IMPLEMENT();</div>
<div>=A0</div><div>=A0/* vim:set shiftwidth=3D4 softtabstop=3D4 expandtab: =
*/</div><div>diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_U=
ri.cxx</div><div>index 741bab9..c5d9508 100644</div><div>--- a/sal/qa/rtl/u=
ri/rtl_Uri.cxx</div>
<div>+++ b/sal/qa/rtl/uri/rtl_Uri.cxx</div><div>@@ -36,7 +36,9 @@</div><div=
>=A0#include <osl/thread.h></div><div>=A0#include <osl/file.hxx>=
;</div><div>=A0</div><div>-#include <testshl/simpleheader.hxx></div><=
div>
+#include <cppunit/TestFixture.h></div><div>+#include <cppunit/ext=
ensions/HelperMacros.h></div><div>+#include <cppunit/plugin/TestPlugI=
n.h></div><div>=A0</div><div>=A0// -------------------------------------=
----------------------------------------</div>
<div>=A0</div><div>@@ -291,10 +293,10 @@ namespace Stringtest</div><div>=A0=
}</div><div>=A0</div><div>=A0</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRAT=
ION( Stringtest::Convert, "Stringtest" );</div><div>+CPPUNIT_TEST=
_SUITE_REGISTRATION( Convert);</div>
<div>=A0</div><div>=A0// LLA: doku anpassen!!!</div><div>=A0</div><div>-NOA=
DDITIONAL;</div><div>+CPPUNIT_PLUGIN_IMPLEMENT();</div><div>=A0</div><div>=
=A0/* vim:set shiftwidth=3D4 softtabstop=3D4 expandtab: */</div><div>diff -=
-git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx</div=
>
<div>index b5cc1ca..6f4b21a 100644</div><div>--- a/sal/qa/rtl/uri/rtl_testu=
ri.cxx</div><div>+++ b/sal/qa/rtl/uri/rtl_testuri.cxx</div><div>@@ -37,7 +3=
7,9 @@</div><div>=A0#include "rtl/ustring.h"</div><div>=A0#includ=
e "rtl/ustring.hxx"</div>
<div>=A0</div><div>-#include "testshl/simpleheader.hxx"</div><div=
>+#include <cppunit/TestFixture.h></div><div>+#include <cppunit/ex=
tensions/HelperMacros.h></div><div>+#include <cppunit/plugin/TestPlug=
In.h></div>
<div>=A0</div><div>=A0#include <cstddef></div><div>=A0#include <st=
dio.h></div><div>@@ -542,7 +544,7 @@ void Test::test_Uri() {</div><div>=
=A0</div><div>=A0}</div><div>=A0</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGIST=
RATION(Test, "rtl_testuri");</div>
<div>-NOADDITIONAL;</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(Test);</div>=
<div>+CPPUNIT_PLUGIN_IMPLEMENT();</div><div>=A0</div><div>=A0/* vim:set shi=
ftwidth=3D4 softtabstop=3D4 expandtab: */</div><div>diff --git a/sal/qa/rtl=
/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx</div>
<div>index a3efeda..f5e38e8 100644</div><div>--- a/sal/qa/rtl/uuid/rtl_Uuid=
.cxx</div><div>+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx</div><div>@@ -32,7 +32,9 =
@@</div><div>=A0#include <math.h></div><div>=A0#include <stdio.h&g=
t;</div>
<div>=A0</div><div>-#include <testshl/simpleheader.hxx></div><div>+#i=
nclude <cppunit/TestFixture.h></div><div>+#include <cppunit/extens=
ions/HelperMacros.h></div><div>+#include <cppunit/plugin/TestPlugIn.h=
></div>
<div>=A0#include <rtl/uuid.h></div><div>=A0#include <rtl/ustring.h=
></div><div>=A0#include <rtl/ustring.hxx></div><div>@@ -217,15 +21=
9,15 @@ public:</div><div>=A0 =A0 =A0CPPUNIT_TEST_SUITE_END();</div><div>=
=A0}; // class createNamedUuid</div>
<div>=A0</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Uuid::createU=
uid, "rtl_Uuid");</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATIO=
N(rtl_Uuid::createNamedUuid, "rtl_Uuid");</div><div>+CPPUNIT_TEST=
_SUITE_REGISTRATION(createUuid);</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(createNamedUuid);</div><div>=A0} // n=
amespace rtl_Uuid</div><div>=A0</div><div>=A0// ---------------------------=
--------------------------------------------------</div><div>=A0</div><div>=
=A0// this macro creates an empty function, which will called by the Regist=
erAllFunctions()</div>
<div>=A0// to let the user the possibility to also register some functions =
by hand.</div><div>-NOADDITIONAL;</div><div>+CPPUNIT_PLUGIN_IMPLEMENT();</d=
iv><div>=A0</div><div>=A0</div><div>=A0/* vim:set shiftwidth=3D4 softtabsto=
p=3D4 expandtab: */</div>
<div>diff --git a/sal/qa/rtl_strings/rtl_OString.cxx b/sal/qa/rtl_strings/r=
tl_OString.cxx</div><div>index b72197e..5f1d915 100644</div><div>--- a/sal/=
qa/rtl_strings/rtl_OString.cxx</div><div>+++ b/sal/qa/rtl_strings/rtl_OStri=
ng.cxx</div>
<div>@@ -34,7 +34,9 @@</div><div>=A0 =A0 =A0#include <sal/types.h></d=
iv><div>=A0#endif</div><div>=A0</div><div>-#include <testshl/tresstatewr=
apper.hxx></div><div>+#include <cppunit/TestFixture.h></div><div>+=
#include <cppunit/extensions/HelperMacros.h></div>
<div>+#include <cppunit/plugin/TestPlugIn.h></div><div>=A0</div><div>=
=A0#ifndef _RTL_STRING_HXX_</div><div>=A0 =A0 =A0#include <rtl/string.hx=
x></div><div>diff --git a/sal/qa/rtl_strings/rtl_OUString.cxx b/sal/qa/r=
tl_strings/rtl_OUString.cxx</div>
<div>index b585c04..990913e 100644</div><div>--- a/sal/qa/rtl_strings/rtl_O=
UString.cxx</div><div>+++ b/sal/qa/rtl_strings/rtl_OUString.cxx</div><div>@=
@ -31,7 +31,9 @@</div><div>=A0#include <sal/types.h></div><div>=A0</d=
iv>
<div>=A0//# =A0 =A0 #include <rtl/tres.h></div><div>-#include <tes=
tshl/tresstatewrapper.hxx></div><div>+#include <cppunit/TestFixture.h=
></div><div>+#include <cppunit/extensions/HelperMacros.h></div><di=
v>
+#include <cppunit/plugin/TestPlugIn.h></div><div>=A0#include "s=
tringhelper.hxx"</div><div>=A0#include <rtl/string.hxx></div><di=
v>=A0#include <rtl/ustring.h></div><div>diff --git a/sal/qa/rtl_strin=
gs/rtl_OUStringBuffer.cxx b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx</div>
<div>index 73403d1..efb5b3c 100644</div><div>--- a/sal/qa/rtl_strings/rtl_O=
UStringBuffer.cxx</div><div>+++ b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx=
</div><div>@@ -33,7 +33,9 @@</div><div>=A0 =A0 =A0#include <sal/types.h&=
gt;</div>
<div>=A0#endif</div><div>=A0</div><div>-#include <testshl/tresstatewrapp=
er.hxx></div><div>+#include <cppunit/TestFixture.h></div><div>+#in=
clude <cppunit/extensions/HelperMacros.h></div><div>+#include <cpp=
unit/plugin/TestPlugIn.h></div>
<div>=A0</div><div>=A0#ifndef _RTL_STRING_HXX_</div><div>=A0 =A0 =A0#includ=
e <rtl/string.hxx></div><div>diff --git a/sal/qa/rtl_strings/rtl_old_=
testostring.cxx b/sal/qa/rtl_strings/rtl_old_testostring.cxx</div><div>inde=
x 214b228..22c3aca 100644</div>
<div>--- a/sal/qa/rtl_strings/rtl_old_testostring.cxx</div><div>+++ b/sal/q=
a/rtl_strings/rtl_old_testostring.cxx</div><div>@@ -38,7 +38,9 @@</div><div=
>=A0</div><div>=A0#include <rtl/string.hxx></div><div>=A0</div><div>-=
#include <testshl/simpleheader.hxx></div>
<div>+#include <cppunit/TestFixture.h></div><div>+#include <cppuni=
t/extensions/HelperMacros.h></div><div>+#include <cppunit/plugin/Test=
PlugIn.h></div><div>=A0</div><div>=A0#define TEST_ENSURE(c, m) CPPUNIT_A=
SSERT_MESSAGE((m), (c))</div>
<div>=A0using ::rtl::OString;</div><div>@@ -238,9 +240,9 @@ void oldtests::=
test_OString()</div><div>=A0} // namespace rtl_OString</div><div>=A0</div><=
div>=A0// -----------------------------------------------------------------=
------------</div>
<div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_OString::oldtests, "r=
tl_OString" );</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(oldtests);</=
div><div>=A0</div><div>=A0// ----------------------------------------------=
-------------------------------</div>
<div>-NOADDITIONAL;</div><div>+CPPUNIT_PLUGIN_IMPLEMENT();</div><div>=A0</d=
iv><div>=A0/* vim:set shiftwidth=3D4 softtabstop=3D4 expandtab: */</div><di=
v>diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_str=
ings/rtl_old_testowstring.cxx</div>
<div>index 082be3c..ced98c0 100644</div><div>--- a/sal/qa/rtl_strings/rtl_o=
ld_testowstring.cxx</div><div>+++ b/sal/qa/rtl_strings/rtl_old_testowstring=
.cxx</div><div>@@ -46,7 +46,9 @@</div><div>=A0</div><div>=A0#include <rt=
l/locale.hxx></div>
<div>=A0</div><div>-#include <testshl/simpleheader.hxx></div><div>+#i=
nclude <cppunit/TestFixture.h></div><div>+#include <cppunit/extens=
ions/HelperMacros.h></div><div>+#include <cppunit/plugin/TestPlugIn.h=
></div>
<div>=A0</div><div>=A0#define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m),=
(c))</div><div>=A0</div><div>@@ -392,10 +394,10 @@ void oldtests::test_OSt=
ring2OUStringAndViceVersa()</div><div>=A0} // namespace rtl_OUString</div><=
div>
=A0</div><div>=A0// -------------------------------------------------------=
----------------------</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rt=
l_OUString::oldtests, "rtl_OUString" );</div><div>+CPPUNIT_TEST_S=
UITE_REGISTRATION(oldtests);</div>
<div>=A0</div><div>=A0// --------------------------------------------------=
---------------------------</div><div>-NOADDITIONAL;</div><div>+CPPUNIT_PLU=
GIN_IMPLEMENT();</div><div>=A0</div><div>=A0</div><div>=A0/* vim:set shiftw=
idth=3D4 softtabstop=3D4 expandtab: */</div>
<div>diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_st=
rings/rtl_old_teststrbuf.cxx</div><div>index f1bec70..f2a7a7b 100644</div><=
div>--- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx</div><div>+++ b/sal/qa/=
rtl_strings/rtl_old_teststrbuf.cxx</div>
<div>@@ -40,7 +40,9 @@</div><div>=A0</div><div>=A0#include <rtl/ustrbuf.=
hxx></div><div>=A0</div><div>-#include <testshl/simpleheader.hxx><=
/div><div>+#include <cppunit/TestFixture.h></div><div>+#include <c=
ppunit/extensions/HelperMacros.h></div>
<div>+#include <cppunit/plugin/TestPlugIn.h></div><div>=A0</div><div>=
=A0using ::rtl::OUString;</div><div>=A0using ::rtl::OString;</div><div>@@ -=
234,10 +236,10 @@ void oldtests::test_OUStringBuffer()</div><div>=A0</div><=
div>
=A0</div><div>=A0// -------------------------------------------------------=
----------------------</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rt=
l_OUStringBuffer::oldtests, "rtl_OUStringBuffer" );</div><div>-CP=
PUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_OStringBuffer::oldtests, "rtl=
_OStringBuffer" );</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(oldtests);</div><div>+CPPUNIT_TEST_SU=
ITE_REGISTRATION(oldtests);</div><div>=A0</div><div>=A0// -----------------=
------------------------------------------------------------</div><div>-NOA=
DDITIONAL;</div>
<div>+CPPUNIT_PLUGIN_IMPLEMENT();</div><div>=A0</div><div>=A0/* vim:set shi=
ftwidth=3D4 softtabstop=3D4 expandtab: */</div><div>diff --git a/sal/qa/sys=
tools/test_comtools.cxx b/sal/qa/systools/test_comtools.cxx</div><div>index=
f09a7b4..02cdc42 100644</div>
<div>--- a/sal/qa/systools/test_comtools.cxx</div><div>+++ b/sal/qa/systool=
s/test_comtools.cxx</div><div>@@ -31,7 +31,9 @@</div><div>=A0#include "=
;precompiled_sal.hxx"</div><div>=A0// autogenerated file with <a href=
=3D"http://codegen.pl">codegen.pl</a></div>
<div>=A0</div><div>-#include <testshl/simpleheader.hxx></div><div>+#i=
nclude <cppunit/TestFixture.h></div><div>+#include <cppunit/extens=
ions/HelperMacros.h></div><div>+#include <cppunit/plugin/TestPlugIn.h=
></div>
<div>=A0#include <systools/win32/comtools.hxx></div><div>=A0</div><di=
v>=A0class COMObject : public IUnknown</div><div>@@ -240,13 +242,13 @@ name=
space test_comtools</div><div>=A0 =A0 =A0};</div><div>=A0</div><div>=A0// -=
---------------------------------------------------------------------------=
-</div>
<div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_comtools::test_COMReferenc=
e, "test_comtools");</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(t=
est_COMReference);</div><div>=A0</div><div>=A0} // namespace rtl_OUString</=
div>
<div>=A0</div><div>=A0</div><div>=A0// this macro creates an empty function=
, which will called by the RegisterAllFunctions()</div><div>=A0// to let th=
e user the possibility to also register some functions by hand.</div><div>-=
NOADDITIONAL;</div>
<div>+CPPUNIT_PLUGIN_IMPLEMENT();</div><div>=A0</div><div>=A0/* vim:set shi=
ftwidth=3D4 softtabstop=3D4 expandtab: */</div><div>diff --git a/sal/qa/tes=
tHelperFunctions/testHelperFunctions.cxx b/sal/qa/testHelperFunctions/testH=
elperFunctions.cxx</div>
<div>index 6341fe3..44da051 100644</div><div>--- a/sal/qa/testHelperFunctio=
ns/testHelperFunctions.cxx</div><div>+++ b/sal/qa/testHelperFunctions/testH=
elperFunctions.cxx</div><div>@@ -36,7 +36,9 @@</div><div>=A0</div><div>=A0#=
include "stringhelper.hxx"</div>
<div>=A0</div><div>-#include <testshl/simpleheader.hxx></div><div>+#i=
nclude <cppunit/TestFixture.h></div><div>+#include <cppunit/extens=
ions/HelperMacros.h></div><div>+#include <cppunit/plugin/TestPlugIn.h=
></div>
<div>=A0</div><div>=A0// void isJaBloed()</div><div>=A0// {</div><div>@@ -4=
47,11 +449,11 @@ void test_TimeValues::t_time3()</div><div>=A0} // namespac=
e testOfHelperFunctions</div><div>=A0</div><div>=A0// ---------------------=
--------------------------------------------------------</div>
<div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( testOfHelperFunctions::test_t_=
print, "helperFunctions" );</div><div>-CPPUNIT_TEST_SUITE_NAMED_R=
EGISTRATION( testOfHelperFunctions::test_t_abs64, "helperFunctions&quo=
t; );</div>
<div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( testOfHelperFunctions::test_Ti=
meValues, "helperFunctions" );</div><div>+CPPUNIT_TEST_SUITE_REGI=
STRATION(test_t_print);</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(test_t_a=
bs64);</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(test_TimeValues);</div><div>=A0</div>=
<div>=A0// ----------------------------------------------------------------=
-------------</div><div>-NOADDITIONAL;</div><div>+CPPUNIT_PLUGIN_IMPLEMENT(=
);</div>
<div>=A0</div><div>=A0/* vim:set shiftwidth=3D4 softtabstop=3D4 expandtab: =
*/</div><div>diff --git a/sal/qa/testHelperFunctions/testHelperFunctions2.c=
xx b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx</div><div>index 52=
ec091..b6bda50 100644</div>
<div>--- a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx</div><div>++=
+ b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx</div><div>@@ -29,7 =
+29,9 @@</div><div>=A0</div><div>=A0// MARKER(update_precomp.py): autogen i=
nclude statement, do not remove</div>
<div>=A0#include "precompiled_sal.hxx"</div><div>-#include <te=
stshl/simpleheader.hxx></div><div>+#include <cppunit/TestFixture.h>=
;</div><div>+#include <cppunit/extensions/HelperMacros.h></div><div>
+#include <cppunit/plugin/TestPlugIn.h></div><div>=A0#include "s=
tringhelper.hxx"</div><div>=A0</div><div>=A0namespace testOfHelperFunc=
tions</div><div>@@ -55,7 +57,7 @@ namespace testOfHelperFunctions</div><div=
>=A0} // namespace testOfHelperFunctions</div>
<div>=A0</div><div>=A0// --------------------------------------------------=
---------------------------</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATIO=
N( testOfHelperFunctions::test_valueequal, "helperFunctions" );</=
div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(test_valueequal);</div><div>=A0</div>=
<div>=A0// ----------------------------------------------------------------=
-------------</div><div>=A0// This is only allowed to be in one file!</div>=
<div>
diff --git a/salhelper/qa/<a href=3D"http://makefile.mk">makefile.mk</a> b/=
salhelper/qa/<a href=3D"http://makefile.mk">makefile.mk</a></div><div>index=
fae96cf..0beb292 100644</div><div>--- a/salhelper/qa/<a href=3D"http://mak=
efile.mk">makefile.mk</a></div>
<div>+++ b/salhelper/qa/<a href=3D"http://makefile.mk">makefile.mk</a></div=
><div>@@ -46,7 +46,4 @@ SLOFILES =3D $(SHL1OBJS)</div><div>=A0</div><div>=
=A0.INCLUDE: <a href=3D"http://target.mk">target.mk</a></div><div>=A0</div>=
<div>-ALLTAR: test</div>
<div>-</div><div>-test .PHONY: $(SHL1TARGETN)</div><div>- =A0 =A0cd $(SHL1T=
ARGETN:d) && $(TESTSHL2) $(SHL1TARGETN:f)</div><div>+.INCLUDE: _<a =
href=3D"http://cppunit.mk">cppunit.mk</a></div><div>diff --git a/salhelper/=
qa/test_api.cxx b/salhelper/qa/test_api.cxx</div>
<div>index dfdbee5..fd00742 100644</div><div>--- a/salhelper/qa/test_api.cx=
x</div><div>+++ b/salhelper/qa/test_api.cxx</div><div>@@ -57,7 +57,9 @@ std=
::type_info const & getSimpleReferenceObjectTypeInfo()</div><div>=A0</d=
iv>
<div>=A0}</div><div>=A0</div><div>-#include "testshl/simpleheader.hxx&=
quot;</div><div>+#include <cppunit/TestFixture.h></div><div>+#include=
<cppunit/extensions/HelperMacros.h></div><div>+#include <cppunit/=
plugin/TestPlugIn.h></div>
<div>=A0#include "osl/mutex.hxx"</div><div>=A0#include "salh=
elper/condition.hxx"</div><div>=A0#include "salhelper/dynload.hxx=
"</div><div>@@ -244,10 +246,10 @@ void Test::testDerivedSimpleReferenc=
eObject() {</div>
<div>=A0 =A0 =A0}</div><div>=A0}</div><div>=A0</div><div>-CPPUNIT_TEST_SUIT=
E_NAMED_REGISTRATION(Test, "alltests");</div><div>+CPPUNIT_TEST_S=
UITE_REGISTRATION(Test);</div><div>=A0</div><div>=A0}</div><div>=A0</div><d=
iv>-NOADDITIONAL;</div>
<div>+CPPUNIT_PLUGIN_IMPLEMENT();</div><div>=A0</div><div>=A0/* vim:set shi=
ftwidth=3D4 softtabstop=3D4 expandtab: */</div><div>diff --git a/salhelper/=
qa/version.map b/salhelper/qa/version.map</div><div>index de41d83..896d751 =
100755</div>
<div>--- a/salhelper/qa/version.map</div><div>+++ b/salhelper/qa/version.ma=
p</div><div>@@ -1,6 +1,6 @@</div><div>=A0UDK_3_0_0 {</div><div>=A0 =A0 =A0g=
lobal:</div><div>- =A0 =A0 =A0 =A0registerAllTestFunction;</div><div>+ =A0 =
=A0 =A0 =A0cppunitTestPlugIn;</div>
<div>=A0 =A0 =A0local:</div><div>=A0 =A0 =A0 =A0 =A0*;</div><div>=A0};</div=
><div>diff --git a/sdext/source/pdfimport/test/export.map b/sdext/source/pd=
fimport/test/export.map</div><div>index 7321bbc..3308588 100755</div><div>-=
-- a/sdext/source/pdfimport/test/export.map</div>
<div>+++ b/sdext/source/pdfimport/test/export.map</div><div>@@ -27,7 +27,7 =
@@</div><div>=A0</div><div>=A0UDK_3_0_0 {</div><div>=A0 =A0 =A0global:</div=
><div>- =A0 =A0 =A0 =A0registerAllTestFunction;</div><div>+ =A0 =A0 =A0 =A0=
cppunitTestPlugIn;</div>
<div>=A0</div><div>=A0 =A0 =A0local:</div><div>=A0 =A0 =A0 =A0 =A0*;</div><=
div>diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfim=
port/test/tests.cxx</div><div>index 145f9387..7136ccf 100644</div><div>--- =
a/sdext/source/pdfimport/test/tests.cxx</div>
<div>+++ b/sdext/source/pdfimport/test/tests.cxx</div><div>@@ -47,7 +47,9 @=
@</div><div>=A0#include <rtl/math.hxx></div><div>=A0#include <osl/=
file.hxx></div><div>=A0#include <osl/process.h></div><div>-#includ=
e <testshl/simpleheader.hxx></div>
<div>+#include <cppunit/TestFixture.h></div><div>+#include <cppuni=
t/extensions/HelperMacros.h></div><div>+#include <cppunit/plugin/Test=
PlugIn.h></div><div>=A0#include <cppuhelper/compbase1.hxx></div>
<div>=A0#include <cppuhelper/bootstrap.hxx></div><div>=A0#include <=
;cppuhelper/basemutex.hxx></div><div>@@ -572,13 +574,13 @@ namespace</di=
v><div>=A0</div><div>=A0// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D</div>
<div>=A0</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(PDFITest, "P=
DFITest");</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(PDFITest);</div>=
<div>=A0</div><div>=A0</div><div>=A0// ------------------------------------=
-----------------------------------------</div>
<div>=A0</div><div>=A0// this macro creates an empty function, which will c=
alled by the RegisterAllFunctions()</div><div>=A0// to let the user the pos=
sibility to also register some functions by hand.</div><div>-NOADDITIONAL;<=
/div>
<div>+CPPUNIT_PLUGIN_IMPLEMENT();</div><div>=A0</div><div>=A0/* vim:set shi=
ftwidth=3D4 softtabstop=3D4 expandtab: */</div><div>diff --git a/shell/qa/r=
ecent_docs.cxx b/shell/qa/recent_docs.cxx</div><div>index e0907db..572dc66 =
100644</div>
<div>--- a/shell/qa/recent_docs.cxx</div><div>+++ b/shell/qa/recent_docs.cx=
x</div><div>@@ -29,7 +29,9 @@</div><div>=A0// MARKER(update_precomp.py): au=
togen include statement, do not remove</div><div>=A0#include "precompi=
led_shell.hxx"</div>
<div>=A0</div><div>-#include <testshl/simpleheader.hxx></div><div>+#i=
nclude <cppunit/TestFixture.h></div><div>+#include <cppunit/extens=
ions/HelperMacros.h></div><div>+#include <cppunit/plugin/TestPlugIn.h=
></div>
<div>=A0</div><div>=A0#include "systemshell.hxx"</div><div>=A0#in=
clude "osl/file.hxx"</div><div>@@ -217,8 +219,8 @@ public:</div><=
div>=A0</div><div>=A0</div><div>=A0// register test suites</div><div>-CPPUN=
IT_TEST_SUITE_NAMED_REGISTRATION(Test_AddToRecentDocs, "Test_AddToRece=
ntDocs");</div>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(Test_AddToRecentDocs);</div><div>=A0<=
/div><div>-NOADDITIONAL;</div><div>+CPPUNIT_PLUGIN_IMPLEMENT();</div><div>=
=A0</div><div>=A0/* vim:set shiftwidth=3D4 softtabstop=3D4 expandtab: */</d=
iv><div>
diff --git a/unoxml/test/domtest.cxx b/unoxml/test/domtest.cxx</div><div>in=
dex ff44e2b..29e32f9 100644</div><div>--- a/unoxml/test/domtest.cxx</div><d=
iv>+++ b/unoxml/test/domtest.cxx</div><div>@@ -28,7 +28,9 @@</div><div>
=A0</div><div>=A0// autogenerated file with <a href=3D"http://codegen.pl">c=
odegen.pl</a></div><div>=A0</div><div>-#include <testshl/simpleheader.hx=
x></div><div>+#include <cppunit/TestFixture.h></div><div>+#include=
<cppunit/extensions/HelperMacros.h></div>
<div>+#include <cppunit/plugin/TestPlugIn.h></div><div>=A0</div><div>=
=A0#include <rtl/ref.hxx></div><div>=A0#include <osl/file.hxx><=
/div><div>@@ -387,8 +389,8 @@ struct SerializerTest : public CppUnit::TestF=
ixture</div>
<div>=A0};</div><div>=A0</div><div>=A0// ----------------------------------=
-------------------------------------------</div><div>-CPPUNIT_TEST_SUITE_N=
AMED_REGISTRATION(BasicTest, "BasicTest");</div><div>-CPPUNIT_TES=
T_SUITE_NAMED_REGISTRATION(SerializerTest, "SerializerTest");</di=
v>
<div>+CPPUNIT_TEST_SUITE_REGISTRATION(BasicTest);</div><div>+CPPUNIT_TEST_S=
UITE_REGISTRATION(SerializerTest);</div><div>=A0}</div><div>=A0</div><div>=
=A0</div><div>@@ -396,6 +398,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Ser=
ializerTest, "SerializerTest");</div>
<div>=A0</div><div>=A0// this macro creates an empty function, which will c=
alled by the RegisterAllFunctions()</div><div>=A0// to let the user the pos=
sibility to also register some functions by hand.</div><div>-NOADDITIONAL;<=
/div>
<div>+CPPUNIT_PLUGIN_IMPLEMENT();</div><div>=A0</div><div>=A0/* vim:set shi=
ftwidth=3D4 softtabstop=3D4 expandtab: */</div><div>diff --git a/unoxml/tes=
t/export.map b/unoxml/test/export.map</div><div>index 7321bbc..d0e9a48 1006=
44</div>
<div>--- a/unoxml/test/export.map</div><div>+++ b/unoxml/test/export.map</d=
iv><div>@@ -27,7 +27,7 @@</div><div>=A0</div><div>=A0UDK_3_0_0 {</div><div>=
=A0 =A0 =A0global:</div><div>- =A0 =A0 =A0 =A0registerAllTestFunction;</div=
><div>+<span class=3D"Apple-tab-span" style=3D"white-space:pre"> </span>cp=
punitTestPlugIn;</div>
<div>=A0</div><div>=A0 =A0 =A0local:</div><div>=A0 =A0 =A0 =A0 =A0*;</div><=
div>diff --git a/writerfilter/qa/cppunittests/odiapi/export.map b/writerfil=
ter/qa/cppunittests/odiapi/export.map</div><div>index 7321bbc..3308588 1006=
44</div><div>--- a/writerfilter/qa/cppunittests/odiapi/export.map</div>
<div>+++ b/writerfilter/qa/cppunittests/odiapi/export.map</div><div>@@ -27,=
7 +27,7 @@</div><div>=A0</div><div>=A0UDK_3_0_0 {</div><div>=A0 =A0 =A0glob=
al:</div><div>- =A0 =A0 =A0 =A0registerAllTestFunction;</div><div>+ =A0 =A0=
=A0 =A0cppunitTestPlugIn;</div>
<div>=A0</div><div>=A0 =A0 =A0local:</div><div>=A0 =A0 =A0 =A0 =A0*;</div><=
div>diff --git a/writerfilter/qa/cppunittests/odiapi/testCore.cxx b/writerf=
ilter/qa/cppunittests/odiapi/testCore.cxx</div><div>index a88f424..965ad4f =
100644</div><div>
--- a/writerfilter/qa/cppunittests/odiapi/testCore.cxx</div><div>+++ b/writ=
erfilter/qa/cppunittests/odiapi/testCore.cxx</div><div>@@ -27,7 +27,9 @@</d=
iv><div>=A0 ***************************************************************=
*********/</div>
<div>=A0</div><div>=A0</div><div>-#include <testshl/simpleheader.hxx>=
</div><div>+#include <cppunit/TestFixture.h></div><div>+#include <=
cppunit/extensions/HelperMacros.h></div><div>+#include <cppunit/plugi=
n/TestPlugIn.h></div>
<div>=A0#include <odiapi/core/Node.hxx></div><div>=A0#include <odi=
api/props/Properties.hxx></div><div>=A0</div><div>@@ -168,7 +170,7 @@ pu=
blic:</div><div>=A0</div><div>=A0//#####################################</d=
iv><div>
=A0// register test suites</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION=
(TestCore, "TestCore");</div><div>+CPPUNIT_TEST_SUITE_REGISTRATIO=
N(TestCore);</div><div>=A0</div><div>=A0//NOADDITIONAL;</div><div>=A0</div>=
<div>
diff --git a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx b/writerf=
ilter/qa/cppunittests/odiapi/testProperty.cxx</div><div>index 3ec3448..987e=
f3f 100644</div><div>--- a/writerfilter/qa/cppunittests/odiapi/testProperty=
.cxx</div>
<div>+++ b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx</div><div>@=
@ -26,7 +26,9 @@</div><div>=A0 *</div><div>=A0 ****************************=
********************************************/</div><div>=A0</div><div>-#inc=
lude <testshl/simpleheader.hxx></div>
<div>+#include <cppunit/TestFixture.h></div><div>+#include <cppuni=
t/extensions/HelperMacros.h></div><div>+#include <cppunit/plugin/Test=
PlugIn.h></div><div>=A0#include <odiapi/props/Properties.hxx></div=
>
<div>=A0#include "FileLoggerImpl.hxx"</div><div>=A0#include "=
;ExternalViewLogger.hxx"</div><div>@@ -681,8 +683,8 @@ public:</div><d=
iv>=A0</div><div>=A0//#####################################</div><div>=A0//=
register test suites</div>
<div>-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestProperty, "TestPropert=
y");</div><div>+CPPUNIT_TEST_SUITE_REGISTRATION(TestProperty);</div><d=
iv>=A0</div><div>-NOADDITIONAL;</div><div>+CPPUNIT_PLUGIN_IMPLEMENT();</div=
>
<div>=A0</div><div>=A0/* vim:set shiftwidth=3D4 softtabstop=3D4 expandtab: =
*/</div><div>diff --git a/writerfilter/qa/cppunittests/qname/export.map b/w=
riterfilter/qa/cppunittests/qname/export.map</div><div>index 7321bbc..33085=
88 100644</div>
<div>--- a/writerfilter/qa/cppunittests/qname/export.map</div><div>+++ b/wr=
iterfilter/qa/cppunittests/qname/export.map</div><div>@@ -27,7 +27,7 @@</di=
v><div>=A0</div><div>=A0UDK_3_0_0 {</div><div>=A0 =A0 =A0global:</div><div>=
- =A0 =A0 =A0 =A0registerAllTestFunction;</div>
<div>+ =A0 =A0 =A0 =A0cppunitTestPlugIn;</div><div>=A0</div><div>=A0 =A0 =
=A0local:</div><div>=A0 =A0 =A0 =A0 =A0*;</div><div>diff --git a/writerfilt=
er/qa/cppunittests/qname/testQName.cxx b/writerfilter/qa/cppunittests/qname=
/testQName.cxx</div><div>
index 2a2b26e..bc5de0f 100644</div><div>--- a/writerfilter/qa/cppunittests/=
qname/testQName.cxx</div><div>+++ b/writerfilter/qa/cppunittests/qname/test=
QName.cxx</div><div>@@ -26,7 +26,9 @@</div><div>=A0 *</div><div>=A0 *******=
*****************************************************************/</div>
<div>=A0</div><div>-#include <testshl/simpleheader.hxx></div><div>+#i=
nclude <cppunit/TestFixture.h></div><div>+#include <cppunit/extens=
ions/HelperMacros.h></div><div>+#include <cppunit/plugin/TestPlugIn.h=
></div>
<div>=A0#include <odiapi/qname/QName.hxx></div><div>=A0#include <s=
tdio.h></div><div>=A0#include <rtl/string.hxx></div><div>@@ -7529,=
8 +7531,8 @@ public:</div><div>=A0</div><div>=A0//#########################=
############</div>
<div>=A0// register test suites</div><div>-CPPUNIT_TEST_SUITE_NAMED_REGISTR=
ATION(TestQName, "TestQName");</div><div>+CPPUNIT_TEST_SUITE_REGI=
STRATION(TestQName);</div><div>=A0</div><div>-NOADDITIONAL;</div><div>+CPPU=
NIT_PLUGIN_IMPLEMENT();</div>
<div>=A0</div><div>=A0/* vim:set shiftwidth=3D4 softtabstop=3D4 expandtab: =
*/</div><div>--=A0</div><div>1.7.5.4</div><div><br></div></div><div><br></d=
iv></div>
--0016e6d7e827a2105b04b2281552--
More information about the LibreOffice
mailing list