diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-09 14:14:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 08:04:40 +0000 |
| commit | 60b1c95cc47831246f097ee13dda8bcd71c57eb4 (patch) | |
| tree | 8f8ede597a247c78f3742fa46ba9777b66edb76e /writerperfect | |
| parent | 50336412f775af154509d67b1ebbdb4b5feb147b (diff) | |
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>
Diffstat (limited to 'writerperfect')
| -rw-r--r-- | writerperfect/qa/unit/DirectoryStreamTest.cxx | 6 | ||||
| -rw-r--r-- | writerperfect/qa/unit/WPXSvStreamTest.cxx | 4 | ||||
| -rw-r--r-- | writerperfect/qa/unit/WpftImportTestBase.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/writerperfect/qa/unit/DirectoryStreamTest.cxx b/writerperfect/qa/unit/DirectoryStreamTest.cxx index 8c4c70403518..1331932e1994 100644 --- a/writerperfect/qa/unit/DirectoryStreamTest.cxx +++ b/writerperfect/qa/unit/DirectoryStreamTest.cxx @@ -101,9 +101,9 @@ DirectoryStreamTest::DirectoryStreamTest() using ucbhelper::Content; - m_xDir = Content(getURLFromSrc(g_aDirPath), xCmdEnv, xContext).get(); - m_xFile = Content(getURLFromSrc(g_aNondirPath), xCmdEnv, xContext).get(); - m_xNonexistent = Content(getURLFromSrc(g_aNonexistentPath), xCmdEnv, xContext).get(); + m_xDir = Content(m_directories.getURLFromSrc(g_aDirPath), xCmdEnv, xContext).get(); + m_xFile = Content(m_directories.getURLFromSrc(g_aNondirPath), xCmdEnv, xContext).get(); + m_xNonexistent = Content(m_directories.getURLFromSrc(g_aNonexistentPath), xCmdEnv, xContext).get(); } void DirectoryStreamTest::testConstruction() diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx index 2ac9f28af307..16d8ebc22b91 100644 --- a/writerperfect/qa/unit/WPXSvStreamTest.cxx +++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx @@ -293,7 +293,7 @@ void WPXSvStreamTest::testStructured() { // OLE2 { - const shared_ptr<RVNGInputStream> pInput(lcl_createStreamForURL(getURLFromSrc(aOLEFile))); + const shared_ptr<RVNGInputStream> pInput(lcl_createStreamForURL(m_directories.getURLFromSrc(aOLEFile))); assert(bool(pInput)); CPPUNIT_ASSERT(pInput->isStructured()); @@ -314,7 +314,7 @@ void WPXSvStreamTest::testStructured() // Zip { - const shared_ptr<RVNGInputStream> pInput(lcl_createStreamForURL(getURLFromSrc(aZipFile))); + const shared_ptr<RVNGInputStream> pInput(lcl_createStreamForURL(m_directories.getURLFromSrc(aZipFile))); assert(bool(pInput)); CPPUNIT_ASSERT(pInput->isStructured()); diff --git a/writerperfect/qa/unit/WpftImportTestBase.cxx b/writerperfect/qa/unit/WpftImportTestBase.cxx index ac785038b60c..66bc021d992d 100644 --- a/writerperfect/qa/unit/WpftImportTestBase.cxx +++ b/writerperfect/qa/unit/WpftImportTestBase.cxx @@ -172,14 +172,14 @@ bool WpftImportTestBase::load(const OUString &, const OUString &rURL, const OUSt void WpftImportTestBase::doTest(const rtl::OUString &rFilter, const rtl::OUString &rPath) { m_xFilter.set(m_xFactory->createInstanceWithContext(rFilter, m_xContext), uno::UNO_QUERY_THROW); - testDir(OUString(), getURLFromSrc(rPath)); + testDir(OUString(), m_directories.getURLFromSrc(rPath)); } void WpftImportTestBase::doTest(const rtl::OUString &rFilter, const rtl::OUString &rPath, const WpftOptionalMap_t &rOptionalMap) { m_xFilter.set(m_xFactory->createInstanceWithContext(rFilter, m_xContext), uno::UNO_QUERY_THROW); m_pOptionalMap = &rOptionalMap; - testDir(OUString(), getURLFromSrc(rPath)); + testDir(OUString(), m_directories.getURLFromSrc(rPath)); m_pOptionalMap = nullptr; } |