summaryrefslogtreecommitdiff
path: root/codemaker/test
diff options
context:
space:
mode:
authorWilhelm Pflueger <Wilhelm.Pflueger@web.de>2011-03-11 00:59:16 +0100
committerDavid Tardon <dtardon@redhat.com>2011-03-15 08:47:18 +0100
commit547d0e7abea09d382821311bcfd008a7086bef5e (patch)
tree65433ac774dd1fb126c59079e267df085e9c2742 /codemaker/test
parent2c7cebaf8306c7d5135758e06d3be65398ce97ed (diff)
EasyHacks: Reanimated tests in ure/codemaker
Diffstat (limited to 'codemaker/test')
-rw-r--r--codemaker/test/cppumaker/makefile.mk2
-rw-r--r--codemaker/test/cppumaker/test_codemaker_cppumaker.cxx8
-rw-r--r--codemaker/test/cppumaker/version.map2
3 files changed, 7 insertions, 5 deletions
diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk
index 5060f75e8203..c91d3c653799 100644
--- a/codemaker/test/cppumaker/makefile.mk
+++ b/codemaker/test/cppumaker/makefile.mk
@@ -70,4 +70,4 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl
$(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
test .PHONY: $(SHL1TARGETN)
- $(AUGMENT_LIBRARY_PATH) testshl2 $<
+ $(CPPUNITTESTER) $<
diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
index 92d4d7024f62..73a0ed84185f 100644
--- a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
+++ b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
@@ -367,7 +367,9 @@
#include "com/sun/star/uno/Any.hxx"
#include "com/sun/star/uno/Type.hxx"
#include "com/sun/star/uno/TypeClass.hpp"
-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
@@ -561,10 +563,10 @@ void Test::testConstants() {
test::codemaker::cppumaker::Constants::unsignedHyperMax);
}
-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/codemaker/test/cppumaker/version.map b/codemaker/test/cppumaker/version.map
index 7321bbca16ad..3308588ef6f8 100644
--- a/codemaker/test/cppumaker/version.map
+++ b/codemaker/test/cppumaker/version.map
@@ -27,7 +27,7 @@
UDK_3_0_0 {
global:
- registerAllTestFunction;
+ cppunitTestPlugIn;
local:
*;