diff options
| author | sb <sb@openoffice.org> | 2010-05-14 16:22:06 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-05-14 16:22:06 +0200 |
| commit | af5cef5b1e2f3d76f52340bbd2ea8bd93cb5185d (patch) | |
| tree | c39196dc04450640a0edadcee3b96917251bb63d /smoketestoo_native | |
| parent | 88d1e25d5c61d1d4ef12f0ac397db3c8b399564c (diff) | |
sb123: #i111601# various additional test helper functionality
Diffstat (limited to 'smoketestoo_native')
| -rw-r--r-- | smoketestoo_native/makefile.mk | 3 | ||||
| -rw-r--r-- | smoketestoo_native/smoketest.cxx | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index 0337c748d914..ec0d6be313c8 100644 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -49,7 +49,8 @@ ALLTAR : cpptest cpptest : $(SHL1TARGETN) $(BIN)/smoketestdoc.sxw -OOO_CPPTEST_ARGS = $(SHL1TARGETN) -env:arg-doc=$(BIN)/smoketestdoc.sxw +TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw +CPPTEST_LIBRARY = $(SHL1TARGETN) $(BIN)/smoketestdoc.sxw: data/smoketestdoc.sxw $(COPY) $< $@ diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx index 57018f56a3bd..0d7e636f142b 100644 --- a/smoketestoo_native/smoketest.cxx +++ b/smoketestoo_native/smoketest.cxx @@ -53,7 +53,7 @@ #include "osl/diagnose.h" #include "rtl/ustring.h" #include "rtl/ustring.hxx" -#include "test/getargument.hxx" +#include "test/gettestargument.hxx" #include "test/officeconnection.hxx" #include "test/oustringostreaminserter.hxx" #include "test/toabsolutefileurl.hxx" @@ -121,8 +121,8 @@ void Test::tearDown() { void Test::test() { rtl::OUString doc; CPPUNIT_ASSERT( - test::getArgument( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("doc")), &doc)); + test::getTestArgument( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("smoketest.doc")), &doc)); css::uno::Sequence< css::beans::PropertyValue > args(1); args[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")); |