mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix URL creation

Browse Source 
Change-Id: Icbbe9096c60def4687b137a37bfe86c4de9b3f22
This commit is contained in:
Stephan Bergmann
2013-09-27 14:36:40 +02:00
parent 5063e39261
commit a86a737a27
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
unotest/source/cpp/bootstrapfixturebase.cxx
View File

@@ -6,7 +6,13 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include "sal/config.h"
#include <cassert>
#include <unotest/bootstrapfixturebase.hxx> #include <unotest/bootstrapfixturebase.hxx>
#include <osl/file.hxx>
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
#include <rtl/bootstrap.hxx> #include <rtl/bootstrap.hxx>
#include <cppuhelper/bootstrap.hxx> #include <cppuhelper/bootstrap.hxx>
@@ -18,13 +24,25 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
namespace {
OUString getFileURLFromSystemPath(OUString const & path) {
OUString url;
osl::FileBase::RC e = osl::FileBase::getFileURLFromSystemPath(path, url);
assert(e == osl::FileBase::E_None);
if (!url.endsWith("/")) {
url += "/";
}
return url;
}
}
// NB. this constructor is called before any tests are run, once for each // NB. this constructor is called before any tests are run, once for each
// test function in a rather non-intuitive way. This is why all the 'real' // test function in a rather non-intuitive way. This is why all the 'real'
// heavy lifting is deferred until setUp. setUp and tearDown are interleaved // heavy lifting is deferred until setUp. setUp and tearDown are interleaved
// between the tests as you might expect. // between the tests as you might expect.
test::BootstrapFixtureBase::BootstrapFixtureBase() test::BootstrapFixtureBase::BootstrapFixtureBase()
: m_aSrcRootURL("file://"), m_aSolverRootURL( m_aSrcRootURL ),
m_aWorkdirRootURL(m_aSrcRootURL)
{ {
#ifndef ANDROID #ifndef ANDROID
const char* pSrcRoot = getenv( "SRC_ROOT" ); const char* pSrcRoot = getenv( "SRC_ROOT" );
@@ -33,33 +51,19 @@ test::BootstrapFixtureBase::BootstrapFixtureBase()
CPPUNIT_ASSERT_MESSAGE("$OUTDIR_FOR_BUILD env variable not set", pSolverRoot != NULL && pSolverRoot[0] != 0); CPPUNIT_ASSERT_MESSAGE("$OUTDIR_FOR_BUILD env variable not set", pSolverRoot != NULL && pSolverRoot[0] != 0);
const char* pWorkdirRoot = getenv( "WORKDIR_FOR_BUILD" ); const char* pWorkdirRoot = getenv( "WORKDIR_FOR_BUILD" );
CPPUNIT_ASSERT_MESSAGE("$WORKDIR_FOR_BUILD env variable not set", pWorkdirRoot != NULL && pWorkdirRoot[0] != 0); CPPUNIT_ASSERT_MESSAGE("$WORKDIR_FOR_BUILD env variable not set", pWorkdirRoot != NULL && pWorkdirRoot[0] != 0);
#ifdef WNT
if (pSrcRoot[1] == ':')
{
m_aSrcRootURL += "/";
}
if (pSolverRoot[1] == ':')
{
m_aSolverRootURL += "/";
}
if (pWorkdirRoot[1] == ':')
{
m_aWorkdirRootURL += "/";
}
#endif
#else #else
const char* pSrcRoot = "/assets"; const char* pSrcRoot = "/assets";
const char* pSolverRoot = "/assets"; const char* pSolverRoot = "/assets";
const char* pWorkdirRoot = "/assets"; const char* pWorkdirRoot = "/assets";
#endif #endif
m_aSrcRootPath = OUString::createFromAscii( pSrcRoot ); m_aSrcRootPath = OUString::createFromAscii( pSrcRoot );
m_aSrcRootURL += m_aSrcRootPath; m_aSrcRootURL = getFileURLFromSystemPath(m_aSrcRootPath);
m_aSolverRootPath = OUString::createFromAscii( pSolverRoot ); m_aSolverRootPath = OUString::createFromAscii( pSolverRoot );
m_aSolverRootURL += m_aSolverRootPath; m_aSolverRootURL = getFileURLFromSystemPath(m_aSolverRootPath);
m_aWorkdirRootPath = OUString::createFromAscii( pWorkdirRoot ); m_aWorkdirRootPath = OUString::createFromAscii( pWorkdirRoot );
m_aWorkdirRootURL += m_aWorkdirRootPath; m_aWorkdirRootURL = getFileURLFromSystemPath(m_aWorkdirRootPath);
} }