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>

12 files changed, 18 insertions, 18 deletions

diff --git a/filter/qa/cppunit/filters-dxf-test.cxx b/filter/qa/cppunit/filters-dxf-test.cxx
index 2b1aa3d3e891..d90d4173baa2 100644
--- a/filter/qa/cppunit/filters-dxf-test.cxx
+++ b/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);
diff --git a/filter/qa/cppunit/filters-eps-test.cxx b/filter/qa/cppunit/filters-eps-test.cxx
index 830503853d6a..da204859f8ac 100644
--- a/filter/qa/cppunit/filters-eps-test.cxx
+++ b/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);
diff --git a/filter/qa/cppunit/filters-met-test.cxx b/filter/qa/cppunit/filters-met-test.cxx
index 6bde13af92eb..af78d17bbe21 100644
--- a/filter/qa/cppunit/filters-met-test.cxx
+++ b/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);
diff --git a/filter/qa/cppunit/filters-pcd-test.cxx b/filter/qa/cppunit/filters-pcd-test.cxx
index 1ed47487fcdb..6f967665474c 100644
--- a/filter/qa/cppunit/filters-pcd-test.cxx
+++ b/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);
diff --git a/filter/qa/cppunit/filters-pcx-test.cxx b/filter/qa/cppunit/filters-pcx-test.cxx
index 83d996f15a53..4c5c778fac0e 100644
--- a/filter/qa/cppunit/filters-pcx-test.cxx
+++ b/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);
diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx
index 14ba6b8c379c..9ca3ba5a7e15 100644
--- a/filter/qa/cppunit/filters-pict-test.cxx
+++ b/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/");
     }
 
     /**
diff --git a/filter/qa/cppunit/filters-ppm-test.cxx b/filter/qa/cppunit/filters-ppm-test.cxx
index 71b3fc435edb..0eefd1979203 100644
--- a/filter/qa/cppunit/filters-ppm-test.cxx
+++ b/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);
diff --git a/filter/qa/cppunit/filters-psd-test.cxx b/filter/qa/cppunit/filters-psd-test.cxx
index 8c49a238ec18..0f1f007e7772 100644
--- a/filter/qa/cppunit/filters-psd-test.cxx
+++ b/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);
diff --git a/filter/qa/cppunit/filters-ras-test.cxx b/filter/qa/cppunit/filters-ras-test.cxx
index a61e0f2ec132..4293b8da5db3 100644
--- a/filter/qa/cppunit/filters-ras-test.cxx
+++ b/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);
diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx
index e105863959e9..6df9e5818d64 100644
--- a/filter/qa/cppunit/filters-tga-test.cxx
+++ b/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);
diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx
index 6a3e12293dfc..80b8fa3a1b6a 100644
--- a/filter/qa/cppunit/filters-tiff-test.cxx
+++ b/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);
diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx
index 49757197dc31..01fe09d58ba7 100644
--- a/filter/qa/cppunit/xslt-test.cxx
+++ b/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()));