From 60b1c95cc47831246f097ee13dda8bcd71c57eb4 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 9 Mar 2016 14:14:18 +0100 Subject: 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 Reviewed-by: Stephan Bergmann --- vcl/qa/cppunit/blocklistparsertest.cxx | 4 ++-- vcl/qa/cppunit/graphicfilter/filters-test.cxx | 18 +++++++++--------- vcl/qa/cppunit/wmf/wmfimporttest.cxx | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'vcl/qa') diff --git a/vcl/qa/cppunit/blocklistparsertest.cxx b/vcl/qa/cppunit/blocklistparsertest.cxx index 3de95f0b3d82..93817fd21d5f 100644 --- a/vcl/qa/cppunit/blocklistparsertest.cxx +++ b/vcl/qa/cppunit/blocklistparsertest.cxx @@ -36,7 +36,7 @@ void BlocklistParserTest::testParse() { std::vector aDriveInfos; - WinBlocklistParser aBlocklistParser(getURLFromSrc("vcl/qa/cppunit/") + "test_blocklist_parse.xml", aDriveInfos); + WinBlocklistParser aBlocklistParser(m_directories.getURLFromSrc("vcl/qa/cppunit/") + "test_blocklist_parse.xml", aDriveInfos); aBlocklistParser.parse(); size_t const n = aDriveInfos.size(); @@ -105,7 +105,7 @@ void BlocklistParserTest::testEvaluate() { std::vector aDriveInfos; - WinBlocklistParser aBlocklistParser(getURLFromSrc("vcl/qa/cppunit/") + "test_blocklist_evaluate.xml", aDriveInfos); + WinBlocklistParser aBlocklistParser(m_directories.getURLFromSrc("vcl/qa/cppunit/") + "test_blocklist_evaluate.xml", aDriveInfos); aBlocklistParser.parse(); OUString vendorAMD = WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorAMD); diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx index 76dfcf07121c..b478bde6427a 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx @@ -123,31 +123,31 @@ void VclFiltersTest::testCVEs() { #ifndef DISABLE_CVE_TESTS testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/wmf/")); + m_directories.getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/wmf/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/emf/")); + m_directories.getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/emf/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/sgv/")); + m_directories.getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/sgv/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/png/")); + m_directories.getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/png/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/jpg/")); + m_directories.getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/jpg/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/gif/")); + m_directories.getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/gif/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/bmp/")); + m_directories.getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/bmp/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/xbm/")); + m_directories.getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/xbm/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/xpm/")); + m_directories.getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/xpm/")); #endif } diff --git a/vcl/qa/cppunit/wmf/wmfimporttest.cxx b/vcl/qa/cppunit/wmf/wmfimporttest.cxx index 176ff5dda15e..1d333f39ceec 100644 --- a/vcl/qa/cppunit/wmf/wmfimporttest.cxx +++ b/vcl/qa/cppunit/wmf/wmfimporttest.cxx @@ -31,7 +31,7 @@ class WmfTest : public test::BootstrapFixture, public XmlTestTools OUString getFullUrl(const OUString& sFileName) { - return getURLFromSrc(maDataUrl) + sFileName; + return m_directories.getURLFromSrc(maDataUrl) + sFileName; } public: -- cgit