From e95e05795d192275fa3c44a87377ce8353ae32d8 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Thu, 24 Nov 2016 11:26:21 +0100 Subject: screenshots: builddir is not neccessarily same as srcdir Change-Id: Ic7d3d7854eeb5511d5e94e7329fcffa8a3ccba34 Reviewed-on: https://gerrit.libreoffice.org/31160 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit bc13c1c2bab46135ef7c05fa1a772989f8ff4460) Reviewed-on: https://gerrit.libreoffice.org/31868 Reviewed-by: Christian Lohmaier --- test/source/screenshot_test.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx index b4e863392bc6..dcd0befda337 100644 --- a/test/source/screenshot_test.cxx +++ b/test/source/screenshot_test.cxx @@ -36,7 +36,7 @@ using namespace css; using namespace css::uno; ScreenshotTest::ScreenshotTest() -: m_aScreenshotDirectory("/workdir/screenshots/"), +: m_aScreenshotDirectory("/screenshots/"), maKnownDialogs() { SvtSysLocaleOptions localeOptions; @@ -54,8 +54,8 @@ void ScreenshotTest::setUp() mxDesktop = css::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ); CPPUNIT_ASSERT_MESSAGE("no desktop!", mxDesktop.is()); - osl::FileBase::RC err = osl::Directory::create( m_directories.getURLFromSrc( m_aScreenshotDirectory ) ); - CPPUNIT_ASSERT_MESSAGE( "Failed to create screenshot directory", (err == osl::FileBase::E_None || err == osl::FileBase::E_EXIST) ); + osl::FileBase::RC err = osl::Directory::create( m_directories.getURLFromWorkdir( OUStringToOString(m_aScreenshotDirectory, RTL_TEXTENCODING_UTF8).getStr())) ; + CPPUNIT_ASSERT_MESSAGE(OUStringToOString("Failed to create screenshot directory - " + m_directories.getURLFromWorkdir( OUStringToOString(m_aScreenshotDirectory, RTL_TEXTENCODING_UTF8).getStr()), RTL_TEXTENCODING_UTF8).getStr(), (err == osl::FileBase::E_None || err == osl::FileBase::E_EXIST) ); // initialize maKnownDialogs if (maKnownDialogs.empty()) @@ -70,11 +70,11 @@ void ScreenshotTest::implSaveScreenshot(const Bitmap& rScreenshot, const OString splitHelpId(rScreenshotId, aDirname, aBasename); aDirname = m_aScreenshotDirectory + maCurrentLanguage + "/" + aDirname; - osl::FileBase::RC err = osl::Directory::createPath(m_directories.getURLFromSrc(aDirname)); + osl::FileBase::RC err = osl::Directory::createPath(m_directories.getURLFromWorkdir(OUStringToOString(aDirname,RTL_TEXTENCODING_UTF8).getStr())); CPPUNIT_ASSERT_MESSAGE(OUStringToOString("Failed to create " + aDirname, RTL_TEXTENCODING_UTF8).getStr(), (err == osl::FileBase::E_None || err == osl::FileBase::E_EXIST)); - OUString aFullPath = m_directories.getSrcRootPath() + aDirname + "/" + aBasename + ".png"; + OUString aFullPath = m_directories.getPathFromWorkdir(OUStringToOString(aDirname + "/" + aBasename + ".png",RTL_TEXTENCODING_UTF8).getStr()); SvFileStream aNew(aFullPath, StreamMode::WRITE | StreamMode::TRUNC); CPPUNIT_ASSERT_MESSAGE(OUStringToOString("Failed to open " + OUString::number(aNew.GetErrorCode()), RTL_TEXTENCODING_UTF8).getStr(), aNew.IsOpen()); -- cgit