[PATCH] EasyHacks: Reanimated tests in ure/codemaker

[Wilhelm Pflueger]

---
 codemaker/prj/build.lst                            |    2 +-
 codemaker/test/cppumaker/makefile.mk               |    3 ++-
 .../test/cppumaker/test_codemaker_cppumaker.cxx    |    8 +++++---
 codemaker/test/cppumaker/version.map               |    3 ++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/codemaker/prj/build.lst b/codemaker/prj/build.lst
index e0520d5..d9b1066 100644
--- a/codemaker/prj/build.lst
+++ b/codemaker/prj/build.lst
@@ -7,5 +7,5 @@ cm	codemaker\source\commoncpp				nmake	-	all	cm_cpp cm_inc NULL
 cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker cm_cpp cm_inc NULL
 cm	codemaker\source\commonjava				nmake	-	all	cm_java cm_inc NULL
 cm	codemaker\source\javamaker				nmake	-	all	cm_javamaker cm_codemaker cm_java cm_inc NULL
-
+cm  codemaker\test\cppumaker                nmake   -   all cm_test_cppumaker NULL
 
diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk
index 5060f75..21f9d0c 100644
--- a/codemaker/test/cppumaker/makefile.mk
+++ b/codemaker/test/cppumaker/makefile.mk
@@ -70,4 +70,5 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl
     $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
 
 test .PHONY: $(SHL1TARGETN)
-    $(AUGMENT_LIBRARY_PATH) testshl2 $<
+    $(CPPUNITTESTER) $<
+#    $(AUGMENT_LIBRARY_PATH) testshl2 $<
diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
index a55cefa..6d9df43 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 f313c44..7f11155 100644
--- a/codemaker/test/cppumaker/version.map
+++ b/codemaker/test/cppumaker/version.map
@@ -27,7 +27,8 @@
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
+
 
     local:
         *;
-- 
1.7.0.4


--=-HTzTIIJTcUEPNB/Z6PZn--