diff options
author | sb <sb@openoffice.org> | 2010-02-12 17:36:13 +0100 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-02-12 17:36:13 +0100 |
commit | 3ef6cfa566e6d419d58f2659a649ba9c1308cdc5 (patch) | |
tree | d7892a7ab74360ac41111320a3055d4a40465b11 /test | |
parent | 75d11d8f2f10604b35c6b0fb4bb24660f32f8329 (diff) |
sb118: moved test OOo installation stuff to new solenv/inc/installationtest.mk (makefile parts) and new test module (C++ and, new, Java unit test parts); adapted sw/qa/unoapi to new (Java) test framework
Diffstat (limited to 'test')
-rw-r--r-- | test/inc/makefile.mk | 38 | ||||
-rw-r--r-- | test/inc/pch/precompiled_test.cxx | 26 | ||||
-rw-r--r-- | test/inc/pch/precompiled_test.hxx | 30 | ||||
-rw-r--r-- | test/inc/test/detail/testdllapi.hxx | 39 | ||||
-rw-r--r-- | test/inc/test/getargument.hxx | 42 | ||||
-rw-r--r-- | test/inc/test/officeconnection.hxx | 63 | ||||
-rw-r--r-- | test/inc/test/oustringostreaminserter.hxx | 46 | ||||
-rw-r--r-- | test/inc/test/toabsolutefileurl.hxx | 42 | ||||
-rw-r--r-- | test/prj/build.lst | 4 | ||||
-rw-r--r-- | test/prj/d.lst | 12 | ||||
-rw-r--r-- | test/source/cpp/getargument.cxx | 42 | ||||
-rw-r--r-- | test/source/cpp/makefile.mk | 54 | ||||
-rw-r--r-- | test/source/cpp/officeconnection.cxx | 170 | ||||
-rw-r--r-- | test/source/cpp/toabsolutefileurl.cxx | 83 | ||||
-rw-r--r-- | test/source/java/OfficeConnection.java | 203 | ||||
-rw-r--r-- | test/source/java/makefile.mk | 40 |
16 files changed, 934 insertions, 0 deletions
diff --git a/test/inc/makefile.mk b/test/inc/makefile.mk new file mode 100644 index 000000000000..c8428466005b --- /dev/null +++ b/test/inc/makefile.mk @@ -0,0 +1,38 @@ +#************************************************************************* +# 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. +#***********************************************************************/ + +PRJ = .. +PRJNAME = test +TARGET = inc + +ENABLE_EXCEPTIONS = TRUE +VISIBILITY_HIDDEN = TRUE + +.INCLUDE: settings.mk +.INCLUDE: target.mk + +.IF "$(ENABLE_PCH)" != "" +ALLTAR: $(SLO)/precompiled.pch $(SLO)/precompiled_ex.pch +.ENDIF diff --git a/test/inc/pch/precompiled_test.cxx b/test/inc/pch/precompiled_test.cxx new file mode 100644 index 000000000000..c3ea151e9be8 --- /dev/null +++ b/test/inc/pch/precompiled_test.cxx @@ -0,0 +1,26 @@ +/************************************************************************* +* 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. +************************************************************************/ + +#include "precompiled_configmgr.hxx" diff --git a/test/inc/pch/precompiled_test.hxx b/test/inc/pch/precompiled_test.hxx new file mode 100644 index 000000000000..d4927944f9c7 --- /dev/null +++ b/test/inc/pch/precompiled_test.hxx @@ -0,0 +1,30 @@ +/************************************************************************* +* 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. +************************************************************************/ + +#if defined PRECOMPILED_HEADERS + +#include "sal/config.h" + +#endif diff --git a/test/inc/test/detail/testdllapi.hxx b/test/inc/test/detail/testdllapi.hxx new file mode 100644 index 000000000000..41d5b4d69b8c --- /dev/null +++ b/test/inc/test/detail/testdllapi.hxx @@ -0,0 +1,39 @@ +/************************************************************************* +* 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_DETAIL_TESTDLLAPI_HXX +#define INCLUDED_TEST_DETAIL_TESTDLLAPI_HXX + +#include "sal/config.h" + +#include "sal/types.h" + +#if defined OOO_DLLIMPLEMENTATION_TEST +#define OOO_DLLPUBLIC_TEST SAL_DLLPUBLIC_EXPORT +#else +#define OOO_DLLPUBLIC_TEST SAL_DLLPUBLIC_IMPORT +#endif + +#endif diff --git a/test/inc/test/getargument.hxx b/test/inc/test/getargument.hxx new file mode 100644 index 000000000000..0c109861ccfc --- /dev/null +++ b/test/inc/test/getargument.hxx @@ -0,0 +1,42 @@ +/************************************************************************* +* 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_GETARGUMENT_HXX +#define INCLUDED_TEST_GETARGUMENT_HXX + +#include "sal/config.h" + +#include "test/detail/testdllapi.hxx" + +namespace rtl { class OUString; } + +namespace test { + +OOO_DLLPUBLIC_TEST bool getArgument( + rtl::OUString const & name, rtl::OUString * value); + +} + +#endif diff --git a/test/inc/test/officeconnection.hxx b/test/inc/test/officeconnection.hxx new file mode 100644 index 000000000000..60de9e784921 --- /dev/null +++ b/test/inc/test/officeconnection.hxx @@ -0,0 +1,63 @@ +/************************************************************************* +* 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 lang { + class XMultiServiceFactory; +} } } } + +namespace test { + +class OOO_DLLPUBLIC_TEST OfficeConnection: private boost::noncopyable { +public: + OfficeConnection(); + + ~OfficeConnection(); + + void setUp(); + + void tearDown(); + + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + getFactory() const; + +private: + oslProcess process_; + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + factory_; +}; + +} + +#endif diff --git a/test/inc/test/oustringostreaminserter.hxx b/test/inc/test/oustringostreaminserter.hxx new file mode 100644 index 000000000000..9c9ef527be7c --- /dev/null +++ b/test/inc/test/oustringostreaminserter.hxx @@ -0,0 +1,46 @@ +/************************************************************************* +* 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" + +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 diff --git a/test/inc/test/toabsolutefileurl.hxx b/test/inc/test/toabsolutefileurl.hxx new file mode 100644 index 000000000000..602dc9d0b435 --- /dev/null +++ b/test/inc/test/toabsolutefileurl.hxx @@ -0,0 +1,42 @@ +/************************************************************************* +* 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 { + +OOO_DLLPUBLIC_TEST rtl::OUString toAbsoluteFileUrl( + rtl::OUString const & relativePathname); + +} + +#endif diff --git a/test/prj/build.lst b/test/prj/build.lst new file mode 100644 index 000000000000..59fea900f394 --- /dev/null +++ b/test/prj/build.lst @@ -0,0 +1,4 @@ +te test : BOOST:boost cppu cppuhelper cppunit javaunohelper offuh ridljar sal solenv unoil NULL +te test\inc nmake - all inc NULL +te test\source\cpp nmake - all source_cpp inc NULL +te test\source\java nmake - all source_java NULL diff --git a/test/prj/d.lst b/test/prj/d.lst new file mode 100644 index 000000000000..bcea8bee46fe --- /dev/null +++ b/test/prj/d.lst @@ -0,0 +1,12 @@ +mkdir: %_DEST%\inc%_EXT%\test +mkdir: %_DEST%\inc%_EXT%\test\detail +..\%__SRC%\bin\test.dll %_DEST%\bin%_EXT%\test.dll +..\%__SRC%\lib\itest.lib %_DEST%\lib%_EXT%\itest.lib +..\%__SRC%\lib\libtest.dylib %_DEST%\lib%_EXT%\libtest.dylib +..\%__SRC%\lib\libtest.so %_DEST%\lib%_EXT%\libtest.so +..\inc\test\detail\testdllapi.hxx %_DEST%\inc%_EXT%\test\detail\testdllapi.hxx +..\inc\test\getargument.hxx %_DEST%\inc%_EXT%\test\getargument.hxx +..\inc\test\officeconnection.hxx %_DEST%\inc%_EXT%\test\officeconnection.hxx +..\inc\test\oustringostreaminserter.hxx %_DEST%\inc%_EXT%\test\oustringostreaminserter.hxx +..\inc\test\toabsolutefileurl.hxx %_DEST%\inc%_EXT%\test\toabsolutefileurl.hxx +..\%__SRC%\class\test.jar %_DEST%\bin%_EXT%\test.jar diff --git a/test/source/cpp/getargument.cxx b/test/source/cpp/getargument.cxx new file mode 100644 index 000000000000..339c5c9c797d --- /dev/null +++ b/test/source/cpp/getargument.cxx @@ -0,0 +1,42 @@ +/************************************************************************* +* 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. +************************************************************************/ + +#include "sal/config.h" + +#include "osl/diagnose.h" +#include "rtl/bootstrap.hxx" +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" +#include "test/getargument.hxx" + +namespace test { + +bool getArgument(rtl::OUString const & name, rtl::OUString * value) { + OSL_ASSERT(value != 0); + return rtl::Bootstrap::get( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("arg-")) + name, *value); +} + +} diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk new file mode 100644 index 000000000000..3d7db10abdf3 --- /dev/null +++ b/test/source/cpp/makefile.mk @@ -0,0 +1,54 @@ +#************************************************************************* +# 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. +#***********************************************************************/ + +PRJ = ../.. +PRJNAME = test +TARGET = cpp + +ENABLE_EXCEPTIONS = TRUE +VISIBILITY_HIDDEN = TRUE + +.INCLUDE: settings.mk + +CDEFS += -DOOO_DLLIMPLEMENTATION_TEST + +SLOFILES = \ + $(SLO)/getargument.obj \ + $(SLO)/officeconnection.obj \ + $(SLO)/toabsolutefileurl.obj + +SHL1IMPLIB = i$(SHL1TARGET) +SHL1OBJS = $(SLOFILES) +SHL1RPATH = NONE +SHL1STDLIBS = \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(CPPUNITLIB) \ + $(SALLIB) +SHL1TARGET = test +SHL1USE_EXPORTS = name +DEF1NAME = $(SHL1TARGET) + +.INCLUDE: target.mk diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx new file mode 100644 index 000000000000..210989f10b15 --- /dev/null +++ b/test/source/cpp/officeconnection.cxx @@ -0,0 +1,170 @@ +/************************************************************************* +* 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. +************************************************************************/ + +#include "sal/config.h" + +#include "com/sun/star/bridge/UnoUrlResolver.hpp" +#include "com/sun/star/bridge/XUnoUrlResolver.hpp" +#include "com/sun/star/connection/NoConnectException.hpp" +#include "com/sun/star/frame/XDesktop.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/uno/Reference.hxx" +#include "cppuhelper/bootstrap.hxx" +#include "cppunit/TestAssert.h" +#include "osl/process.h" +#include "osl/time.h" +#include "sal/types.h" +#include "test/getargument.hxx" +#include "test/officeconnection.hxx" +#include "test/toabsolutefileurl.hxx" + +namespace { + +namespace css = com::sun::star; + +} + +namespace test { + +OfficeConnection::OfficeConnection(): process_(0) {} + +OfficeConnection::~OfficeConnection() {} + +void OfficeConnection::setUp() { + oslProcessInfo info; + info.Size = sizeof info; + CPPUNIT_ASSERT_EQUAL( + osl_Process_E_None, + osl_getProcessInfo(0, osl_Process_IDENTIFIER, &info)); + rtl::OUString desc( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("pipe,name=oootest")) + + rtl::OUString::valueOf(static_cast< sal_Int64 >(info.Ident)) + + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";urp"))); + rtl::OUString noquickArg( + RTL_CONSTASCII_USTRINGPARAM("-quickstart=no")); + rtl::OUString nofirstArg( + RTL_CONSTASCII_USTRINGPARAM("-nofirststartwizard")); + rtl::OUString acceptArg( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-accept=")) + desc); + rtl::OUString argUser; + CPPUNIT_ASSERT( + getArgument( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), &argUser)); + rtl::OUString userArg( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-env:UserInstallation=")) + + toAbsoluteFileUrl(argUser)); + rtl::OUString jreArg( + RTL_CONSTASCII_USTRINGPARAM("-env:UNO_JAVA_JFW_ENV_JREHOME=true")); + rtl::OUString classpathArg( + RTL_CONSTASCII_USTRINGPARAM("-env:UNO_JAVA_JFW_ENV_CLASSPATH=true")); + rtl_uString * args[] = { + noquickArg.pData, nofirstArg.pData, acceptArg.pData, userArg.pData, + jreArg.pData, classpathArg.pData }; + rtl_uString ** envs = 0; + rtl::OUString argEnv; + if (getArgument(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("env")), &argEnv)) + { + envs = &argEnv.pData; + } + rtl::OUString argPath; + CPPUNIT_ASSERT( + getArgument( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("path")), &argPath)); + CPPUNIT_ASSERT_EQUAL( + osl_Process_E_None, + osl_executeProcess( + toAbsoluteFileUrl(argPath).pData, args, + sizeof args / sizeof args[0], 0, 0, 0, envs, envs == 0 ? 0 : 1, + &process_)); + try { + css::uno::Reference< css::bridge::XUnoUrlResolver > resolver( + css::bridge::UnoUrlResolver::create( + cppu::defaultBootstrap_InitialComponentContext())); + for (int i = 0;; ++i) { + try { + factory_ = + css::uno::Reference< css::lang::XMultiServiceFactory >( + resolver->resolve( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("uno:")) + + desc + + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + ";StarOffice.ServiceManager"))), + css::uno::UNO_QUERY_THROW); + break; + } catch (css::connection::NoConnectException &) { + if (i == 600) { // 600 sec + throw; + } + } + TimeValue delay = { 1, 0 }; // 1 sec + CPPUNIT_ASSERT_EQUAL( + osl_Process_E_TimedOut, + osl_joinProcessWithTimeout(process_, &delay)); + } + } catch (...) { + CPPUNIT_ASSERT_EQUAL( + osl_Process_E_None, osl_terminateProcess(process_)); + osl_freeProcessHandle(process_); + process_ = 0; + throw; + } +} + +void OfficeConnection::tearDown() { + if (factory_.is()) { + css::uno::Reference< css::frame::XDesktop > desktop( + factory_->createInstance( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), + css::uno::UNO_QUERY_THROW); + factory_.clear(); + try { + CPPUNIT_ASSERT(desktop->terminate()); + desktop.clear(); + } catch (css::lang::DisposedException &) {} + // it appears that DisposedExceptions can already happen while + // receiving the response of the terminate call + } + if (process_ != 0) { + CPPUNIT_ASSERT_EQUAL(osl_Process_E_None, osl_joinProcess(process_)); + oslProcessInfo info; + info.Size = sizeof info; + CPPUNIT_ASSERT_EQUAL( + osl_Process_E_None, + osl_getProcessInfo(process_, osl_Process_EXITCODE, &info)); + CPPUNIT_ASSERT_EQUAL(oslProcessExitCode(0), info.Code); + osl_freeProcessHandle(process_); + } +} + +css::uno::Reference< css::lang::XMultiServiceFactory > +OfficeConnection::getFactory() const { + return factory_; +} + +} diff --git a/test/source/cpp/toabsolutefileurl.cxx b/test/source/cpp/toabsolutefileurl.cxx new file mode 100644 index 000000000000..be7f2ae20921 --- /dev/null +++ b/test/source/cpp/toabsolutefileurl.cxx @@ -0,0 +1,83 @@ +/************************************************************************* +* 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. +************************************************************************/ + +#include "sal/config.h" + +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "osl/file.hxx" +#include "osl/process.h" +#include "rtl/ustring.hxx" +#include "test/toabsolutefileurl.hxx" + +namespace { + +namespace css = com::sun::star; + +} + +namespace test { + +rtl::OUString toAbsoluteFileUrl(rtl::OUString const & relativePathname) { + rtl::OUString cwd; + oslProcessError e1 = osl_getProcessWorkingDir(&cwd.pData); + if (e1 != osl_Process_E_None) { + throw css::uno::RuntimeException( + (rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "osl_getProcessWorkingDir failed with ")) + + rtl::OUString::valueOf(static_cast< sal_Int32 >(e1))), + css::uno::Reference< css::uno::XInterface >()); + } + rtl::OUString url; + osl::FileBase::RC e2 = osl::FileBase::getFileURLFromSystemPath( + relativePathname, url); + if (e2 != osl::FileBase::E_None) { + throw css::uno::RuntimeException( + (rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "osl::FileBase::getFileURLFromSystemPath(")) + + relativePathname + + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(") failed with ")) + + rtl::OUString::valueOf(static_cast< sal_Int32 >(e2))), + css::uno::Reference< css::uno::XInterface >()); + } + rtl::OUString absUrl; + e2 = osl::FileBase::getAbsoluteFileURL(cwd, url, absUrl); + if (e2 != osl::FileBase::E_None) { + throw css::uno::RuntimeException( + (rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "osl::FileBase::getAbsoluteFileURL(")) + + cwd + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(", ")) + url + + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(") failed with ")) + + rtl::OUString::valueOf(static_cast< sal_Int32 >(e2))), + css::uno::Reference< css::uno::XInterface >()); + } + return absUrl; +} + +} diff --git a/test/source/java/OfficeConnection.java b/test/source/java/OfficeConnection.java new file mode 100644 index 000000000000..b6f9cc1def49 --- /dev/null +++ b/test/source/java/OfficeConnection.java @@ -0,0 +1,203 @@ +/************************************************************************* +* 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. +************************************************************************/ + +package org.openoffice.test; + +import com.sun.star.bridge.UnoUrlResolver; +import com.sun.star.bridge.XUnoUrlResolver; +import com.sun.star.comp.helper.Bootstrap; +import com.sun.star.connection.NoConnectException; +import com.sun.star.frame.XDesktop; +import com.sun.star.lang.DisposedException; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.UnoRuntime; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; +import java.util.Map; +import java.util.UUID; +import static org.junit.Assert.*; + +public final class OfficeConnection { + public void setUp() throws Exception { + description = "pipe,name=oootest" + UUID.randomUUID(); + ProcessBuilder pb = new ProcessBuilder( + getArgument("path"), "-quickstart=no", "-nofirststartwizard", + "-accept=" + description + ";urp", + "-env:UserInstallation=" + getArgument("user"), + "-env:UNO_JAVA_JFW_ENV_JREHOME=true", + "-env:UNO_JAVA_JFW_ENV_CLASSPATH=true"); + String envArg = getArgument("env"); + if (envArg != null) { + Map<String, String> env = pb.environment(); + int i = envArg.indexOf("="); + if (i == -1) { + env.remove(envArg); + } else { + env.put(envArg.substring(0, i), envArg.substring(i + 1)); + } + } + process = pb.start(); + outForward = new Forward(process.getInputStream(), System.out); + outForward.start(); + errForward = new Forward(process.getErrorStream(), System.err); + errForward.start(); + XUnoUrlResolver resolver = UnoUrlResolver.create( + Bootstrap.createInitialComponentContext(null)); + for (int i = 0;; ++i) { + try { + factory = UnoRuntime.queryInterface( + XMultiServiceFactory.class, + resolver.resolve( + "uno:" + description + + ";urp;StarOffice.ServiceManager")); + break; + } catch (NoConnectException e) { + if (i == 600) { // 600 sec + throw e; + } + } + assertNull(waitForProcess(process, 1000)); // 1 sec + } + } + + public void tearDown() + throws InterruptedException, com.sun.star.uno.Exception + { + boolean desktopTerminated = true; + if (factory != null) { + XDesktop desktop = UnoRuntime.queryInterface( + XDesktop.class, + factory.createInstance("com.sun.star.frame.Desktop")); + factory = null; + try { + desktopTerminated = desktop.terminate(); + } catch (DisposedException e) {} + // it appears that DisposedExceptions can already happen while + // receiving the response of the terminate call + desktop = null; + } + Integer code = 0; + if (process != null) { + code = waitForProcess(process, 600000); // 600 sec + process.destroy(); + } + boolean outTerminated = outForward == null || outForward.terminated(); + boolean errTerminated = errForward == null || errForward.terminated(); + assertTrue(desktopTerminated); + assertEquals(new Integer(0), code); + assertTrue(outTerminated); + assertTrue(errTerminated); + } + + //TODO: get rid of this hack + public String getDescription() { + return description; + } + + public XMultiServiceFactory getFactory() { + return factory; + } + + private static String getArgument(String name) { + return System.getProperty("org.openoffice.test.arg." + name); + } + + private static Integer waitForProcess(Process process, final long millis) + throws InterruptedException + { + final Thread t1 = Thread.currentThread(); + Thread t2 = new Thread("waitForProcess") { + public void run() { + try { + Thread.currentThread().sleep(millis); + } catch (InterruptedException e) { +} + t1.interrupt(); + } + }; + boolean old = Thread.interrupted(); + // clear interrupted status, get old status + t2.start(); + int n = 0; + boolean done = false; + try { + n = process.waitFor(); + done = true; + } catch (InterruptedException e) { +} + t2.interrupt(); + try { + t2.join(); + } catch (InterruptedException e) { + t2.join(); + } + Thread.interrupted(); // clear interrupted status + if (old) { + t1.interrupt(); // reset old status + } + return done ? new Integer(n) : null; + } + + private static final class Forward extends Thread { + public Forward(InputStream in, PrintStream out) { + super("process output forwarder"); + this.in = in; + this.out = out; + } + + public void run() { + for (;;) { + byte[] buf = new byte[1024]; + int n; + try { + n = in.read(buf); + } catch (IOException e) { + throw new RuntimeException("wrapping", e); + } + if (n == -1) { + break; + } + out.write(buf, 0, n); + } + done = true; + } + + public boolean terminated() throws InterruptedException { + join(); + return done; + } + + InputStream in; + PrintStream out; + boolean done = false; + } + + private String description; + private Process process = null; + private Forward outForward = null; + private Forward errForward = null; + private XMultiServiceFactory factory = null; +} diff --git a/test/source/java/makefile.mk b/test/source/java/makefile.mk new file mode 100644 index 000000000000..86072700a6f4 --- /dev/null +++ b/test/source/java/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# 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. +#***********************************************************************/ + +PRJ = ../.. +PRJNAME = test +TARGET = java + +PACKAGE = org/openoffice/test +JAVAFILES = OfficeConnection.java +JARFILES = juh.jar ridl.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) + +JARTARGET = test.jar +JARCLASSDIRS = $(PACKAGE) +JARCLASSPATH = $(JARFILES) $(EXTRAJARFILES) + +.INCLUDE: settings.mk +.INCLUDE: target.mk |