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/23078Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

basic/qa/cppunit/basic_coverage.cxx

@@ -138,7 +138,7 @@ void Coverage::process_directory(const OUString& sDirName)
 
 void Coverage::Coverage_Iterator()
 {
-    OUString sDirName = getURLFromSrc("/basic/qa/basic_coverage/");
+    OUString sDirName = m_directories.getURLFromSrc("/basic/qa/basic_coverage/");
 
     CPPUNIT_ASSERT(!sDirName.isEmpty());
     process_directory(sDirName); // any files in the root test dir are run in test harness default locale ( en-US )

basic/qa/cppunit/test_vba.cxx

@@ -54,7 +54,7 @@ void VBATest::testMiscVBAFunctions()
 #endif
         "win32compatb.vb" // same methods, different signatures.
     };
-    OUString sMacroPathURL = getURLFromSrc("/basic/qa/vba_tests/");
+    OUString sMacroPathURL = m_directories.getURLFromSrc("/basic/qa/vba_tests/");
     // Some test data expects the uk locale
     LanguageTag aLocale(LANGUAGE_ENGLISH_UK);
     SvtSysLocaleOptions aLocalOptions;
@@ -109,11 +109,11 @@ void VBATest::testMiscOLEStuff()
         "ole_dfltObjDflMethod.vb",
     };
 
-    OUString sMacroPathURL = getURLFromSrc("/basic/qa/vba_tests/");
+    OUString sMacroPathURL = m_directories.getURLFromSrc("/basic/qa/vba_tests/");
 
     uno::Sequence< uno::Any > aArgs(1);
     // path to test document
-    OUString sPath = getPathFromSrc("/basic/qa/vba_tests/data/");
+    OUString sPath = m_directories.getPathFromSrc("/basic/qa/vba_tests/data/");
     sPath += "ADODBdata.xls";
     sPath = sPath.replaceAll( "/", "\\" );
 

chart2/qa/extras/charttest.hxx

@@ -113,7 +113,7 @@ void ChartTest::load( const OUString& aDir, const OUString& aName )
         maServiceName = "com.sun.star.drawing.DrawingDocument";
     }
 
-    mxComponent = loadFromDesktop(getURLFromSrc(aDir) + aName, maServiceName);
+    mxComponent = loadFromDesktop(m_directories.getURLFromSrc(aDir) + aName, maServiceName);
     CPPUNIT_ASSERT(mxComponent.is());
 }
 
