get these tests building again

3 files changed, 20 insertions, 47 deletions

diff --git a/svl/qa/export.map b/svl/qa/export.map
index 7321bbca16ad..3308588ef6f8 100644
--- a/svl/qa/export.map
+++ b/svl/qa/export.map
@@ -27,7 +27,7 @@
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/svl/qa/makefile.mk b/svl/qa/makefile.mk
index 7e8c7ee795cc..b4444f5b5c12 100644
--- a/svl/qa/makefile.mk
+++ b/svl/qa/makefile.mk
@@ -35,10 +35,14 @@ ENABLE_EXCEPTIONS = true
 
 .INCLUDE :  settings.mk
 
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
+#building with stlport, but cppunit was not built with stlport
+.IF "$(USE_SYSTEM_STL)"!="YES"
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGSCXX+=-DADAPT_EXT_STL
+.ENDIF
+.ENDIF
+CFLAGSCXX+=$(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:job by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/test_URIHelper.obj
 
@@ -53,49 +57,11 @@ SHL1STDLIBS=\
      $(TESTSHL2LIB)    \
      $(CPPUNITLIB)
 
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME    =$(SHL1TARGET)
+SHL1IMPLIB=i$(SHL1TARGET)
+DEF1NAME=$(SHL1TARGET)
 SHL1VERSIONMAP= export.map
-# auto generated Target:job
-# END ------------------------------------------------------------------
-
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
 .INCLUDE : _cppunit.mk
-
-# LLA: old stuff
-# USE_DEFFILE = true
-#
-# .INCLUDE: settings.mk
-#
-# .IF "$(OS)" == "WNT"
-# REGEXP = "s/^[\#].*$$//"
-# .ELSE # OS, WNT
-# REGEXP = 's/^[\#].*$$//'
-# .ENDIF # OS, WNT
-#
-# SHL1TARGET = URIHelper
-# SHL1OBJS = \
-# 	$(SLO)$/test_URIHelper.obj
-# SHL1STDLIBS = \
-#     $(CPPULIB) \
-#     $(CPPUHELPERLIB) \
-#     $(SALLIB) \
-#     $(SVTOOLLIB) \
-#     $(TOOLSLIB) \
-#     $(UNOTOOLSLIB)
-#
-# DEF1NAME = $(SHL1TARGET)
-# DEF1EXPORTFILE = $(MISC)$/$(SHL1TARGET).dxp
-#
-# .INCLUDE: target.mk
-#
-# $(MISC)$/$(SHL1TARGET).dxp: sce$/$(SHL1TARGET).sce
-#     + $(TYPE) $< | sed $(REGEXP) > $@
-#     + $(TYPE) $@ | sed "s/^/test_/" > $(MISC)$/$(SHL1TARGET).tst
-#     + $(TYPE) $(MISC)$/$(SHL1TARGET).tst | sed "/test_./ w $@"
diff --git a/svl/qa/test_URIHelper.cxx b/svl/qa/test_URIHelper.cxx
index 06b2eb27d234..701d4c9dc596 100644
--- a/svl/qa/test_URIHelper.cxx
+++ b/svl/qa/test_URIHelper.cxx
@@ -31,6 +31,14 @@
 
 #include "sal/config.h"
 
+#include "preextstl.h"
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include "postextstl.h"
+
 #include <cstddef>
 
 #include "com/sun/star/lang/Locale.hpp"
@@ -55,7 +63,6 @@
 #include "cppuhelper/bootstrap.hxx"
 #include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/implbase2.hxx"
-#include "testshl/simpleheader.hxx"
 #include "osl/diagnose.h"
 #include "rtl/strbuf.hxx"
 #include "rtl/string.h"
@@ -454,10 +461,10 @@ void Test::testFindFirstURLInText() {
 
 css::uno::Reference< css::uno::XComponentContext > Test::m_context;
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */