From 5e4451575964151dbe7b0e905d0a9f4757f609d2 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 28 Sep 2011 15:57:53 +0100 Subject: Rename and re-factor test and unotest to compile and run again --- test/inc/test/bootstrapfixture.hxx | 2 +- test/inc/test/detail/testdllapi.hxx | 42 ------------------ test/inc/test/gettestargument.hxx | 49 --------------------- test/inc/test/officeconnection.hxx | 71 ------------------------------- test/inc/test/oustringostreaminserter.hxx | 51 ---------------------- test/inc/test/testdllapi.hxx | 42 ++++++++++++++++++ test/inc/test/toabsolutefileurl.hxx | 47 -------------------- test/inc/test/uniquepipename.hxx | 47 -------------------- 8 files changed, 43 insertions(+), 308 deletions(-) delete mode 100644 test/inc/test/detail/testdllapi.hxx delete mode 100644 test/inc/test/gettestargument.hxx delete mode 100644 test/inc/test/officeconnection.hxx delete mode 100644 test/inc/test/oustringostreaminserter.hxx create mode 100644 test/inc/test/testdllapi.hxx delete mode 100644 test/inc/test/toabsolutefileurl.hxx delete mode 100644 test/inc/test/uniquepipename.hxx (limited to 'test/inc') diff --git a/test/inc/test/bootstrapfixture.hxx b/test/inc/test/bootstrapfixture.hxx index 791710c4cce4..7a0cc90220f5 100644 --- a/test/inc/test/bootstrapfixture.hxx +++ b/test/inc/test/bootstrapfixture.hxx @@ -40,7 +40,7 @@ #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" -#include "test/detail/testdllapi.hxx" +#include "test/testdllapi.hxx" namespace test { diff --git a/test/inc/test/detail/testdllapi.hxx b/test/inc/test/detail/testdllapi.hxx deleted file mode 100644 index bc2231c84b13..000000000000 --- a/test/inc/test/detail/testdllapi.hxx +++ /dev/null @@ -1,42 +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 -* -* 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 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/test/gettestargument.hxx b/test/inc/test/gettestargument.hxx deleted file mode 100644 index 4fe11147bc16..000000000000 --- a/test/inc/test/gettestargument.hxx +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -* -************************************************************************/ - -#ifndef INCLUDED_TEST_GETTESTARGUMENT_HXX -#define INCLUDED_TEST_GETTESTARGUMENT_HXX - -#include "sal/config.h" - -#include "test/detail/testdllapi.hxx" - -namespace rtl { class OUString; } - -namespace test { - -// Obtain the value of a test argument (tunneled in via an "arg-testarg." -// bootstrap variable): -OOO_DLLPUBLIC_TEST bool getTestArgument( - rtl::OUString const & name, rtl::OUString * value); - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/test/officeconnection.hxx b/test/inc/test/officeconnection.hxx deleted file mode 100644 index e5250ce6aedf..000000000000 --- a/test/inc/test/officeconnection.hxx +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -************************************************************************/ - -#ifndef INCLUDED_TEST_OFFICECONNECTION_HXX -#define INCLUDED_TEST_OFFICECONNECTION_HXX - -#include "sal/config.h" - -#include "boost/noncopyable.hpp" -#include "com/sun/star/uno/Reference.hxx" -#include "osl/process.h" -#include "test/detail/testdllapi.hxx" - -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } - -namespace test { - -// Start up and shut down an OOo instance (details about the OOo instance are -// tunneled in via "arg-..." bootstrap variables): -class OOO_DLLPUBLIC_TEST OfficeConnection: private boost::noncopyable { -public: - OfficeConnection(); - - ~OfficeConnection(); - - void setUp(); - - void tearDown(); - - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - getComponentContext() const; - - // Must not be called before setUp or after tearDown: - bool isStillAlive() const; - -private: - oslProcess process_; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - context_; -}; - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/test/oustringostreaminserter.hxx b/test/inc/test/oustringostreaminserter.hxx deleted file mode 100644 index 2658cad31d67..000000000000 --- a/test/inc/test/oustringostreaminserter.hxx +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -************************************************************************/ - -#ifndef INCLUDED_TEST_OUSTRINGOSTREAMINSERTER_HXX -#define INCLUDED_TEST_OUSTRINGOSTREAMINSERTER_HXX - -#include "sal/config.h" - -#include - -#include "osl/thread.h" -#include "rtl/ustring.hxx" - -// Include this header to support rtl::OUString in CPPUNIT_ASSERT macros. - -template< typename charT, typename traits > std::basic_ostream & -operator <<( - std::basic_ostream & stream, rtl::OUString const & string) -{ - return stream << - rtl::OUStringToOString(string, osl_getThreadTextEncoding()).getStr(); - // best effort; potentially loses data due to conversion failures and - // embedded null characters -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/test/testdllapi.hxx b/test/inc/test/testdllapi.hxx new file mode 100644 index 000000000000..bc2231c84b13 --- /dev/null +++ b/test/inc/test/testdllapi.hxx @@ -0,0 +1,42 @@ +/* -*- 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 +* +* 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 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/test/toabsolutefileurl.hxx b/test/inc/test/toabsolutefileurl.hxx deleted file mode 100644 index fdd8a7b966d7..000000000000 --- a/test/inc/test/toabsolutefileurl.hxx +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -************************************************************************/ - -#ifndef INCLUDED_TEST_TOABSOLUTEFILEURL_HXX -#define INCLUDED_TEST_TOABSOLUTEFILEURL_HXX - -#include "sal/config.h" - -#include "test/detail/testdllapi.hxx" - -namespace rtl { class OUString; } - -namespace test { - -// Convert a pathname in system notation, potentially relative to the process's -// current working directory, to an absolute file URL: -OOO_DLLPUBLIC_TEST rtl::OUString toAbsoluteFileUrl( - rtl::OUString const & relativePathname); - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/test/uniquepipename.hxx b/test/inc/test/uniquepipename.hxx deleted file mode 100644 index b66492ce271a..000000000000 --- a/test/inc/test/uniquepipename.hxx +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -* -************************************************************************/ - -#ifndef INCLUDED_TEST_UNIQUEPIPENAME_HXX -#define INCLUDED_TEST_UNIQUEPIPENAME_HXX - -#include "sal/config.h" - -#include "test/detail/testdllapi.hxx" - -namespace rtl { class OUString; } - -namespace test { - -// Create a system-wide unique name (for use with osl::Pipe): -OOO_DLLPUBLIC_TEST rtl::OUString uniquePipeName(rtl::OUString const & name); - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit