diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-09-28 15:48:09 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-09-28 17:55:26 +0100 |
| commit | d0edcf0a554828232ab3c8edfbea22d611bfda2b (patch) | |
| tree | 07b22ac005305e8c27fdec25fcadd65df4eeff48 /test | |
| parent | f29109cc5bfdfe13922f9ff2ec85bf0bd3f6dce8 (diff) | |
split 'test' into 'unotest' and 'test' to help dependencies
Diffstat (limited to 'test')
27 files changed, 2 insertions, 2026 deletions
diff --git a/test/inc/makefile.mk b/test/inc/makefile.mk deleted file mode 100644 index c8428466005b..000000000000 --- a/test/inc/makefile.mk +++ /dev/null @@ -1,38 +0,0 @@ -#************************************************************************* -# 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 deleted file mode 100644 index f08dea15c2ab..000000000000 --- a/test/inc/pch/precompiled_test.cxx +++ /dev/null @@ -1,29 +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. -************************************************************************/ - -#include "precompiled_test.hxx" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/pch/precompiled_test.hxx b/test/inc/pch/precompiled_test.hxx deleted file mode 100644 index 51067ed3d7dd..000000000000 --- a/test/inc/pch/precompiled_test.hxx +++ /dev/null @@ -1,33 +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. -************************************************************************/ - -#if defined PRECOMPILED_HEADERS - -#include "sal/config.h" - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/prj/build.lst b/test/prj/build.lst index 655170facea6..c99600b9d85a 100644 --- a/test/prj/build.lst +++ b/test/prj/build.lst @@ -1,6 +1,2 @@ -te test : BOOST:boost cppu cppuhelper CPPUNIT:cppunit javaunohelper offapi ridljar sal solenv stlport unoil qadevOOo vcl NULL -te test\inc nmake - all inc NULL +te test : unotest vcl NULL te test\source\cpp nmake - all source_cpp inc NULL -te test\source\cpp\unoexceptionprotector nmake - all source_cpp_unoexceptionprotector inc NULL -te test\source\java\org\openoffice\test nmake - all source_java NULL -te test\source\java\org\openoffice\test\tools nmake - all source_java_tools NULL diff --git a/test/prj/d.lst b/test/prj/d.lst index bf4af6d239d7..326d6667eecf 100644 --- a/test/prj/d.lst +++ b/test/prj/d.lst @@ -1,19 +1,8 @@ mkdir: %_DEST%\inc\test -mkdir: %_DEST%\inc\test\detail ..\%__SRC%\bin\test.dll %_DEST%\bin\test.dll -..\%__SRC%\bin\unoexceptionprotector.dll %_DEST%\bin\unoexceptionprotector.dll ..\%__SRC%\lib\itest.lib %_DEST%\lib\itest.lib ..\%__SRC%\lib\libtest.dylib %_DEST%\lib\libtest.dylib ..\%__SRC%\lib\libtest.so %_DEST%\lib\libtest.so ..\%__SRC%\lib\libtest.dll.a %_DEST%\lib\libtest.dll.a -..\%__SRC%\lib\unoexceptionprotector.dylib %_DEST%\lib\unoexceptionprotector.dylib -..\%__SRC%\lib\unoexceptionprotector.so %_DEST%\lib\unoexceptionprotector.so ..\inc\test\detail\testdllapi.hxx %_DEST%\inc\test\detail\testdllapi.hxx -..\inc\test\gettestargument.hxx %_DEST%\inc\test\gettestargument.hxx -..\inc\test\officeconnection.hxx %_DEST%\inc\test\officeconnection.hxx ..\inc\test\bootstrapfixture.hxx %_DEST%\inc\test\bootstrapfixture.hxx -..\inc\test\oustringostreaminserter.hxx %_DEST%\inc\test\oustringostreaminserter.hxx -..\inc\test\toabsolutefileurl.hxx %_DEST%\inc\test\toabsolutefileurl.hxx -..\inc\test\uniquepipename.hxx %_DEST%\inc\test\uniquepipename.hxx -..\%__SRC%\class\test.jar %_DEST%\bin\test.jar -..\%__SRC%\class\test-tools.jar %_DEST%\bin\test-tools.jar diff --git a/test/source/cpp/getargument.cxx b/test/source/cpp/getargument.cxx deleted file mode 100644 index d401bc964094..000000000000 --- a/test/source/cpp/getargument.cxx +++ /dev/null @@ -1,50 +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. -************************************************************************/ - -#include "sal/config.h" - -#include "osl/diagnose.h" -#include "rtl/bootstrap.hxx" -#include "rtl/ustring.h" -#include "rtl/ustring.hxx" - -#include "getargument.hxx" - -namespace test { - -namespace detail { - -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); -} - -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/source/cpp/getargument.hxx b/test/source/cpp/getargument.hxx deleted file mode 100644 index 3380fdd2e5c2..000000000000 --- a/test/source/cpp/getargument.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_SOURCE_CPP_GETARGUMENT_HXX -#define INCLUDED_TEST_SOURCE_CPP_GETARGUMENT_HXX - -#include "sal/config.h" - -namespace test { - -namespace detail { - -// Obtain the value of an argument tunneled in via an "arg-<name>" bootstrap -// variable: -bool getArgument( - rtl::OUString const & name, rtl::OUString * value); - -} - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/source/cpp/gettestargument.cxx b/test/source/cpp/gettestargument.cxx deleted file mode 100644 index 0bc00062e8d3..000000000000 --- a/test/source/cpp/gettestargument.cxx +++ /dev/null @@ -1,46 +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. -* -************************************************************************/ - -#include "sal/config.h" - -#include "rtl/ustring.h" -#include "rtl/ustring.hxx" -#include "test/gettestargument.hxx" - -#include "getargument.hxx" - -namespace test { - -bool getTestArgument(rtl::OUString const & name, rtl::OUString * value) { - return detail::getArgument( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testarg.")) + name, value); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk index 68bca023a58c..262326a6fc6d 100644 --- a/test/source/cpp/makefile.mk +++ b/test/source/cpp/makefile.mk @@ -38,12 +38,7 @@ CDEFS += -DOOO_DLLIMPLEMENTATION_TEST CFLAGSCXX += $(CPPUNIT_CFLAGS) SLOFILES = \ - $(SLO)/getargument.obj \ - $(SLO)/gettestargument.obj \ - $(SLO)/bootstrapfixture.obj \ - $(SLO)/officeconnection.obj \ - $(SLO)/toabsolutefileurl.obj \ - $(SLO)/uniquepipename.obj + $(SLO)/bootstrapfixture.obj .IF "$(CROSS_COMPILING)" == "YES" SHL1IMPLIB = $(SHL1TARGET) diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx deleted file mode 100644 index 9c8d4d549b71..000000000000 --- a/test/source/cpp/officeconnection.cxx +++ /dev/null @@ -1,192 +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. -************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - -#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/uno/Reference.hxx" -#include "com/sun/star/uno/XComponentContext.hpp" -#include "cppuhelper/bootstrap.hxx" -#include "cppunit/TestAssert.h" -#include "osl/process.h" -#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 "getargument.hxx" - -namespace { - -namespace css = com::sun::star; - -} - -namespace test { - -OfficeConnection::OfficeConnection(): process_(0) {} - -OfficeConnection::~OfficeConnection() {} - -void OfficeConnection::setUp() { - rtl::OUString desc; - rtl::OUString argSoffice; - CPPUNIT_ASSERT( - detail::getArgument( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("soffice")), - &argSoffice)); - if (argSoffice.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("path:"))) { - desc = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pipe,name=")) + - uniquePipeName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oootest"))); - rtl::OUString noquickArg( - RTL_CONSTASCII_USTRINGPARAM("--quickstart=no")); - rtl::OUString nofirstArg( - RTL_CONSTASCII_USTRINGPARAM("--nofirststartwizard")); - rtl::OUString norestoreArg(RTL_CONSTASCII_USTRINGPARAM("--norestore")); - rtl::OUString nologoArg(RTL_CONSTASCII_USTRINGPARAM("--nologo")); - // disable use of the unix standalone splash screen app for the - // tests (probably not needed in combination with --headless?) - rtl::OUString headlessArg(RTL_CONSTASCII_USTRINGPARAM("--headless")); - rtl::OUString acceptArg( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--accept=")) + desc + - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";urp"))); - rtl::OUString argUser; - CPPUNIT_ASSERT( - detail::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, norestoreArg.pData, - nologoArg.pData, headlessArg.pData, acceptArg.pData, userArg.pData, - jreArg.pData, classpathArg.pData }; - rtl_uString ** envs = 0; - rtl::OUString argEnv; - if (detail::getArgument( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("env")), &argEnv)) - { - envs = &argEnv.pData; - } - CPPUNIT_ASSERT_EQUAL( - osl_Process_E_None, - osl_executeProcess( - toAbsoluteFileUrl( - argSoffice.copy(RTL_CONSTASCII_LENGTH("path:"))).pData, - args, SAL_N_ELEMENTS(args), 0, 0, 0, envs, envs == 0 ? 0 : 1, - &process_)); - } else if (argSoffice.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("connect:"))) { - desc = argSoffice.copy(RTL_CONSTASCII_LENGTH("connect:")); - } else { - CPPUNIT_FAIL( - "\"soffice\" argument starts with neither \"path:\" nor" - " \"connect:\""); - } - css::uno::Reference< css::bridge::XUnoUrlResolver > resolver( - css::bridge::UnoUrlResolver::create( - cppu::defaultBootstrap_InitialComponentContext())); - for (;;) { - try { - context_ = - css::uno::Reference< css::uno::XComponentContext >( - resolver->resolve( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("uno:")) + - desc + - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - ";urp;StarOffice.ComponentContext"))), - css::uno::UNO_QUERY_THROW); - break; - } catch (css::connection::NoConnectException &) {} - if (process_ != 0) { - TimeValue delay = { 1, 0 }; // 1 sec - CPPUNIT_ASSERT_EQUAL( - osl_Process_E_TimedOut, - osl_joinProcessWithTimeout(process_, &delay)); - } - } -} - -void OfficeConnection::tearDown() { - if (process_ != 0) { - if (context_.is()) { - css::uno::Reference< css::frame::XDesktop > desktop( - context_->getServiceManager()->createInstanceWithContext( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.frame.Desktop")), - context_), - css::uno::UNO_QUERY_THROW); - context_.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 - } - 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_); - process_ = 0; // guard against subsequent calls to isStillAlive - } -} - -css::uno::Reference< css::uno::XComponentContext > -OfficeConnection::getComponentContext() const { - return context_; -} - -bool OfficeConnection::isStillAlive() const { - OSL_ASSERT(process_ != 0); - TimeValue delay = { 0, 0 }; // 0 sec - oslProcessError e = osl_joinProcessWithTimeout(process_, &delay); - CPPUNIT_ASSERT(e == osl_Process_E_None || e == osl_Process_E_TimedOut); - return e == osl_Process_E_TimedOut; -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/source/cpp/toabsolutefileurl.cxx b/test/source/cpp/toabsolutefileurl.cxx deleted file mode 100644 index e7c97d2fb85f..000000000000 --- a/test/source/cpp/toabsolutefileurl.cxx +++ /dev/null @@ -1,86 +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. -************************************************************************/ - -#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; -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/source/cpp/uniquepipename.cxx b/test/source/cpp/uniquepipename.cxx deleted file mode 100644 index 1725ca218918..000000000000 --- a/test/source/cpp/uniquepipename.cxx +++ /dev/null @@ -1,52 +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. -* -************************************************************************/ - -#include "sal/config.h" -#include "sal/precppunit.hxx" - -#include "cppunit/TestAssert.h" -#include "osl/process.h" -#include "rtl/ustring.h" -#include "rtl/ustring.hxx" -#include "sal/types.h" -#include "test/uniquepipename.hxx" - -namespace test { - -rtl::OUString uniquePipeName(rtl::OUString const & name) { - oslProcessInfo info; - info.Size = sizeof info; - CPPUNIT_ASSERT_EQUAL( - osl_Process_E_None, - osl_getProcessInfo(0, osl_Process_IDENTIFIER, &info)); - return name + rtl::OUString::valueOf(static_cast< sal_Int64 >(info.Ident)); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/source/cpp/unoexceptionprotector/makefile.mk b/test/source/cpp/unoexceptionprotector/makefile.mk deleted file mode 100644 index d3d13e646232..000000000000 --- a/test/source/cpp/unoexceptionprotector/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# 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 = unoexceptionprotector - -ENABLE_EXCEPTIONS = TRUE -VISIBILITY_HIDDEN = TRUE - -.INCLUDE: settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - -# --- Files -------------------------------------------------------- -DLLPRE = - -CFLAGSCXX += $(CPPUNIT_CFLAGS) - -SLOFILES = $(SLO)/unoexceptionprotector.obj - -SHL1IMPLIB = i$(SHL1TARGET) -SHL1OBJS = $(SLOFILES) -SHL1RPATH = NONE -SHL1STDLIBS = \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(CPPUNITLIB) \ - $(SALLIB) -SHL1TARGET = unoexceptionprotector -SHL1USE_EXPORTS = name -DEF1NAME = $(SHL1TARGET) - -.INCLUDE: target.mk diff --git a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx deleted file mode 100644 index 7e7e0000c49a..000000000000 --- a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx +++ /dev/null @@ -1,125 +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, 2011 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_test.hxx" -#include "sal/config.h" -#include "sal/precppunit.hxx" - -#include <limits> -#include <string> -#include <iostream> - -#include "boost/noncopyable.hpp" -#include "com/sun/star/uno/Any.hxx" -#include "com/sun/star/uno/Exception.hpp" -#include "cppuhelper/exc_hlp.hxx" -#include "cppunit/Message.h" -#include "osl/thread.h" -#include "rtl/string.hxx" -#include "rtl/ustring.h" -#include "rtl/ustring.hxx" -#include "sal/types.h" - -#include "protectorfactory.hxx" - -namespace { - -namespace css = com::sun::star; - -// Best effort conversion: -std::string convert(rtl::OUString const & s16) { - rtl::OString s8(rtl::OUStringToOString(s16, osl_getThreadTextEncoding())); - return std::string( - s8.getStr(), - ((static_cast< sal_uInt32 >(s8.getLength()) - > std::numeric_limits< std::string::size_type >::max()) - ? std::numeric_limits< std::string::size_type >::max() - : static_cast< std::string::size_type >(s8.getLength()))); -} - -class Prot : public cppunittester::LibreOfficeProtector, private boost::noncopyable -{ -public: - Prot() {} - - virtual ~Prot() {} - - virtual bool protect( - CppUnit::Functor const & functor, - CppUnit::ProtectorContext const & context); - - virtual bool protect(CppUnit::Functor const & functor); -}; - -bool Prot::protect( - CppUnit::Functor const & functor, CppUnit::ProtectorContext const & context) -{ - try { - return functor(); - } catch (const css::uno::Exception &e) { - css::uno::Any a(cppu::getCaughtException()); - reportError( - context, - CppUnit::Message( - convert( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "An uncaught exception of type ")) - + a.getValueTypeName()), - convert(e.Message))); - } - return false; -} - -bool Prot::protect(CppUnit::Functor const & functor) -{ - bool bRet = false; - try - { - bRet = functor(); - } catch (const css::uno::Exception &e) - { - css::uno::Any a(cppu::getCaughtException()); - std::cerr - << convert(rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "An uncaught exception of type ")) - + a.getValueTypeName()) - << std::endl << "Exception Message was: " << convert(e.Message) - << std::endl; - throw; - } - return bRet; -} - -} - -extern "C" SAL_DLLPUBLIC_EXPORT CppUnit::Protector * SAL_CALL -unoexceptionprotector() { - return new Prot; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/source/java/org/openoffice/test/Argument.java b/test/source/java/org/openoffice/test/Argument.java deleted file mode 100644 index 0380375d8519..000000000000 --- a/test/source/java/org/openoffice/test/Argument.java +++ /dev/null @@ -1,36 +0,0 @@ -/************************************************************************* -* -* 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; - -public final class Argument { - public static String get(String name) { - return System.getProperty("org.openoffice.test.arg." + name); - } - - private Argument() {} -} diff --git a/test/source/java/org/openoffice/test/FileHelper.java b/test/source/java/org/openoffice/test/FileHelper.java deleted file mode 100644 index 722b31124d43..000000000000 --- a/test/source/java/org/openoffice/test/FileHelper.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * ************************************************************************ - * - * 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; - -/** - * Helper Functions for File handling - */ -public class FileHelper -{ - public FileHelper() - { - } - /** - * Concat a _sRelativePathToAdd to a _sPath and append a '/' to the _sPath only if need. - * - * @param _sPath - * @param _sRelativePathToAdd - * @return a right concated path - */ - public static String appendPath(String _sPath, String _sRelativePathToAdd) - { - String sNewPath = _sPath; - String fs = System.getProperty("file.separator"); - if (_sPath.startsWith("file:")) - { - fs = "/"; // we use a file URL so only '/' is allowed. - } - if (! (sNewPath.endsWith("/") || sNewPath.endsWith("\\") ) ) - { - sNewPath += fs; - } - sNewPath += _sRelativePathToAdd; - return sNewPath; - } -} diff --git a/test/source/java/org/openoffice/test/OfficeConnection.java b/test/source/java/org/openoffice/test/OfficeConnection.java deleted file mode 100644 index b05c34bc3996..000000000000 --- a/test/source/java/org/openoffice/test/OfficeConnection.java +++ /dev/null @@ -1,229 +0,0 @@ -/************************************************************************* -* 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.XMultiComponentFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -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.*; - -/** Start up and shut down an OOo instance. - - Details about the OOo instance are tunneled in via - org.openoffice.test.arg.... system properties. -*/ - -public final class OfficeConnection { - /** Start up an OOo instance. - */ - public void setUp() throws Exception { - String sofficeArg = Argument.get("soffice"); - if (sofficeArg.startsWith("path:")) { - description = "pipe,name=oootest" + UUID.randomUUID(); - ProcessBuilder pb = new ProcessBuilder( - sofficeArg.substring("path:".length()), "--quickstart=no", - "--nofirststartwizard", "--norestore", "--nologo", "--headless", - "--accept=" + description + ";urp", - "-env:UserInstallation=" + Argument.get("user"), - "-env:UNO_JAVA_JFW_ENV_JREHOME=true"); - String envArg = Argument.get("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(); - } else if (sofficeArg.startsWith("connect:")) { - description = sofficeArg.substring("connect:".length()); - } else { - fail( - "\"soffice\" argument \"" + sofficeArg + - " starts with neither \"path:\" nor \"connect:\""); - } - XUnoUrlResolver resolver = UnoUrlResolver.create( - Bootstrap.createInitialComponentContext(null)); - for (;;) { - try { - context = UnoRuntime.queryInterface( - XComponentContext.class, - resolver.resolve( - "uno:" + description + - ";urp;StarOffice.ComponentContext")); - break; - } catch (NoConnectException e) {} - if (process != null) { - assertNull(waitForProcess(process, 1000)); // 1 sec - } - } - try { - ProcessBuilder debugbp = new ProcessBuilder( - Argument.get("debugcommand").split(" ")); - debugbp.start(); - Thread.sleep(1000); - } catch(Exception e) {} - } - - /** Shut down the OOo instance. - */ - public void tearDown() - throws InterruptedException, com.sun.star.uno.Exception - { - boolean desktopTerminated = true; - if (process != null) { - if (context != null) { - XMultiComponentFactory factory = context.getServiceManager(); - assertNotNull(factory); - XDesktop desktop = UnoRuntime.queryInterface( - XDesktop.class, - factory.createInstanceWithContext( - "com.sun.star.frame.Desktop", context)); - context = 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; - } else { - process.destroy(); - } - } - int code = 0; - if (process != null) { - code = process.waitFor(); - } - boolean outTerminated = outForward == null || outForward.terminated(); - boolean errTerminated = errForward == null || errForward.terminated(); - assertTrue(desktopTerminated); - assertEquals(0, code); - assertTrue(outTerminated); - assertTrue(errTerminated); - } - - /** Obtain the component context of the running OOo instance. - */ - public XComponentContext getComponentContext() { - return context; - } - - //TODO: get rid of this hack for legacy qa/unoapi tests - public String getDescription() { - return description; - } - - 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; - } - - private final InputStream in; - private final PrintStream out; - private boolean done = false; - } - - private String description; - private Process process = null; - private Forward outForward = null; - private Forward errForward = null; - private XComponentContext context = null; -} diff --git a/test/source/java/org/openoffice/test/OfficeFileUrl.java b/test/source/java/org/openoffice/test/OfficeFileUrl.java deleted file mode 100644 index 1ab62e283e6a..000000000000 --- a/test/source/java/org/openoffice/test/OfficeFileUrl.java +++ /dev/null @@ -1,42 +0,0 @@ -/************************************************************************* -* -* 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 java.io.File; - -/** Obtain the office-internal absolute file URL of a given file. - */ -public final class OfficeFileUrl { - public static String getAbsolute(File file) { - return file.getAbsoluteFile().toURI().toString().replaceFirst( - "\\A[Ff][Ii][Ll][Ee]:/(?=[^/]|\\z)", "file:///"); - // file:/path -> file:///path - } - - private OfficeFileUrl() {} -} diff --git a/test/source/java/org/openoffice/test/TestArgument.java b/test/source/java/org/openoffice/test/TestArgument.java deleted file mode 100644 index 1303d09e1ba2..000000000000 --- a/test/source/java/org/openoffice/test/TestArgument.java +++ /dev/null @@ -1,39 +0,0 @@ -/************************************************************************* -* -* 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; - -/** Obtain the value of a test argument (tunneled in via an - "org.openoffice.test.arg.testarg.<name>" system property). - */ -public final class TestArgument { - public static String get(String name) { - return Argument.get("testarg." + name); - } - - private TestArgument() {} -} diff --git a/test/source/java/org/openoffice/test/UnoApiTest.java b/test/source/java/org/openoffice/test/UnoApiTest.java deleted file mode 100644 index fc5ba5a9c68f..000000000000 --- a/test/source/java/org/openoffice/test/UnoApiTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/************************************************************************* -* 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 org.openoffice.Runner; -import org.openoffice.test.OfficeConnection; -import org.openoffice.test.Argument; -import static org.junit.Assert.*; - -public final class UnoApiTest { - @org.junit.Before public void setUp() throws Exception { - connection.setUp(); - } - - @org.junit.After public void tearDown() - throws InterruptedException, com.sun.star.uno.Exception - { - connection.tearDown(); - } - - @org.junit.Test public void test() { - assertTrue( - Runner.run( - "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", - Argument.get("tdoc"), "-cs", connection.getDescription())); - } - - private final OfficeConnection connection = new OfficeConnection(); -} diff --git a/test/source/java/org/openoffice/test/makefile.mk b/test/source/java/org/openoffice/test/makefile.mk deleted file mode 100644 index 65b54d11da65..000000000000 --- a/test/source/java/org/openoffice/test/makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# 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 = test - -.IF "$(OOO_JUNIT_JAR)" != "" - -PACKAGE = org/openoffice/test -JAVAFILES = \ - Argument.java \ - FileHelper.java \ - OfficeConnection.java \ - OfficeFileUrl.java \ - TestArgument.java \ - UnoApiTest.java \ - -JARFILES = juh.jar ridl.jar unoil.jar OOoRunner.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -JARTARGET = $(TARGET).jar -JARCLASSDIRS = $(PACKAGE) -JARCLASSEXCLUDES = $(PACKAGE)/tools/* -JARCLASSPATH = $(JARFILES) - # expect $(OOO_JUNIT_JAR) to be on CLASSPATH wherever test.jar is used (also, - # on Windows, $(OOO_JUNIT_JAR) could be an absolute pathname with drive letter - # like X:/path and some JVMs would refuse to load test.jar if its MANIFEST.MF - # Class-Path contained such a pathname that looks like an unknown URL with - # scheme X) - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk diff --git a/test/source/java/org/openoffice/test/tools/DocumentType.java b/test/source/java/org/openoffice/test/tools/DocumentType.java deleted file mode 100644 index bf310c5ed0fa..000000000000 --- a/test/source/java/org/openoffice/test/tools/DocumentType.java +++ /dev/null @@ -1,64 +0,0 @@ -/************************************************************************* - * - * 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.tools; - -/** a helper "enumeration class" for classifying a document type -*/ -public class DocumentType extends com.sun.star.uno.Enum -{ - private DocumentType( int value ) - { - super( value ); - } - - public static DocumentType getDefault() - { - return WRITER; - } - - public static final DocumentType WRITER = new DocumentType(0); - public static final DocumentType CALC = new DocumentType(1); - public static final DocumentType DRAWING = new DocumentType(2); - public static final DocumentType XMLFORM = new DocumentType(3); - public static final DocumentType PRESENTATION = new DocumentType(4); - public static final DocumentType FORMULA = new DocumentType(5); - public static final DocumentType UNKNOWN = new DocumentType(-1); - - public static DocumentType fromInt(int value) - { - switch(value) - { - case 0: return WRITER; - case 1: return CALC; - case 2: return DRAWING; - case 3: return XMLFORM; - case 4: return PRESENTATION; - case 5: return FORMULA; - default: return UNKNOWN; - } - } -}; diff --git a/test/source/java/org/openoffice/test/tools/OfficeDocument.java b/test/source/java/org/openoffice/test/tools/OfficeDocument.java deleted file mode 100644 index bfb76a347e1c..000000000000 --- a/test/source/java/org/openoffice/test/tools/OfficeDocument.java +++ /dev/null @@ -1,328 +0,0 @@ -/************************************************************************* - * - * 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.tools; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.document.MacroExecMode; -import com.sun.star.drawing.XDrawPage; -import com.sun.star.drawing.XDrawPageSupplier; -import com.sun.star.drawing.XDrawPages; -import com.sun.star.drawing.XDrawPagesSupplier; -import com.sun.star.frame.XComponentLoader; -import com.sun.star.frame.XController; -import com.sun.star.frame.XFrame; -import com.sun.star.frame.XModel; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XServiceInfo; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import com.sun.star.util.CloseVetoException; -import com.sun.star.util.XCloseable; -import com.sun.star.util.XModifiable; -import java.util.logging.Level; -import java.util.logging.Logger; - -/**************************************************************************/ - -/**************************************************************************/ -/** provides a small wrapper around a document -*/ -public class OfficeDocument -{ - /* ================================================================== */ - /* ------------------------------------------------------------------ */ - public OfficeDocument( XMultiServiceFactory orb, XComponent document ) - { - m_orb = orb; - m_documentComponent = document; - } - - /* ------------------------------------------------------------------ */ - protected static XComponent implLoadAsComponent( XMultiServiceFactory orb, String documentOrFactoryURL ) throws com.sun.star.uno.Exception - { - return implLoadAsComponent( orb, documentOrFactoryURL, new PropertyValue[0] ); - } - - /* ------------------------------------------------------------------ */ - protected static XComponent implLoadAsComponent( XMultiServiceFactory orb, String documentOrFactoryURL, final PropertyValue[] i_args ) throws com.sun.star.uno.Exception - { - XComponentLoader aLoader = UnoRuntime.queryInterface( XComponentLoader.class, - orb.createInstance( "com.sun.star.frame.Desktop" ) ); - - XComponent document = UnoRuntime.queryInterface( XComponent.class, - aLoader.loadComponentFromURL( documentOrFactoryURL, "_blank", 0, i_args ) - ); - return document; - } - - /* ------------------------------------------------------------------ */ - private static OfficeDocument implLoadDocument( XMultiServiceFactory orb, String documentOrFactoryURL ) throws com.sun.star.uno.Exception - { - return implLoadDocument( orb, documentOrFactoryURL, new PropertyValue[0] ); - } - - /* ------------------------------------------------------------------ */ - private static OfficeDocument implLoadDocument( XMultiServiceFactory orb, String documentOrFactoryURL, final PropertyValue[] i_args ) throws com.sun.star.uno.Exception - { - XComponent document = implLoadAsComponent( orb, documentOrFactoryURL, i_args ); - - XServiceInfo xSI = UnoRuntime.queryInterface( XServiceInfo.class, document ); - if ( xSI.supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) ) - return new SpreadsheetDocument( orb, document ); - return new OfficeDocument( orb, document ); - } - - /* ------------------------------------------------------------------ */ - public static OfficeDocument loadDocument( XMultiServiceFactory orb, String documentURL ) throws com.sun.star.uno.Exception - { - return implLoadDocument( orb, documentURL ); - } - - /* ------------------------------------------------------------------ */ - public static OfficeDocument blankTextDocument( XMultiServiceFactory orb ) throws com.sun.star.uno.Exception - { - return blankDocument( orb, DocumentType.WRITER ); - } - - /* ------------------------------------------------------------------ */ - public static OfficeDocument blankXMLForm( XMultiServiceFactory orb ) throws com.sun.star.uno.Exception - { - return blankDocument( orb, DocumentType.XMLFORM ); - } - - /* ------------------------------------------------------------------ */ - public static OfficeDocument blankDocument( XMultiServiceFactory orb, DocumentType eType ) throws com.sun.star.uno.Exception - { - final PropertyValue[] args = new PropertyValue[] { - new PropertyValue( "MacroExecutionMode", -1, MacroExecMode.ALWAYS_EXECUTE, PropertyState.DIRECT_VALUE ) - }; - return implLoadDocument( orb, getDocumentFactoryURL( eType ), args ); - } - - /* ------------------------------------------------------------------ */ - public boolean close() - { - try - { - XCloseable closeDoc = UnoRuntime.queryInterface( XCloseable.class, m_documentComponent ); - closeDoc.close( true ); - return true; - } - catch ( CloseVetoException e ) - { - Logger.getLogger( OfficeDocument.class.getName() ).log( Level.SEVERE, "closing the document was vetoed", e ); - } - return false; - } - - /* ================================================================== */ - /* ------------------------------------------------------------------ */ - public XComponent getDocument( ) - { - return m_documentComponent; - } - - /* ------------------------------------------------------------------ */ - public boolean isModified() - { - XModifiable modify = (XModifiable)query( XModifiable.class ); - return modify.isModified(); - } - - /* ------------------------------------------------------------------ */ - public Object query( Class aInterfaceClass ) - { - return UnoRuntime.queryInterface( aInterfaceClass, m_documentComponent ); - } - - /* ------------------------------------------------------------------ */ - public XMultiServiceFactory getOrb( ) - { - return m_orb; - } - - /* ------------------------------------------------------------------ */ - /** retrieves the current view of the document - @return - the view component, queried for the interface described by aInterfaceClass - */ - public OfficeDocumentView getCurrentView( ) - { - // get the model interface for the document - XModel xDocModel = UnoRuntime.queryInterface( XModel.class, m_documentComponent ); - // get the current controller for the document - as a controller is tied to a view, - // this gives us the currently active view for the document. - XController xController = xDocModel.getCurrentController(); - - if ( classify() == DocumentType.CALC ) - return new SpreadsheetView( m_orb, this, xController ); - - return new OfficeDocumentView( m_orb, this, xController ); - } - - /* ------------------------------------------------------------------ */ - /** reloads the document - * - * The reload is done by dispatching the respective URL at a frame of the document. - * As a consequence, if you have references to a view of the document, or any interface - * of the document, they will become invalid. - * The Model instance itself, at which you called reload, will still be valid, it will - * automatically update its internal state after the reload. - * - * Another consequence is that if the document does not have a view at all, it cannot - * be reloaded. - */ - public void reload() throws Exception - { - OfficeDocumentView view = getCurrentView(); - XFrame frame = view.getController().getFrame(); - XModel oldModel = frame.getController().getModel(); - - getCurrentView().dispatch( ".uno:Reload" ); - - m_documentComponent = UnoRuntime.queryInterface( XComponent.class, frame.getController().getModel() ); - - XModel newModel = getCurrentView().getController().getModel(); - if ( UnoRuntime.areSame( oldModel, newModel ) ) - throw new java.lang.IllegalStateException( "reload failed" ); - } - - /* ------------------------------------------------------------------ */ - /** returns a URL which can be used to create a document of a certain type - */ - public static String getDocumentFactoryURL( DocumentType eType ) - { - if ( eType == DocumentType.WRITER ) - return "private:factory/swriter"; - if ( eType == DocumentType.CALC ) - return "private:factory/scalc"; - if ( eType == DocumentType.DRAWING ) - return "private:factory/sdraw"; - if ( eType == DocumentType.XMLFORM ) - return "private:factory/swriter?slot=21053"; - if ( eType == DocumentType.PRESENTATION ) - return "private:factory/simpress"; - if ( eType == DocumentType.FORMULA ) - return "private:factory/smath"; - return "private:factory/swriter"; - } - - /* ------------------------------------------------------------------ */ - /** classifies a document - */ - public DocumentType classify( ) - { - XServiceInfo xSI = UnoRuntime.queryInterface( XServiceInfo.class, m_documentComponent ); - - if ( xSI.supportsService( "com.sun.star.text.TextDocument" ) ) - return DocumentType.WRITER; - else if ( xSI.supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) ) - return DocumentType.CALC; - else if ( xSI.supportsService( "com.sun.star.drawing.DrawingDocument" ) ) - return DocumentType.DRAWING; - else if ( xSI.supportsService( "com.sun.star.presentation.PresentationDocument" ) ) - return DocumentType.PRESENTATION; - else if ( xSI.supportsService( "com.sun.star.formula.FormulaProperties" ) ) - return DocumentType.FORMULA; - - return DocumentType.UNKNOWN; - } - - /* ------------------------------------------------------------------ */ - /** retrieves a com.sun.star.drawing.DrawPage of the document, denoted by index - * @param index - * the index of the draw page - * @throws - * com.sun.star.lang.IndexOutOfBoundsException - * com.sun.star.lang.WrappedTargetException - */ - protected XDrawPage getDrawPage( int index ) throws com.sun.star.lang.IndexOutOfBoundsException, com.sun.star.lang.WrappedTargetException - { - XDrawPagesSupplier xSuppPages = UnoRuntime.queryInterface( XDrawPagesSupplier.class, getDocument() ); - XDrawPages xPages = xSuppPages.getDrawPages(); - - return UnoRuntime.queryInterface( XDrawPage.class, xPages.getByIndex( index ) ); - } - - /* ------------------------------------------------------------------ */ - /** retrieves the <type scope="com.sun.star.drawing">DrawPage</type> of the document - */ - protected XDrawPage getMainDrawPage( ) throws com.sun.star.uno.Exception - { - XDrawPage xReturn; - - // in case of a Writer document, this is rather easy: simply ask the XDrawPageSupplier - XDrawPageSupplier xSuppPage = UnoRuntime.queryInterface( XDrawPageSupplier.class, getDocument() ); - if ( null != xSuppPage ) - xReturn = xSuppPage.getDrawPage(); - else - { // the model itself is no draw page supplier - okay, it may be a Writer or Calc document - // (or any other multi-page document) - XDrawPagesSupplier xSuppPages = UnoRuntime.queryInterface( XDrawPagesSupplier.class, getDocument() ); - XDrawPages xPages = xSuppPages.getDrawPages(); - - xReturn = UnoRuntime.queryInterface( XDrawPage.class, xPages.getByIndex( 0 ) ); - - // Note that this is no really error-proof code: If the document model does not support the - // XDrawPagesSupplier interface, or if the pages collection returned is empty, this will break. - } - - return xReturn; - } - - /* ------------------------------------------------------------------ */ - /** creates a component at the service factory provided by the document - */ - public XInterface createInstance( String serviceSpecifier ) throws com.sun.star.uno.Exception - { - XMultiServiceFactory xORB = UnoRuntime.queryInterface( XMultiServiceFactory.class, m_documentComponent ); - return (XInterface)xORB.createInstance( serviceSpecifier ); - } - - /* ------------------------------------------------------------------ */ - /** creates a component at the service factory provided by the document, queried for a given interface type - */ - public <T> T createInstance( String i_serviceSpecifier, Class<T> i_interfaceClass ) throws com.sun.star.uno.Exception - { - return UnoRuntime.queryInterface( i_interfaceClass, createInstance( i_serviceSpecifier ) ); - } - - /* ------------------------------------------------------------------ */ - /** creates a component at the service factory provided by the document - */ - public XInterface createInstanceWithArguments( String serviceSpecifier, Object[] arguments ) throws com.sun.star.uno.Exception - { - XMultiServiceFactory xORB = UnoRuntime.queryInterface( XMultiServiceFactory.class, m_documentComponent ); - return (XInterface) xORB.createInstanceWithArguments( serviceSpecifier, arguments ); - } - - private XMultiServiceFactory m_orb; - private XComponent m_documentComponent; -}; - diff --git a/test/source/java/org/openoffice/test/tools/OfficeDocumentView.java b/test/source/java/org/openoffice/test/tools/OfficeDocumentView.java deleted file mode 100644 index 9d5db59ac009..000000000000 --- a/test/source/java/org/openoffice/test/tools/OfficeDocumentView.java +++ /dev/null @@ -1,144 +0,0 @@ -/************************************************************************* - * - * 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.tools; - -/**************************************************************************/ - -import com.sun.star.beans.NamedValue; -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.frame.XController; -import com.sun.star.frame.XDispatch; -import com.sun.star.frame.XDispatchProvider; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.util.URL; -import com.sun.star.util.XURLTransformer; - -/**************************************************************************/ -/** provides a small wrapper around a document view -*/ -public class OfficeDocumentView -{ - private XMultiServiceFactory m_orb; - private XController m_controller; - private OfficeDocument m_document; - - /* ------------------------------------------------------------------ */ - final public XController getController() - { - return m_controller; - } - - /* ------------------------------------------------------------------ */ - final protected OfficeDocument getDocument() - { - return m_document; - } - - /* ------------------------------------------------------------------ */ - public OfficeDocumentView( XMultiServiceFactory orb, OfficeDocument document, XController controller ) - { - m_orb = orb; - m_document = document; - m_controller = controller; - } - - /* ------------------------------------------------------------------ */ - /** retrieves a dispatcher for the given URL, obtained at the current view of the document - @param aURL - a one-element array. The first element must contain a valid - <member scope="com.sun.star.util">URL::Complete</member> value. Upon return, the URL is correctly - parsed. - @return - the dispatcher for the URL in question - */ - public XDispatch getDispatcher( URL[] aURL ) throws com.sun.star.uno.Exception - { - XDispatch xReturn = null; - - // go get the dispatch provider of it's frame - XDispatchProvider xProvider = UnoRuntime.queryInterface( XDispatchProvider.class, m_controller.getFrame() ); - if ( null != xProvider ) - { - // need an URLTransformer - XURLTransformer xTransformer = UnoRuntime.queryInterface( XURLTransformer.class, - m_orb.createInstance( "com.sun.star.util.URLTransformer" ) ); - xTransformer.parseStrict( aURL ); - - xReturn = xProvider.queryDispatch( aURL[0], new String( ), 0 ); - } - return xReturn; - } - - - /* ------------------------------------------------------------------ */ - /** retrieves a dispatcher for the given URL, obtained at the current view of the document - */ - public XDispatch getDispatcher( String url ) throws com.sun.star.uno.Exception - { - URL[] aURL = new URL[] { new URL() }; - aURL[0].Complete = url; - return getDispatcher( aURL ); - } - - /* ------------------------------------------------------------------ */ - /** dispatches the given URL into the view, if there's a dispatcher for it - - @return - <TRUE/> if the URL was successfully dispatched - */ - public boolean dispatch( String i_url ) throws com.sun.star.uno.Exception - { - return dispatch( i_url, new PropertyValue[0] ); - } - - /* ------------------------------------------------------------------ */ - public boolean dispatch( final String i_url, final PropertyValue[] i_arguments ) throws com.sun.star.uno.Exception - { - URL[] completeURL = new URL[] { new URL() }; - completeURL[0].Complete = i_url; - XDispatch dispatcher = getDispatcher( completeURL ); - if ( dispatcher == null ) - return false; - - dispatcher.dispatch( completeURL[0], i_arguments ); - return true; - } - - /* ------------------------------------------------------------------ */ - public boolean dispatch( final String i_url, final NamedValue[] i_arguments ) throws com.sun.star.uno.Exception - { - final PropertyValue[] dispatchArgs = new PropertyValue[ i_arguments.length ]; - for ( int i=0; i<i_arguments.length; ++i ) - { - dispatchArgs[i] = new PropertyValue( i_arguments[i].Name, -1, i_arguments[i].Value, PropertyState.DIRECT_VALUE ); - } - return dispatch( i_url, dispatchArgs ); - } -}; - diff --git a/test/source/java/org/openoffice/test/tools/SpreadsheetDocument.java b/test/source/java/org/openoffice/test/tools/SpreadsheetDocument.java deleted file mode 100644 index 83b4028eec32..000000000000 --- a/test/source/java/org/openoffice/test/tools/SpreadsheetDocument.java +++ /dev/null @@ -1,73 +0,0 @@ -/************************************************************************* - * - * 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.tools; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XComponent; -import com.sun.star.table.XCellRange; -import com.sun.star.container.XIndexAccess; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.sheet.XSpreadsheets; -import com.sun.star.uno.UnoRuntime; - -/** - * @author frank.schoenheit@oracle.com - */ -public class SpreadsheetDocument extends OfficeDocument -{ - /** Creates a new blank spreadsheet document */ - /* ------------------------------------------------------------------ */ - public SpreadsheetDocument( XMultiServiceFactory orb ) throws com.sun.star.uno.Exception - { - super( orb, implLoadAsComponent( orb, "private:factory/scalc" ) ); - } - - /* ------------------------------------------------------------------ */ - public SpreadsheetDocument( XMultiServiceFactory orb, XComponent document ) throws com.sun.star.uno.Exception - { - super( orb, document ); - } - - /* ------------------------------------------------------------------ */ - /** returns the sheets collection - */ - public XSpreadsheets getSheets() throws com.sun.star.uno.Exception - { - XSpreadsheetDocument spreadsheetDoc = UnoRuntime.queryInterface( XSpreadsheetDocument.class, getDocument() ); - return spreadsheetDoc.getSheets(); - } - - /* ------------------------------------------------------------------ */ - /** returns the sheet with the given index - */ - public XCellRange getSheet( int index ) throws com.sun.star.uno.Exception - { - XIndexAccess sheets = UnoRuntime.queryInterface( XIndexAccess.class, getSheets() ); - return UnoRuntime.queryInterface( XCellRange.class, sheets.getByIndex( index ) ); - } -} diff --git a/test/source/java/org/openoffice/test/tools/SpreadsheetView.java b/test/source/java/org/openoffice/test/tools/SpreadsheetView.java deleted file mode 100644 index 34cb8b0813e4..000000000000 --- a/test/source/java/org/openoffice/test/tools/SpreadsheetView.java +++ /dev/null @@ -1,72 +0,0 @@ -/************************************************************************* - * - * 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.tools; - -import com.sun.star.container.XIndexAccess; -import com.sun.star.frame.XController; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.sheet.XSpreadsheet; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.sheet.XSpreadsheetView; -import com.sun.star.uno.UnoRuntime; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * @author frank.schoenheit@oracle.com - */ -public class SpreadsheetView extends OfficeDocumentView -{ - - /** Creates a new instance of SpreadsheetView */ - public SpreadsheetView( XMultiServiceFactory orb, OfficeDocument document, XController controller ) - { - super( orb, document, controller ); - } - - /** activates the sheet with the given index - */ - void activateSheet( int sheetIndex ) - { - try - { - // get the sheet to activate - XSpreadsheetDocument doc = UnoRuntime.queryInterface( XSpreadsheetDocument.class, getDocument().getDocument() ); - XIndexAccess sheets = UnoRuntime.queryInterface( XIndexAccess.class, doc.getSheets() ); - - XSpreadsheet sheet = UnoRuntime.queryInterface( XSpreadsheet.class, sheets.getByIndex( sheetIndex ) ); - - // activate - XSpreadsheetView view = UnoRuntime.queryInterface( XSpreadsheetView.class, getController() ); - view.setActiveSheet( sheet ); - } - catch( com.sun.star.uno.Exception e ) - { - Logger.getLogger( SpreadsheetView.class.getName() ).log( Level.SEVERE, "unable to activate the given sheet", e ); - } - } -} diff --git a/test/source/java/org/openoffice/test/tools/makefile.mk b/test/source/java/org/openoffice/test/tools/makefile.mk deleted file mode 100644 index 1464bb958d49..000000000000 --- a/test/source/java/org/openoffice/test/tools/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# 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 = test-tools - -PACKAGE = org/openoffice/test/tools - -.INCLUDE: settings.mk - -JARFILES = juh.jar ridl.jar unoil.jar -JAVAFILES = \ - OfficeDocument.java \ - OfficeDocumentView.java \ - DocumentType.java \ - SpreadsheetDocument.java \ - SpreadsheetView.java \ - -JARTARGET = $(TARGET).jar -JARCLASSDIRS = $(PACKAGE) -JARCLASSPATH = $(JARFILES) - -.INCLUDE: target.mk - -test: - echo $(JAVACLASSFILES) |