diff options
20 files changed, 20 insertions, 291 deletions
diff --git a/test/inc/test/bootstrapfixture.hxx b/test/inc/test/bootstrapfixture.hxx index 791710c4cce4..7a0cc90220f5 100644 --- a/test/inc/test/bootstrapfixture.hxx +++ b/test/inc/test/bootstrapfixture.hxx @@ -40,7 +40,7 @@ #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" -#include "test/detail/testdllapi.hxx" +#include "test/testdllapi.hxx" namespace test { diff --git a/test/inc/test/gettestargument.hxx b/test/inc/test/gettestargument.hxx deleted file mode 100644 index 4fe11147bc16..000000000000 --- a/test/inc/test/gettestargument.hxx +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* <http://www.openoffice.org/license.html> -* for a copy of the LGPLv3 License. -* -************************************************************************/ - -#ifndef INCLUDED_TEST_GETTESTARGUMENT_HXX -#define INCLUDED_TEST_GETTESTARGUMENT_HXX - -#include "sal/config.h" - -#include "test/detail/testdllapi.hxx" - -namespace rtl { class OUString; } - -namespace test { - -// Obtain the value of a test argument (tunneled in via an "arg-testarg.<name>" -// bootstrap variable): -OOO_DLLPUBLIC_TEST bool getTestArgument( - rtl::OUString const & name, rtl::OUString * value); - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/test/officeconnection.hxx b/test/inc/test/officeconnection.hxx deleted file mode 100644 index e5250ce6aedf..000000000000 --- a/test/inc/test/officeconnection.hxx +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* <http://www.openoffice.org/license.html> -* for a copy of the LGPLv3 License. -************************************************************************/ - -#ifndef INCLUDED_TEST_OFFICECONNECTION_HXX -#define INCLUDED_TEST_OFFICECONNECTION_HXX - -#include "sal/config.h" - -#include "boost/noncopyable.hpp" -#include "com/sun/star/uno/Reference.hxx" -#include "osl/process.h" -#include "test/detail/testdllapi.hxx" - -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } - -namespace test { - -// Start up and shut down an OOo instance (details about the OOo instance are -// tunneled in via "arg-..." bootstrap variables): -class OOO_DLLPUBLIC_TEST OfficeConnection: private boost::noncopyable { -public: - OfficeConnection(); - - ~OfficeConnection(); - - void setUp(); - - void tearDown(); - - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - getComponentContext() const; - - // Must not be called before setUp or after tearDown: - bool isStillAlive() const; - -private: - oslProcess process_; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - context_; -}; - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/test/oustringostreaminserter.hxx b/test/inc/test/oustringostreaminserter.hxx deleted file mode 100644 index 2658cad31d67..000000000000 --- a/test/inc/test/oustringostreaminserter.hxx +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* <http://www.openoffice.org/license.html> -* for a copy of the LGPLv3 License. -************************************************************************/ - -#ifndef INCLUDED_TEST_OUSTRINGOSTREAMINSERTER_HXX -#define INCLUDED_TEST_OUSTRINGOSTREAMINSERTER_HXX - -#include "sal/config.h" - -#include <ostream> - -#include "osl/thread.h" -#include "rtl/ustring.hxx" - -// Include this header to support rtl::OUString in CPPUNIT_ASSERT macros. - -template< typename charT, typename traits > std::basic_ostream<charT, traits> & -operator <<( - std::basic_ostream<charT, traits> & stream, rtl::OUString const & string) -{ - return stream << - rtl::OUStringToOString(string, osl_getThreadTextEncoding()).getStr(); - // best effort; potentially loses data due to conversion failures and - // embedded null characters -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/test/detail/testdllapi.hxx b/test/inc/test/testdllapi.hxx index bc2231c84b13..bc2231c84b13 100644 --- a/test/inc/test/detail/testdllapi.hxx +++ b/test/inc/test/testdllapi.hxx diff --git a/test/inc/test/toabsolutefileurl.hxx b/test/inc/test/toabsolutefileurl.hxx deleted file mode 100644 index fdd8a7b966d7..000000000000 --- a/test/inc/test/toabsolutefileurl.hxx +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* <http://www.openoffice.org/license.html> -* for a copy of the LGPLv3 License. -************************************************************************/ - -#ifndef INCLUDED_TEST_TOABSOLUTEFILEURL_HXX -#define INCLUDED_TEST_TOABSOLUTEFILEURL_HXX - -#include "sal/config.h" - -#include "test/detail/testdllapi.hxx" - -namespace rtl { class OUString; } - -namespace test { - -// Convert a pathname in system notation, potentially relative to the process's -// current working directory, to an absolute file URL: -OOO_DLLPUBLIC_TEST rtl::OUString toAbsoluteFileUrl( - rtl::OUString const & relativePathname); - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/test/uniquepipename.hxx b/test/inc/test/uniquepipename.hxx deleted file mode 100644 index b66492ce271a..000000000000 --- a/test/inc/test/uniquepipename.hxx +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* <http://www.openoffice.org/license.html> -* for a copy of the LGPLv3 License. -* -************************************************************************/ - -#ifndef INCLUDED_TEST_UNIQUEPIPENAME_HXX -#define INCLUDED_TEST_UNIQUEPIPENAME_HXX - -#include "sal/config.h" - -#include "test/detail/testdllapi.hxx" - -namespace rtl { class OUString; } - -namespace test { - -// Create a system-wide unique name (for use with osl::Pipe): -OOO_DLLPUBLIC_TEST rtl::OUString uniquePipeName(rtl::OUString const & name); - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/prj/build.lst b/test/prj/build.lst index c99600b9d85a..f2209a95be98 100644 --- a/test/prj/build.lst +++ b/test/prj/build.lst @@ -1,2 +1,2 @@ te test : unotest vcl NULL -te test\source\cpp nmake - all source_cpp inc NULL +te test\source nmake - all source_cpp NULL diff --git a/test/source/cpp/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index d46cf4d11230..d46cf4d11230 100644 --- a/test/source/cpp/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx diff --git a/test/source/cpp/makefile.mk b/test/source/makefile.mk index 262326a6fc6d..c2266ce54cfa 100644 --- a/test/source/cpp/makefile.mk +++ b/test/source/makefile.mk @@ -23,7 +23,7 @@ # for a copy of the LGPLv3 License. #***********************************************************************/ -PRJ = ../.. +PRJ = .. PRJNAME = test TARGET = cpp @@ -48,6 +48,7 @@ SHL1IMPLIB = i$(SHL1TARGET) SHL1OBJS = $(SLOFILES) SHL1RPATH = NONE SHL1STDLIBS = \ + $(UNOTESTLIB) \ $(VCLLIB) \ $(TOOLSLIB) \ $(UCBHELPERLIB) \ diff --git a/unotest/inc/unotest/gettestargument.hxx b/unotest/inc/unotest/gettestargument.hxx index 4fe11147bc16..bc4ad1b68782 100644 --- a/unotest/inc/unotest/gettestargument.hxx +++ b/unotest/inc/unotest/gettestargument.hxx @@ -31,7 +31,7 @@ #include "sal/config.h" -#include "test/detail/testdllapi.hxx" +#include "unotest/detail/unotestdllapi.hxx" namespace rtl { class OUString; } @@ -39,7 +39,7 @@ namespace test { // Obtain the value of a test argument (tunneled in via an "arg-testarg.<name>" // bootstrap variable): -OOO_DLLPUBLIC_TEST bool getTestArgument( +OOO_DLLPUBLIC_UNOTEST bool getTestArgument( rtl::OUString const & name, rtl::OUString * value); } diff --git a/unotest/inc/unotest/officeconnection.hxx b/unotest/inc/unotest/officeconnection.hxx index e5250ce6aedf..f79e0de110d2 100644 --- a/unotest/inc/unotest/officeconnection.hxx +++ b/unotest/inc/unotest/officeconnection.hxx @@ -32,7 +32,7 @@ #include "boost/noncopyable.hpp" #include "com/sun/star/uno/Reference.hxx" #include "osl/process.h" -#include "test/detail/testdllapi.hxx" +#include "unotest/detail/unotestdllapi.hxx" namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; @@ -42,7 +42,7 @@ namespace test { // Start up and shut down an OOo instance (details about the OOo instance are // tunneled in via "arg-..." bootstrap variables): -class OOO_DLLPUBLIC_TEST OfficeConnection: private boost::noncopyable { +class OOO_DLLPUBLIC_UNOTEST OfficeConnection: private boost::noncopyable { public: OfficeConnection(); diff --git a/unotest/inc/unotest/uniquepipename.hxx b/unotest/inc/unotest/uniquepipename.hxx index b66492ce271a..0a9b2c1ff466 100644 --- a/unotest/inc/unotest/uniquepipename.hxx +++ b/unotest/inc/unotest/uniquepipename.hxx @@ -31,14 +31,14 @@ #include "sal/config.h" -#include "test/detail/testdllapi.hxx" +#include "unotest/detail/unotestdllapi.hxx" namespace rtl { class OUString; } namespace test { // Create a system-wide unique name (for use with osl::Pipe): -OOO_DLLPUBLIC_TEST rtl::OUString uniquePipeName(rtl::OUString const & name); +OOO_DLLPUBLIC_UNOTEST rtl::OUString uniquePipeName(rtl::OUString const & name); } diff --git a/unotest/prj/build.lst b/unotest/prj/build.lst index 1bb6c713b23b..d3be738a1cae 100644 --- a/unotest/prj/build.lst +++ b/unotest/prj/build.lst @@ -1,5 +1,5 @@ -unote unotest : BOOST:boost cppu cppuhelper CPPUNIT:cppunit javaunohelper offapi ridljar sal solenv stlport unoil qadevOOo vcl NULL -unote unotest\source\cpp nmake - all source_cpp inc NULL -unote unotest\source\cpp\unoexceptionprotector nmake - all source_cpp_unoexceptionprotector inc NULL +unote unotest : BOOST:boost cppu cppuhelper CPPUNIT:cppunit javaunohelper offapi ridljar sal solenv stlport unoil qadevOOo NULL +unote unotest\source\cpp nmake - all source_cpp NULL +unote unotest\source\cpp\unoexceptionprotector nmake - all source_cpp_unoexceptionprotector NULL unote unotest\source\java\org\openoffice\test nmake - all source_java NULL unote unotest\source\java\org\openoffice\test\tools nmake - all source_java_tools NULL diff --git a/unotest/source/cpp/gettestargument.cxx b/unotest/source/cpp/gettestargument.cxx index 0bc00062e8d3..24e5c57feeff 100644 --- a/unotest/source/cpp/gettestargument.cxx +++ b/unotest/source/cpp/gettestargument.cxx @@ -30,7 +30,7 @@ #include "rtl/ustring.h" #include "rtl/ustring.hxx" -#include "test/gettestargument.hxx" +#include "unotest/gettestargument.hxx" #include "getargument.hxx" diff --git a/unotest/source/cpp/makefile.mk b/unotest/source/cpp/makefile.mk index 31eafda84da9..b28b1edb2b22 100644 --- a/unotest/source/cpp/makefile.mk +++ b/unotest/source/cpp/makefile.mk @@ -40,7 +40,6 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS) SLOFILES = \ $(SLO)/getargument.obj \ $(SLO)/gettestargument.obj \ - $(SLO)/bootstrapfixture.obj \ $(SLO)/officeconnection.obj \ $(SLO)/toabsolutefileurl.obj \ $(SLO)/uniquepipename.obj @@ -53,16 +52,11 @@ SHL1IMPLIB = i$(SHL1TARGET) SHL1OBJS = $(SLOFILES) SHL1RPATH = NONE SHL1STDLIBS = \ - $(VCLLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ - $(UNOTOOLSLIB) \ $(CPPULIB) \ $(CPPUNITLIB) \ $(SALLIB) -SHL1TARGET = test +SHL1TARGET = unotest SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx index 9c8d4d549b71..1b2e47c36b15 100644 --- a/unotest/source/cpp/officeconnection.cxx +++ b/unotest/source/cpp/officeconnection.cxx @@ -40,9 +40,9 @@ #include "osl/time.h" #include "sal/macros.h" #include "sal/types.h" -#include "test/officeconnection.hxx" -#include "test/toabsolutefileurl.hxx" -#include "test/uniquepipename.hxx" +#include "unotest/officeconnection.hxx" +#include "unotest/toabsolutefileurl.hxx" +#include "unotest/uniquepipename.hxx" #include "getargument.hxx" diff --git a/unotest/source/cpp/toabsolutefileurl.cxx b/unotest/source/cpp/toabsolutefileurl.cxx index e7c97d2fb85f..ec9749174215 100644 --- a/unotest/source/cpp/toabsolutefileurl.cxx +++ b/unotest/source/cpp/toabsolutefileurl.cxx @@ -32,7 +32,7 @@ #include "osl/file.hxx" #include "osl/process.h" #include "rtl/ustring.hxx" -#include "test/toabsolutefileurl.hxx" +#include "unotest/toabsolutefileurl.hxx" namespace { diff --git a/unotest/source/cpp/uniquepipename.cxx b/unotest/source/cpp/uniquepipename.cxx index 1725ca218918..eae8de322f0d 100644 --- a/unotest/source/cpp/uniquepipename.cxx +++ b/unotest/source/cpp/uniquepipename.cxx @@ -34,7 +34,7 @@ #include "rtl/ustring.h" #include "rtl/ustring.hxx" #include "sal/types.h" -#include "test/uniquepipename.hxx" +#include "unotest/uniquepipename.hxx" namespace test { diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx index 7e7e0000c49a..3829bd1b3b6e 100644 --- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx +++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx @@ -24,7 +24,6 @@ * for a copy of the LGPLv3 License. ************************************************************************/ -#include "precompiled_test.hxx" #include "sal/config.h" #include "sal/precppunit.hxx" |