From 7378043546f1a4b3dc89cdce648bc4c4ef067525 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Sat, 3 Nov 2012 17:34:40 -0500
Subject: unottest: add get(URL|Path)FromWorkdir to locate $WORKDIR_FOR_BUILD

Change-Id: Iec4e609e023262f357a7552b75863aeae9385205
---
 unotest/source/cpp/bootstrapfixturebase.cxx | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'unotest/source')

diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx
index 42982c27e0a6..90b3c1fb1e01 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -50,21 +50,36 @@ test::BootstrapFixtureBase::BootstrapFixtureBase()
     CPPUNIT_ASSERT_MESSAGE("SRC_ROOT env variable not set", pSrcRoot != NULL && pSrcRoot[0] != 0);
     const char* pSolverRoot = getenv( "OUTDIR_FOR_BUILD" );
     CPPUNIT_ASSERT_MESSAGE("$OUTDIR_FOR_BUILD env variable not set", pSolverRoot != NULL && pSolverRoot[0] != 0);
+    const char* pWorkdirRoot = getenv( "WORKDIR_FOR_BUILD" );
+    CPPUNIT_ASSERT_MESSAGE("$WORKDIR_FOR_BUILD env variable not set", pWorkdirRoot != NULL && pWorkdirRoot[0] != 0);
 #ifdef WNT
     if (pSrcRoot[1] == ':')
+    {
         m_aSrcRootURL += rtl::OUString::createFromAscii( "/" );
+    }
     if (pSolverRoot[1] == ':')
+    {
         m_aSolverRootURL += rtl::OUString::createFromAscii( "/" );
+    }
+    if (pWorkdirRoot[1] == ':')
+    {
+        m_aWorkdirRootURL += rtl::OUString::createFromAscii( "/" );
+    }
 #endif
 #else
     const char* pSrcRoot = "/assets";
     const char* pSolverRoot = "/assets";
+    const char* pWorkdirRoot = "/assets";
 #endif
     m_aSrcRootPath = rtl::OUString::createFromAscii( pSrcRoot );
     m_aSrcRootURL += m_aSrcRootPath;
 
     m_aSolverRootPath = rtl::OUString::createFromAscii( pSolverRoot );
     m_aSolverRootURL += m_aSolverRootPath;
+
+    m_aWorkdirRootPath = rtl::OUString::createFromAscii( pWorkdirRoot );
+    m_aWorkdirRootURL += m_aWorkdirRootPath;
+
 }
 
 test::BootstrapFixtureBase::~BootstrapFixtureBase()
@@ -81,6 +96,18 @@ test::BootstrapFixtureBase::~BootstrapFixtureBase()
     return m_aSrcRootPath + rtl::OUString::createFromAscii( pPath );
 }
 
+
+::rtl::OUString test::BootstrapFixtureBase::getURLFromWorkdir( const char *pPath )
+{
+    return m_aWorkdirRootURL + rtl::OUString::createFromAscii( pPath );
+}
+
+::rtl::OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath )
+{
+    return m_aWorkdirRootPath + rtl::OUString::createFromAscii( pPath );
+
+}
+
 void test::BootstrapFixtureBase::setUp()
 {
     // set UserInstallation to user profile dir in test/user-template
-- 
cgit