sb118: adpated some stoc unit test to new CppUnit framework

3 files changed, 36 insertions, 40 deletions

diff --git a/stoc/test/uriproc/makefile.mk b/stoc/test/uriproc/makefile.mk
index 78b54bb2a5a2..6ab41afacd6c 100644
--- a/stoc/test/uriproc/makefile.mk
+++ b/stoc/test/uriproc/makefile.mk
@@ -29,7 +29,11 @@
 #
 #*************************************************************************
 
-PRJ := ..$/..
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
+
+PRJ := ../..
 PRJNAME := stoc
 TARGET := test_uriproc
 
@@ -39,25 +43,11 @@ ENABLE_EXCEPTIONS := TRUE
 
 DLLPRE = # no leading "lib" on .so files
 
-UNOTYPES = \
-    com.sun.star.beans.XPropertySet \
-    com.sun.star.lang.XComponent \
-    com.sun.star.lang.XMultiComponentFactory \
-    com.sun.star.uno.XComponentContext \
-    com.sun.star.uri.ExternalUriReferenceTranslator \
-    com.sun.star.uri.UriReferenceFactory \
-    com.sun.star.uri.VndSunStarPkgUrlReferenceFactory \
-    com.sun.star.uri.XExternalUriReferenceTranslator \
-    com.sun.star.uri.XUriReference \
-    com.sun.star.uri.XUriReferenceFactory \
-    com.sun.star.uri.XVndSunStarPkgUrlReferenceFactory \
-    com.sun.star.uri.XVndSunStarScriptUrlReference \
-    com.sun.star.util.XMacroExpander
-
 SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_uriproc.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
+SHL1OBJS = $(SLO)/test_uriproc.obj
+SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
 SHL1VERSIONMAP = version.map
+SHL1RPATH = NONE
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
 
@@ -65,11 +55,24 @@ SLOFILES = $(SHL1OBJS)
 
 .INCLUDE: target.mk
 
+.IF "$(OS)" == "WNT"
+my_file = file:///
+.ELSE
+my_file = file://
+.END
+
 ALLTAR: test
 
-$(BIN)$/$(TARGET).rdb .ERRREMOVE:
-    $(COPY) $(SOLARBINDIR)$/types.rdb $@
-    regcomp -register -r $@ -c $(subst,$/,/ $(DLLDEST)$/stocservices.uno$(DLLPOST))
+test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb
+    $(CPPUNITTESTER) $(SHL1TARGETN) \
+        -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
+        -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/udkapi.rdb \
+        -env:OOO_TEST_PREFIX=$(my_file)$(PWD)/$(DLLDEST)/
+
+$(MISC)/$(TARGET)/services.rdb:
+    $(MKDIRHIER) $(@:d)
+    $(RM) $@
+    $(REGCOMP) -register -r $@ -wop=vnd.sun.star.expand:\$${{OOO_TEST_PREFIX}} \
+        -c $(DLLDEST)/stocservices.uno$(DLLPOST)
 
-test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).rdb
-    testshl2 $(SHL1TARGETN) -forward $(BIN)$/$(TARGET).rdb
+.END
diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx
index 71f92e504d64..6575259b69fb 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -31,7 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_stoc.hxx"
 
-#include "com/sun/star/beans/XPropertySet.hpp"
 #include "com/sun/star/lang/XComponent.hpp"
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
 #include "com/sun/star/uno/Reference.hxx"
@@ -46,10 +45,12 @@
 #include "com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory.hpp"
 #include "com/sun/star/uri/XVndSunStarScriptUrlReference.hpp"
 #include "com/sun/star/util/XMacroExpander.hpp"
-#include "cppuhelper/servicefactory.hxx"
-#include "testshl/simpleheader.hxx"
+#include "cppuhelper/bootstrap.hxx"
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
 #include "osl/diagnose.h"
-#include "osl/thread.h"
 #include "rtl/string.h"
 #include "rtl/string.hxx"
 #include "rtl/textenc.h"
@@ -151,20 +152,12 @@ private:
 };
 
 void Test::setUp() {
-    char const * registry = getForwardString();
-    css::uno::Reference< css::lang::XMultiServiceFactory > factory(
-        cppu::createRegistryServiceFactory(
-            rtl::OUString(
-                registry, rtl_str_getLength(registry),
-                osl_getThreadTextEncoding())));
-        //TODO: check for string conversion failure
-    css::uno::Reference< css::beans::XPropertySet >(
-        factory, css::uno::UNO_QUERY_THROW)->getPropertyValue(
-            rtl::OUString::createFromAscii("DefaultContext")) >>= m_context;
+    m_context = cppu::defaultBootstrap_InitialComponentContext();
     m_uriFactory = css::uri::UriReferenceFactory::create(m_context);
 }
 
 void Test::tearDown() {
+    m_uriFactory.clear();
     css::uno::Reference< css::lang::XComponent >(
         m_context, css::uno::UNO_QUERY_THROW)->dispose();
 }
@@ -1007,8 +1000,8 @@ void Test::testPkgUrlFactory() {
     }
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/stoc/test/uriproc/version.map b/stoc/test/uriproc/version.map
index 1bc00f407b81..7914837bd079 100644
--- a/stoc/test/uriproc/version.map
+++ b/stoc/test/uriproc/version.map
@@ -31,7 +31,7 @@
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;