Extract Directories from BootstrapFixtureBase

(as some tests derive from the latter only for the Directories part, not for the
setUp/tearDown overrides: those tests will be cleaned up next)

Change-Id: Ib6b78eea868b8bc21d4cc6e8fd9e1d025deca05f
Reviewed-on: https://gerrit.libreoffice.org/23078
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

2 files changed, 55 insertions, 25 deletions

diff --git a/include/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx
index 812cc588f132..8b2f80978847 100644
--- a/include/unotest/bootstrapfixturebase.hxx
+++ b/include/unotest/bootstrapfixturebase.hxx
@@ -11,7 +11,6 @@
 
 #include <sal/config.h>
 
-#include <rtl/string.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
@@ -21,6 +20,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 #include <unotest/detail/unotestdllapi.hxx>
+#include <unotest/directories.hxx>
 
 namespace test {
 
@@ -33,13 +33,8 @@ namespace test {
 // run of unit tests ...
 class OOO_DLLPUBLIC_UNOTEST BootstrapFixtureBase : public CppUnit::TestFixture
 {
-private:
-  OUString m_aSrcRootURL;
-  OUString m_aSrcRootPath;
-  OUString m_aWorkdirRootURL;
-  OUString m_aWorkdirRootPath;
-
 protected:
+  Directories m_directories;
   css::uno::Reference<css::uno::XComponentContext> m_xContext;
   css::uno::Reference<css::lang::XMultiServiceFactory> m_xSFactory;
   css::uno::Reference<css::lang::XMultiComponentFactory> m_xFactory;
@@ -53,24 +48,6 @@ public:
   css::uno::Reference<css::lang::XMultiServiceFactory>
               getMultiServiceFactory() { return m_xSFactory; }
 
-  OUString getSrcRootURL()       { return m_aSrcRootURL; }
-  OUString getSrcRootPath()      { return m_aSrcRootPath; }
-
-  // return a URL to a given c-str path from the source directory
-  OUString getURLFromSrc( const char *pPath );
-  OUString getURLFromSrc( const OUString& rPath );
-
-  // return a Path to a given c-str path from the source directory
-  OUString getPathFromSrc( const char *pPath );
-
-
-  // return a URL to a given c-str path from the workdir directory
-  OUString getURLFromWorkdir( const char *pPath );
-
-#ifdef _WIN32
-  // return a Path to a given c-str path from the workdir directory
-  OUString getPathFromWorkdir( const char *pPath );
-#endif
   virtual void setUp() override;
   virtual void tearDown() override;
 
diff --git a/include/unotest/directories.hxx b/include/unotest/directories.hxx
new file mode 100644
index 000000000000..a658d187a46d
--- /dev/null
+++ b/include/unotest/directories.hxx
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_UNOTEST_DIRECTORIES_HXX
+#define INCLUDED_UNOTEST_DIRECTORIES_HXX
+
+#include <sal/config.h>
+
+#include <rtl/ustring.hxx>
+#include <unotest/detail/unotestdllapi.hxx>
+
+namespace test {
+
+class OOO_DLLPUBLIC_UNOTEST Directories {
+private:
+    OUString m_aSrcRootURL;
+    OUString m_aSrcRootPath;
+    OUString m_aWorkdirRootURL;
+    OUString m_aWorkdirRootPath;
+
+public:
+    Directories();
+
+    OUString getSrcRootURL()       { return m_aSrcRootURL; }
+    OUString getSrcRootPath()      { return m_aSrcRootPath; }
+
+    // return a URL to a given c-str path from the source directory
+    OUString getURLFromSrc( const char *pPath );
+    OUString getURLFromSrc( const OUString& rPath );
+
+    // return a Path to a given c-str path from the source directory
+    OUString getPathFromSrc( const char *pPath );
+
+    // return a URL to a given c-str path from the workdir directory
+    OUString getURLFromWorkdir( const char *pPath );
+
+#ifdef _WIN32
+    // return a Path to a given c-str path from the workdir directory
+    OUString getPathFromWorkdir( const char *pPath );
+#endif
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */