diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-11-04 10:45:08 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-11-04 17:14:38 +0100 |
| commit | c44f64621fe11d6a46c79b9793c7c67c60bb66e8 (patch) | |
| tree | ba47a4bb6dc4ecb47dd4e77209df8f0fa7f4d956 /sw/qa/uibase/uiview/uiview.cxx | |
| parent | 20d5763b2b56b4e3d7569fe9e5cdad87657f6808 (diff) | |
SwModelTestBase: make mpTestDocumentPath private
in preparation for future inheritance from UnoApiTest
Change-Id: Ie5dee5af3609d8490d7d7bad0d6dbc4c8fc17bb9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142280
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw/qa/uibase/uiview/uiview.cxx')
| -rw-r--r-- | sw/qa/uibase/uiview/uiview.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sw/qa/uibase/uiview/uiview.cxx b/sw/qa/uibase/uiview/uiview.cxx index 9ab34e995812..35d4d60d7974 100644 --- a/sw/qa/uibase/uiview/uiview.cxx +++ b/sw/qa/uibase/uiview/uiview.cxx @@ -29,11 +29,14 @@ #include <swmodule.hxx> #include <view.hxx> -constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/uibase/uiview/data/"; - /// Covers sw/source/uibase/uiview/ fixes. class SwUibaseUiviewTest : public SwModelTestBase { +public: + SwUibaseUiviewTest() + : SwModelTestBase("/sw/qa/uibase/uiview/data/") + { + } }; CPPUNIT_TEST_FIXTURE(SwUibaseUiviewTest, testUpdateAllObjectReplacements) @@ -42,10 +45,9 @@ CPPUNIT_TEST_FIXTURE(SwUibaseUiviewTest, testUpdateAllObjectReplacements) utl::TempFileNamed tmp; tmp.EnableKillingFile(); OUString sTempCopy = tmp.GetURL(); - CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, - osl::File::copy(m_directories.getURLFromSrc(DATA_DIRECTORY) - + "updateall-objectreplacements.odt", - sTempCopy)); + CPPUNIT_ASSERT_EQUAL( + osl::FileBase::E_None, + osl::File::copy(createFileURL(u"updateall-objectreplacements.odt"), sTempCopy)); /* BASIC code that exhibits the problem: @@ -94,8 +96,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseUiviewTest, testUpdateAllObjectReplacements) CPPUNIT_TEST_FIXTURE(SwUibaseUiviewTest, testUpdateReplacementNosetting) { // Load a copy of the document in hidden mode. - OUString aSourceURL - = m_directories.getURLFromSrc(DATA_DIRECTORY) + "update-replacement-nosetting.odt"; + OUString aSourceURL = createFileURL(u"update-replacement-nosetting.odt"); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, osl::File::copy(aSourceURL, maTempFile.GetURL())); mxComponent = loadFromDesktop(maTempFile.GetURL(), "com.sun.star.text.TextDocument", { comphelper::makePropertyValue("Hidden", true) }); @@ -118,7 +119,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseUiviewTest, testUpdateReplacementNosetting) CPPUNIT_TEST_FIXTURE(SwUibaseUiviewTest, testKeepRatio) { // Given a document with a custom KeepRatio: - OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "keep-ratio.fodt"; + OUString aURL = createFileURL(u"keep-ratio.fodt"); // When loading that document: mxComponent = loadFromDesktop(aURL); |