diff options
| author | sb <sb@openoffice.org> | 2010-05-14 16:49:41 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-05-14 16:49:41 +0200 |
| commit | 8a5be93fe009a4d274f1338f3a816c925742d572 (patch) | |
| tree | d63e7958b55ca7475b6611d09bfb341879567e93 /desktop/qa | |
| parent | 39f67280b8ee579d29ec875714be564a1cdd588e (diff) | |
sb123: #i111602# adapted desktop/qa/deployment_misc to new test framework
Diffstat (limited to 'desktop/qa')
| -rw-r--r-- | desktop/qa/deployment_misc/makefile.mk | 10 | ||||
| -rw-r--r-- | desktop/qa/deployment_misc/test_dp_version.cxx | 9 | ||||
| -rw-r--r-- | desktop/qa/deployment_misc/version.map | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk index 15faef0dc4..b237a00678 100644 --- a/desktop/qa/deployment_misc/makefile.mk +++ b/desktop/qa/deployment_misc/makefile.mk @@ -35,20 +35,16 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: $(PRJ)$/source$/deployment$/inc$/dp_misc.mk CFLAGSCXX += $(CPPUNIT_CFLAGS) -DLLPRE = # no leading "lib" on .so files SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/test_dp_version.obj -SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB) $(TESTSHL2LIB) +SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB) SHL1VERSIONMAP = version.map +SHL1RPATH = NONE SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) .INCLUDE: target.mk - -ALLTAR: test - -test .PHONY: $(SHL1TARGETN) - $(TESTSHL2) $(SHL1TARGETN) +.INCLUDE : _cppunit.mk diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx index 5640335990..cc543fc1b9 100644 --- a/desktop/qa/deployment_misc/test_dp_version.cxx +++ b/desktop/qa/deployment_misc/test_dp_version.cxx @@ -32,7 +32,10 @@ #include <cstddef> -#include "testshl/simpleheader.hxx" +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include "rtl/ustring.h" #include "rtl/ustring.hxx" @@ -83,8 +86,8 @@ void Test::test() { } } -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests"); +CPPUNIT_TEST_SUITE_REGISTRATION(Test); } -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/desktop/qa/deployment_misc/version.map b/desktop/qa/deployment_misc/version.map index f313c44bd7..0dbbcc5a73 100644 --- a/desktop/qa/deployment_misc/version.map +++ b/desktop/qa/deployment_misc/version.map @@ -27,7 +27,7 @@ UDK_3_0_0 { global: - registerAllTestFunction; + cppunitTestPlugIn; local: *; |