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 /basic | |
| 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 'basic')
| -rw-r--r-- | basic/qa/cppunit/basic_coverage.cxx | 2 | ||||
| -rw-r--r-- | basic/qa/cppunit/test_vba.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx index a77b85a05470..585d54ad007a 100644 --- a/basic/qa/cppunit/basic_coverage.cxx +++ b/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 ) diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index b70d51096d37..265aaf6f7e91 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/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( "/", "\\" ); |