@@ -414,7 +414,7 @@ std::vector<uno::Sequence<uno::Any> > getDataSeriesLabelsFromChartType( const Re
 
 uno::Reference< chart::XChartDocument > ChartTest::getChartDocFromImpress( const char* pDir, const char* pName )
 {
-    mxComponent = loadFromDesktop(getURLFromSrc(pDir) + OUString::createFromAscii(pName), "com.sun.star.comp.Draw.PresentationDocument");
+    mxComponent = loadFromDesktop(m_directories.getURLFromSrc(pDir) + OUString::createFromAscii(pName), "com.sun.star.comp.Draw.PresentationDocument");
     uno::Reference< drawing::XDrawPagesSupplier > xDoc(mxComponent, uno::UNO_QUERY_THROW );
     uno::Reference< drawing::XDrawPage > xPage(
         xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );

connectivity/qa/connectivity/ado/DriverTest.cxx

@@ -62,7 +62,7 @@ void AdoDriverTest::setUp()
     CPPUNIT_ASSERT_MESSAGE("no ado component!", m_xAdoComponent.is());
 
     OUString url = "sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=" +
-        getPathFromWorkdir("/CppunitTest/TS001018407.mdb");
+        m_directories.getPathFromWorkdir("/CppunitTest/TS001018407.mdb");
 
     Sequence< PropertyValue > info;
     Reference< XDriver> xDriver(m_xAdoComponent, UNO_QUERY);

connectivity/qa/connectivity/mork/DriverTest.cxx

@@ -65,7 +65,7 @@ void MorkDriverTest::setUp()
     // is this the best way to pass test file through URL?
     // may be take a custom Sequence< PropertyValue > route?
     OUString url = "sdbc:address:thunderbird:unittest:" +
-        getPathFromSrc("/connectivity/qa/connectivity/mork/abook_10_john_does.mab");
+        m_directories.getPathFromSrc("/connectivity/qa/connectivity/mork/abook_10_john_does.mab");
 
     Sequence< PropertyValue > info;
     Reference< XDriver> xDriver(m_xMorkComponent, UNO_QUERY);

dbaccess/qa/extras/dialog-save.cxx

@@ -68,7 +68,7 @@ void DialogSaveTest::test()
     SolarMutexReleaser rel;
 
     const OUString sStandard("Standard");
-    const OUString aFileName(getURLFromWorkdir("CppunitTest/testDialogSave.odb"));
+    const OUString aFileName(m_directories.getURLFromWorkdir("CppunitTest/testDialogSave.odb"));
     {
         uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
         CPPUNIT_ASSERT(xComponent.is());

dbaccess/qa/extras/empty-stdlib-save.cxx

@@ -68,7 +68,7 @@ void DialogSaveTest::test()
     SolarMutexReleaser rel;
 
     const OUString sStandard("Standard");
-    const OUString aFileName(getURLFromWorkdir("CppunitTest/testEmptyStdlibSave.odb"));
+    const OUString aFileName(m_directories.getURLFromWorkdir("CppunitTest/testEmptyStdlibSave.odb"));
     {
         uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
         CPPUNIT_ASSERT(xComponent.is());

dbaccess/qa/extras/nolib-save.cxx

@@ -68,7 +68,7 @@ void DialogSaveTest::test()
     SolarMutexReleaser rel;
 
     const OUString sStandard("Standard");
-    const OUString aFileName(getURLFromWorkdir("CppunitTest/testNolibSave.odb"));
+    const OUString aFileName(m_directories.getURLFromWorkdir("CppunitTest/testNolibSave.odb"));
     {
         uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
         CPPUNIT_ASSERT(xComponent.is());

dbaccess/qa/extras/rowsetclones.cxx

@@ -60,7 +60,7 @@ RowSetClones::RowSetClones()
 
 void RowSetClones::test()
 {
-    const OUString sFilePath(getURLFromWorkdir("CppunitTest/RowSetClones.odb"));
+    const OUString sFilePath(m_directories.getURLFromWorkdir("CppunitTest/RowSetClones.odb"));
 
     uno::Reference< lang::XComponent > xComponent (loadFromDesktop(sFilePath));
     CPPUNIT_ASSERT(xComponent.is());

extensions/qa/update/test_update.cxx

@@ -37,7 +37,7 @@ public:
 
         // repositories that we will be checking
         m_aRepositoryList.realloc( 1 );
-        m_aRepositoryList[0] = getURLFromSrc( "/extensions/qa/update/simple.xml" );
+        m_aRepositoryList[0] = m_directories.getURLFromSrc( "/extensions/qa/update/simple.xml" );
     }
 
     virtual void tearDown() override

filter/qa/cppunit/filters-dxf-test.cxx

@@ -60,7 +60,7 @@ bool DxfFilterTest::load(const OUString &,
 void DxfFilterTest::testCVEs()
 {
     testDir(OUString(),
-        getURLFromSrc("/filter/qa/cppunit/data/dxf/"));
+        m_directories.getURLFromSrc("/filter/qa/cppunit/data/dxf/"));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(DxfFilterTest);

filter/qa/cppunit/filters-eps-test.cxx

@@ -60,7 +60,7 @@ bool EpsFilterTest::load(const OUString &,
 void EpsFilterTest::testCVEs()
 {
     testDir(OUString(),
-        getURLFromSrc("/filter/qa/cppunit/data/eps/"));
+        m_directories.getURLFromSrc("/filter/qa/cppunit/data/eps/"));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(EpsFilterTest);

filter/qa/cppunit/filters-met-test.cxx

@@ -60,7 +60,7 @@ bool MetFilterTest::load(const OUString &,
 void MetFilterTest::testCVEs()
 {
     testDir(OUString(),
-        getURLFromSrc("/filter/qa/cppunit/data/met/"));
+        m_directories.getURLFromSrc("/filter/qa/cppunit/data/met/"));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(MetFilterTest);

filter/qa/cppunit/filters-pcd-test.cxx

@@ -60,7 +60,7 @@ bool PcdFilterTest::load(const OUString &,
 void PcdFilterTest::testCVEs()
 {
     testDir(OUString(),
-        getURLFromSrc("/filter/qa/cppunit/data/pcd/"));
+        m_directories.getURLFromSrc("/filter/qa/cppunit/data/pcd/"));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(PcdFilterTest);

filter/qa/cppunit/filters-pcx-test.cxx

@@ -60,7 +60,7 @@ bool PcxFilterTest::load(const OUString &,
 void PcxFilterTest::testCVEs()
 {
     testDir(OUString(),
-        getURLFromSrc("/filter/qa/cppunit/data/pcx/"));
+        m_directories.getURLFromSrc("/filter/qa/cppunit/data/pcx/"));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(PcxFilterTest);

filter/qa/cppunit/filters-pict-test.cxx

@@ -46,7 +46,7 @@ public:
 
     OUString pictURL()
     {
-        return getURLFromSrc("/filter/qa/cppunit/data/pict/");
+        return m_directories.getURLFromSrc("/filter/qa/cppunit/data/pict/");
     }
 
     /**

filter/qa/cppunit/filters-ppm-test.cxx

@@ -60,10 +60,10 @@ bool PpmFilterTest::load(const OUString &,
 void PpmFilterTest::testCVEs()
 {
     testDir(OUString(),
-        getURLFromSrc("/filter/qa/cppunit/data/ppm/"));
+        m_directories.getURLFromSrc("/filter/qa/cppunit/data/ppm/"));
 
     testDir(OUString(),
-        getURLFromSrc("/filter/qa/cppunit/data/pbm/"));
+        m_directories.getURLFromSrc("/filter/qa/cppunit/data/pbm/"));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(PpmFilterTest);

filter/qa/cppunit/filters-psd-test.cxx

@@ -60,7 +60,7 @@ bool PsdFilterTest::load(const OUString &,
 void PsdFilterTest::testCVEs()
 {
     testDir(OUString(),
-        getURLFromSrc("/filter/qa/cppunit/data/psd/"));
+        m_directories.getURLFromSrc("/filter/qa/cppunit/data/psd/"));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(PsdFilterTest);

filter/qa/cppunit/filters-ras-test.cxx

@@ -60,7 +60,7 @@ bool RasFilterTest::load(const OUString &,
 void RasFilterTest::testCVEs()
 {
     testDir(OUString(),
-        getURLFromSrc("/filter/qa/cppunit/data/ras/"));
+        m_directories.getURLFromSrc("/filter/qa/cppunit/data/ras/"));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(RasFilterTest);

filter/qa/cppunit/filters-tga-test.cxx

@@ -60,7 +60,7 @@ bool TgaFilterTest::load(const OUString &,
 void TgaFilterTest::testCVEs()
 {
     testDir(OUString(),
-        getURLFromSrc("/filter/qa/cppunit/data/tga/"));
+        m_directories.getURLFromSrc("/filter/qa/cppunit/data/tga/"));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(TgaFilterTest);

filter/qa/cppunit/filters-tiff-test.cxx

@@ -60,7 +60,7 @@ bool TiffFilterTest::load(const OUString &,
 void TiffFilterTest::testCVEs()
 {
     testDir(OUString(),
-        getURLFromSrc("/filter/qa/cppunit/data/tiff/"));
+        m_directories.getURLFromSrc("/filter/qa/cppunit/data/tiff/"));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(TiffFilterTest);

filter/qa/cppunit/xslt-test.cxx

@@ -80,14 +80,14 @@ void XsltFilterTest::testXsltCopyNew()
     osl_closeFile(tempFile); // close it so xSFA can open it on WNT
 
     OUString source(
-            getURLFromSrc("/filter/source/xsltfilter/xsltfilter.component"));
+            m_directories.getURLFromSrc("/filter/source/xsltfilter/xsltfilter.component"));
     uno::Sequence<uno::Any> args(7);
     args[0] <<= beans::NamedValue("StylesheetURL",
-        uno::makeAny(getURLFromSrc("/filter/qa/cppunit/data/xslt/copy.xslt")));
+        uno::makeAny(m_directories.getURLFromSrc("/filter/qa/cppunit/data/xslt/copy.xslt")));
     args[1] <<= beans::NamedValue("SourceURL", uno::makeAny(source));
     args[2] <<= beans::NamedValue("TargetURL", uno::makeAny(tempURL));
     args[3] <<= beans::NamedValue("SourceBaseURL",
-        uno::makeAny(getURLFromSrc("/filter/source/xsltfilter/")));
+        uno::makeAny(m_directories.getURLFromSrc("/filter/source/xsltfilter/")));
     args[4] <<= beans::NamedValue("TargetBaseURL", uno::makeAny(tempDirURL));
     args[5] <<= beans::NamedValue("SystemType", uno::makeAny(OUString()));
     args[6] <<= beans::NamedValue("PublicType", uno::makeAny(OUString()));
@@ -137,14 +137,14 @@ void XsltFilterTest::testXsltCopyOld()
     osl_closeFile(tempFile); // close it so xSFA can open it on WNT
 
     OUString source(
-            getURLFromSrc("/filter/source/xsltfilter/xsltfilter.component"));
+            m_directories.getURLFromSrc("/filter/source/xsltfilter/xsltfilter.component"));
     uno::Sequence<uno::Any> args(7);
     args[0] <<= beans::NamedValue("StylesheetURL",
-        uno::makeAny(getURLFromSrc("/filter/qa/cppunit/data/xslt/copy.xslt")));
+        uno::makeAny(m_directories.getURLFromSrc("/filter/qa/cppunit/data/xslt/copy.xslt")));
     args[1] <<= beans::NamedValue("SourceURL", uno::makeAny(source));
     args[2] <<= beans::NamedValue("TargetURL", uno::makeAny(tempURL));
     args[3] <<= beans::NamedValue("SourceBaseURL",
-        uno::makeAny(getURLFromSrc("/filter/source/xsltfilter/")));
+        uno::makeAny(m_directories.getURLFromSrc("/filter/source/xsltfilter/")));
     args[4] <<= beans::NamedValue("TargetBaseURL", uno::makeAny(tempDirURL));
     args[5] <<= beans::NamedValue("SystemType", uno::makeAny(OUString()));
     args[6] <<= beans::NamedValue("PublicType", uno::makeAny(OUString()));

hwpfilter/qa/cppunit/test_hwpfilter.cxx

@@ -60,7 +60,7 @@ namespace
     void HwpFilterTest::test()
     {
         testDir(OUString(),
-            getURLFromSrc("/hwpfilter/qa/cppunit/data/"));
+            m_directories.getURLFromSrc("/hwpfilter/qa/cppunit/data/"));
     }
 
     CPPUNIT_TEST_SUITE_REGISTRATION(HwpFilterTest);

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;
 

include/unotest/directories.hxx

+/* -*- 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: */

lotuswordpro/qa/cppunit/test_lotuswordpro.cxx

@@ -62,7 +62,7 @@ namespace
     void LotusWordProTest::test()
     {
         testDir(OUString(),
-            getURLFromSrc("/lotuswordpro/qa/cppunit/data/"));
+            m_directories.getURLFromSrc("/lotuswordpro/qa/cppunit/data/"));
     }
 
     CPPUNIT_TEST_SUITE_REGISTRATION(LotusWordProTest);

oox/qa/unit/vba_compression.cxx

@@ -84,8 +84,8 @@ void ReadFiles(const OUString& rTestFile, const OUString& rReference,
 
 void TestVbaCompression::testSimple1()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/simple1.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/simple1.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/simple1.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/simple1.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);
@@ -107,8 +107,8 @@ void TestVbaCompression::testSimple1()
 
 void TestVbaCompression::testSimple2()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/simple2.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/simple2.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/simple2.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/simple2.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);
@@ -129,8 +129,8 @@ void TestVbaCompression::testSimple2()
 
 void TestVbaCompression::testSimple3()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/simple3.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/simple3.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/simple3.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/simple3.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);
@@ -151,8 +151,8 @@ void TestVbaCompression::testSimple3()
 
 void TestVbaCompression::testComplex1()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/complex1.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/complex1.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/complex1.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/complex1.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);
@@ -173,8 +173,8 @@ void TestVbaCompression::testComplex1()
 
 void TestVbaCompression::testSpec321()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/spec321.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/spec321.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/spec321.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/spec321.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);
@@ -195,8 +195,8 @@ void TestVbaCompression::testSpec321()
 
 void TestVbaCompression::testSpec322()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/spec322.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/spec322.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/spec322.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/spec322.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);
@@ -217,8 +217,8 @@ void TestVbaCompression::testSpec322()
 
 void TestVbaCompression::testSpec323()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/spec323.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/spec323.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/spec323.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/spec323.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);

package/qa/cppunit/test_package.cxx

@@ -53,7 +53,7 @@ namespace
     void PackageTest::test()
     {
         testDir(OUString(),
-            getURLFromSrc("/package/qa/cppunit/data/"));
+            m_directories.getURLFromSrc("/package/qa/cppunit/data/"));
     }
 
     CPPUNIT_TEST_SUITE_REGISTRATION(PackageTest);

sc/qa/extras/htmlexporttest.cxx

@@ -40,7 +40,7 @@ class ScHTMLExportTest : public test::BootstrapFixture, public unotest::MacrosTe
     {
         if (mxComponent.is())
             mxComponent->dispose();
-        mxComponent = loadFromDesktop(getURLFromSrc(pDir) + OUString::createFromAscii(pName), "com.sun.star.comp.Calc.SpreadsheetDocument");
+        mxComponent = loadFromDesktop(m_directories.getURLFromSrc(pDir) + OUString::createFromAscii(pName), "com.sun.star.comp.Calc.SpreadsheetDocument");
     }
 
     void save(const OUString& aFilterName, TempFile& rTempFile)

sc/qa/unit/filters-test.cxx

@@ -129,22 +129,22 @@ void ScFiltersTest::testCVEs()
 {
 #ifndef DISABLE_CVE_TESTS
     testDir("Quattro Pro 6.0",
-        getURLFromSrc("/sc/qa/unit/data/qpro/"));
+        m_directories.getURLFromSrc("/sc/qa/unit/data/qpro/"));
 
     //warning, the current "sylk filter" in sc (docsh.cxx) automatically
     //chains on failure on trying as csv, rtf, etc. so "success" may
     //not indicate that it imported as .slk.
     testDir("SYLK",
-        getURLFromSrc("/sc/qa/unit/data/slk/"));
+        m_directories.getURLFromSrc("/sc/qa/unit/data/slk/"));
 
     testDir("MS Excel 97",
-        getURLFromSrc("/sc/qa/unit/data/xls/"));
+        m_directories.getURLFromSrc("/sc/qa/unit/data/xls/"));
 
     testDir("dBase",
-        getURLFromSrc("/sc/qa/unit/data/dbf/"));
+        m_directories.getURLFromSrc("/sc/qa/unit/data/dbf/"));
 
     testDir("Lotus",
-        getURLFromSrc("/sc/qa/unit/data/wks/"));
+        m_directories.getURLFromSrc("/sc/qa/unit/data/wks/"));
 
 #endif
 }

sc/qa/unit/helper/qahelper.cxx

@@ -606,7 +606,7 @@ OUString EnsureSeparator(const OUStringBuffer& rFilePath)
 void ScBootstrapFixture::createFileURL(
     const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath)
 {
-    OUStringBuffer aBuffer( getSrcRootURL() );
+    OUStringBuffer aBuffer( m_directories.getSrcRootURL() );
     aBuffer.append(EnsureSeparator(aBuffer)).append(m_aBaseString);
     aBuffer.append(EnsureSeparator(aBuffer)).append(aFileExtension);
     aBuffer.append(EnsureSeparator(aBuffer)).append(aFileBase).append(aFileExtension);
@@ -615,7 +615,7 @@ void ScBootstrapFixture::createFileURL(
 
 void ScBootstrapFixture::createCSVPath(const OUString& aFileBase, OUString& rCSVPath)
 {
-    OUStringBuffer aBuffer( getSrcRootPath());
+    OUStringBuffer aBuffer( m_directories.getSrcRootPath());
     aBuffer.append(EnsureSeparator(aBuffer)).append(m_aBaseString);
     aBuffer.append(EnsureSeparator(aBuffer)).append("contentCSV/").append(aFileBase).append("csv");
     rCSVPath = aBuffer.makeStringAndClear();

sd/qa/unit/HtmlExportTest.cxx

@@ -31,7 +31,7 @@ public:
 
     void testHTMLExport()
     {
-        sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/HtmlExportTestDocument.odp"), ODP);
+        sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/HtmlExportTestDocument.odp"), ODP);
         htmlDocPtr htmlDoc = exportAndParseHtml(xDocShRef);
 
         assertXPath(htmlDoc, "/html", 1);

sd/qa/unit/SVGExportTests.cxx

@@ -39,7 +39,7 @@ protected:
 
     void load(const char* pDir, const char* pName)
     {
-        return loadURL(getURLFromSrc(pDir) + OUString::createFromAscii(pName), pName);
+        return loadURL(m_directories.getURLFromSrc(pDir) + OUString::createFromAscii(pName), pName);
     }
 
     void loadURL(OUString const& rURL, const char* pName)

sd/qa/unit/filters-test.cxx

@@ -81,23 +81,23 @@ void SdFiltersTest::testCVEs()
 {
 #ifndef DISABLE_CVE_TESTS
     testDir("MS PowerPoint 97",
-            getURLFromSrc("/sd/qa/unit/data/ppt/"),
+            m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/"),
             "sdfilt");
 
     testDir("Impress Office Open XML",
-            getURLFromSrc("/sd/qa/unit/data/pptx/"),
+            m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/"),
             "",  (SfxFilterFlags::IMPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER));
 
     testDir("impress8",
-            getURLFromSrc("/sd/qa/unit/data/odp/"),
+            m_directories.getURLFromSrc("/sd/qa/unit/data/odp/"),
             "sdfilt");
 
     testDir("draw8",
-            getURLFromSrc("/sd/qa/unit/data/odg/"),
+            m_directories.getURLFromSrc("/sd/qa/unit/data/odg/"),
             "sdfilt");
 
     testDir("CGM - Computer Graphics Metafile",
-            getURLFromSrc("/sd/qa/unit/data/cgm/"),
+            m_directories.getURLFromSrc("/sd/qa/unit/data/cgm/"),
             "icg");
 #endif
 }

sd/qa/unit/misc-tests.cxx

@@ -97,7 +97,7 @@ void SdMiscTest::testTdf96206()
 {
     // Copying/pasting slide referring to a non-default master with a text duplicated the master
 
-    sd::DrawDocShellRef xDocSh = Load(getURLFromSrc("/sd/qa/unit/data/odp/tdf96206.odp"), ODP);
+    sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf96206.odp"), ODP);
     sd::ViewShell *pViewShell = xDocSh->GetViewShell();
     auto pSSVS = sd::slidesorter::SlideSorterViewShell::GetSlideSorter(pViewShell->GetViewShellBase());
     auto& xSSController = pSSVS->GetSlideSorter().GetController();
@@ -114,7 +114,7 @@ void SdMiscTest::testTdf96206()
 
 void SdMiscTest::testTdf96708()
 {
-    sd::DrawDocShellRef xDocSh = Load(getURLFromSrc("/sd/qa/unit/data/odp/tdf96708.odp"), ODP);
+    sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf96708.odp"), ODP);
     sd::ViewShell *pViewShell = xDocSh->GetViewShell();
     auto pSSVS = sd::slidesorter::SlideSorterViewShell::GetSlideSorter(pViewShell->GetViewShellBase());
     auto& xSSController = pSSVS->GetSlideSorter().GetController();

sd/qa/unit/sdmodeltestbase.hxx

@@ -251,7 +251,7 @@ protected:
                         OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr(),
                         static_cast<int>(aString.getLength()),
                         OUStringToOString(
-                            getPathFromSrc("/sd/qa/unit/data/tolerance.xml"),
+                            m_directories.getPathFromSrc("/sd/qa/unit/data/tolerance.xml"),
                             RTL_TEXTENCODING_UTF8).getStr());
             }
         }

sd/qa/unit/tiledrendering/tiledrendering.cxx

@@ -132,7 +132,7 @@ SdXImpressDocument* SdTiledRenderingTest::createDoc(const char* pName)
 {
     if (mxComponent.is())
         mxComponent->dispose();
-    mxComponent = loadFromDesktop(getURLFromSrc(DATA_DIRECTORY) + OUString::createFromAscii(pName), "com.sun.star.presentation.PresentationDocument");
+    mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY) + OUString::createFromAscii(pName), "com.sun.star.presentation.PresentationDocument");
     SdXImpressDocument* pImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
     CPPUNIT_ASSERT(pImpressDocument);
     pImpressDocument->initializeForTiledRendering(uno::Sequence<beans::PropertyValue>());

sdext/source/pdfimport/test/tests.cxx

@@ -458,7 +458,7 @@ namespace
             std::shared_ptr<TestSink> pSink( new TestSink() );
             CPPUNIT_ASSERT(
                 pdfi::xpdf_ImportFromFile(
-                    getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"),
+                    m_directories.getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"),
                     pSink,
                     uno::Reference< task::XInteractionHandler >(),
                     OUString(),
@@ -475,7 +475,7 @@ namespace
             CPPUNIT_ASSERT( osl::File::createTempFile( nullptr, nullptr, &tempFileURL ) == osl::File::E_None );
             osl::File::remove( tempFileURL ); // FIXME the below apparently fails silently if the file already exists
             CPPUNIT_ASSERT_MESSAGE("Exporting to ODF",
-                                   xAdaptor->odfConvert( getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"),
+                                   xAdaptor->odfConvert( m_directories.getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"),
                                                         new OutputWrap(tempFileURL),
                                                         nullptr ));
             osl::File::remove( tempFileURL );
@@ -490,7 +490,7 @@ namespace
             CPPUNIT_ASSERT( osl::File::createTempFile( nullptr, nullptr, &tempFileURL ) == osl::File::E_None );
             osl::File::remove( tempFileURL ); // FIXME the below apparently fails silently if the file already exists
             CPPUNIT_ASSERT_MESSAGE("Exporting to ODF",
-                                   xAdaptor->odfConvert( getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"),
+                                   xAdaptor->odfConvert( m_directories.getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"),
                                                         new OutputWrap(tempFileURL),
                                                         nullptr ));
             osl::File::remove( tempFileURL );
@@ -503,7 +503,7 @@ namespace
 
             OString aOutput;
             CPPUNIT_ASSERT_MESSAGE("Exporting to ODF",
-                xAdaptor->odfConvert(getURLFromSrc("/sdext/source/pdfimport/test/testTdf96993.pdf"),
+                xAdaptor->odfConvert(m_directories.getURLFromSrc("/sdext/source/pdfimport/test/testTdf96993.pdf"),
                 new OutputWrapString(aOutput),
                 nullptr));
             // This ensures that the imported image arrives properly flipped
@@ -517,7 +517,7 @@ namespace
 
             OString aOutput;
             CPPUNIT_ASSERT_MESSAGE("Exporting to ODF",
-                xAdaptor->odfConvert(getURLFromSrc("/sdext/source/pdfimport/test/testTdf96993.pdf"),
+                xAdaptor->odfConvert(m_directories.getURLFromSrc("/sdext/source/pdfimport/test/testTdf96993.pdf"),
                 new OutputWrapString(aOutput),
                 nullptr));
             // This ensures that the imported image arrives properly flipped

sot/qa/cppunit/test_sot.cxx

@@ -118,12 +118,12 @@ namespace
     void SotTest::test()
     {
         testDir(OUString(),
-            getURLFromSrc("/sot/qa/cppunit/data/"));
+            m_directories.getURLFromSrc("/sot/qa/cppunit/data/"));
     }
 
     void SotTest::testSize()
     {
-        OUString aURL(getURLFromSrc("/sot/qa/cppunit/data/pass/fdo84229-1.compound"));