Consistently use OUString in test::Directories

Change-Id: Ia5fd8af34ee9d2f37e4450ab241f6bb9a06445b2
Reviewed-on: https://gerrit.libreoffice.org/41466Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

chart2/qa/extras/charttest.hxx

@@ -76,10 +76,10 @@ public:
     void load( const OUString& rDir, const OUString& rFileName );
     std::shared_ptr<utl::TempFile> save( const OUString& rFileName );
     std::shared_ptr<utl::TempFile> reload( const OUString& rFileName );
-    uno::Sequence < OUString > getImpressChartColumnDescriptions( const char* pDir, const char* pName );
+    uno::Sequence < OUString > getImpressChartColumnDescriptions( const OUString& pDir, const char* pName );
     OUString getFileExtension( const OUString& rFileName );
 
-    uno::Reference< chart::XChartDocument > getChartDocFromImpress( const char* pDir, const char* pName );
+    uno::Reference< chart::XChartDocument > getChartDocFromImpress( const OUString& pDir, const char* pName );
 
     uno::Reference<chart::XChartDocument> getChartDocFromDrawImpress( sal_Int32 nPage, sal_Int32 nShape );
 
@@ -497,7 +497,7 @@ std::vector<uno::Sequence<uno::Any> > getDataSeriesLabelsFromChartType( const Re
     return aRet;
 }
 
-uno::Reference< chart::XChartDocument > ChartTest::getChartDocFromImpress( const char* pDir, const char* pName )
+uno::Reference< chart::XChartDocument > ChartTest::getChartDocFromImpress( const OUString& pDir, const char* pName )
 {
     mxComponent = loadFromDesktop(m_directories.getURLFromSrc(pDir) + OUString::createFromAscii(pName), "com.sun.star.comp.Draw.PresentationDocument");
     uno::Reference< drawing::XDrawPagesSupplier > xDoc(mxComponent, uno::UNO_QUERY_THROW );
@@ -562,7 +562,7 @@ uno::Reference<chart::XChartDocument> ChartTest::getChartDocFromWriter( sal_Int3
     return xChartDoc;
 }
 
-uno::Sequence < OUString > ChartTest::getImpressChartColumnDescriptions( const char* pDir, const char* pName )
+uno::Sequence < OUString > ChartTest::getImpressChartColumnDescriptions( const OUString& pDir, const char* pName )
 {
     uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromImpress( pDir, pName );
     uno::Reference< chart::XChartDataArray > xChartData ( xChartDoc->getData(), uno::UNO_QUERY_THROW);

emfio/qa/cppunit/emf/EmfImportTest.cxx

@@ -40,7 +40,7 @@ class Test : public test::BootstrapFixture, public XmlTestTools
 
     void testWorking();
 
-    Primitive2DSequence parseEmf(const char* aSource);
+    Primitive2DSequence parseEmf(const OUString& aSource);
 
 public:
     CPPUNIT_TEST_SUITE(Test);
@@ -48,7 +48,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-Primitive2DSequence Test::parseEmf(const char* aSource)
+Primitive2DSequence Test::parseEmf(const OUString& aSource)
 {
     const Reference<XEmfParser> xEmfParser = EmfTools::create(m_xContext);
 

include/unotest/directories.hxx

@@ -30,19 +30,17 @@ public:
     const OUString& getSrcRootURL()       { return m_aSrcRootURL; }
     const OUString& getSrcRootPath()      { return m_aSrcRootPath; }
 
-    // return a URL to a given c-str path from the source directory
-    OUString getURLFromSrc( const char *pPath );
+    // return a URL to a given path from the source directory
     OUString getURLFromSrc( const OUString& rPath );
 
-    // return a Path to a given c-str path from the source directory
-    OUString getPathFromSrc( const char *pPath );
+    // return a Path to a given path from the source directory
     OUString getPathFromSrc( const OUString& rPath );
 
-    // return a URL to a given c-str path from the workdir directory
-    OUString getURLFromWorkdir( const char *pPath );
+    // return a URL to a given path from the workdir directory
+    OUString getURLFromWorkdir( const OUString &rPath );
 
-    // return a Path to a given c-str path from the workdir directory
-    OUString getPathFromWorkdir( const char *pPath );
+    // return a Path to a given path from the workdir directory
+    OUString getPathFromWorkdir( const OUString &rPath );
 };
 
 }

sc/qa/extras/htmlexporttest.cxx

@@ -36,7 +36,7 @@ class ScHTMLExportTest : public test::BootstrapFixture, public unotest::MacrosTe
     Reference<XComponent> mxComponent;
     OUString              maFilterOptions;
 
-    void load(const char* pDir, const char* pName)
+    void load(const OUString& pDir, const char* pName)
     {
         if (mxComponent.is())
             mxComponent->dispose();

sc/qa/unit/tiledrendering/tiledrendering.cxx

@@ -51,7 +51,7 @@ std::ostream& operator<<(std::ostream& os, ViewShellId const & id)
 namespace
 {
 
-const char* const DATA_DIRECTORY = "/sc/qa/unit/tiledrendering/data/";
+char const DATA_DIRECTORY[] = "/sc/qa/unit/tiledrendering/data/";
 
 class ScTiledRenderingTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools
 {

sd/qa/unit/SVGExportTests.cxx

@@ -37,7 +37,7 @@ protected:
         xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("svg"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"));
     }
 
-    void load(const char* pDir, const char* pName)
+    void load(const OUString& pDir, const char* pName)
     {
         return loadURL(m_directories.getURLFromSrc(pDir) + OUString::createFromAscii(pName), pName);
     }

sd/qa/unit/import-tests.cxx

@@ -1370,7 +1370,7 @@ void SdImportTest::testTdf93124()
 
 void SdImportTest::testTdf99729()
 {
-    const char* filenames[] = { "/sd/qa/unit/data/odp/tdf99729-new.odp", "/sd/qa/unit/data/odp/tdf99729-legacy.odp" };
+    const OUString filenames[] = { "/sd/qa/unit/data/odp/tdf99729-new.odp", "/sd/qa/unit/data/odp/tdf99729-legacy.odp" };
     int nonwhitecounts[] = { 0, 0 };
     for (unsigned int i = 0; i < SAL_N_ELEMENTS(filenames); ++i)
     {

sd/qa/unit/tiledrendering/tiledrendering.cxx

@@ -52,7 +52,7 @@
 
 using namespace css;
 
-static const char* const DATA_DIRECTORY = "/sd/qa/unit/tiledrendering/data/";
+static char const DATA_DIRECTORY[] = "/sd/qa/unit/tiledrendering/data/";
 
 static std::ostream& operator<<(std::ostream& os, ViewShellId id)
 {

svgio/qa/cppunit/SvgImportTest.cxx

@@ -63,7 +63,7 @@ class Test : public test::BootstrapFixture, public XmlTestTools
     void testTdf99994();
     void testTdf101237();
 
-    Primitive2DSequence parseSvg(const char* aSource);
+    Primitive2DSequence parseSvg(const OUString& aSource);
 
 public:
     CPPUNIT_TEST_SUITE(Test);
@@ -94,7 +94,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-Primitive2DSequence Test::parseSvg(const char* aSource)
+Primitive2DSequence Test::parseSvg(const OUString& aSource)
 {
     const Reference<XSvgParser> xSvgParser = SvgTools::create(m_xContext);
 

sw/qa/extras/globalfilter/globalfilter.cxx

@@ -771,10 +771,10 @@ void Test::testSkipImages()
             uno::Sequence<beans::PropertyValue> args( comphelper::InitPropertySequence({
                     { "FilterOptions", uno::Any(OUString::createFromAscii(aFilterNames[nFilter][1])) }
             }));
-            mxComponent = loadFromDesktop(m_directories.getURLFromSrc(aFilterNames[nFilter][0]), "com.sun.star.text.TextDocument", args);
+            mxComponent = loadFromDesktop(m_directories.getURLFromSrc(OUString::createFromAscii(aFilterNames[nFilter][0])), "com.sun.star.text.TextDocument", args);
             sFailedMessage = sFailedMessage + " - " + aFilterNames[nFilter][1];
         } else
-            mxComponent = loadFromDesktop(m_directories.getURLFromSrc(aFilterNames[nFilter][0]), "com.sun.star.text.TextDocument");
+            mxComponent = loadFromDesktop(m_directories.getURLFromSrc(OUString::createFromAscii(aFilterNames[nFilter][0])), "com.sun.star.text.TextDocument");
 
         // Check shapes (images, textboxes, custom shapes)
         uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY);

sw/qa/extras/inc/swmodeltestbase.hxx

@@ -142,7 +142,7 @@ protected:
     rtl::Reference<TestInteractionHandler> xInteractionHandler;
 
     xmlBufferPtr mpXmlBuffer;
-    const char* mpTestDocumentPath;
+    const OUString mpTestDocumentPath;
     const char* mpFilter;
 
     sal_uInt32 mnStartTime;
@@ -183,7 +183,7 @@ public:
         maFilterOptions = rFilterOptions;
     }
 
-    SwModelTestBase(const char* pTestDocumentPath = "", const char* pFilter = "")
+    SwModelTestBase(const OUString& pTestDocumentPath = OUString(), const char* pFilter = "")
         : mpXmlBuffer(nullptr)
         , mpTestDocumentPath(pTestDocumentPath)
         , mpFilter(pFilter)
@@ -614,7 +614,7 @@ protected:
         std::cout << "File tested,Execution Time (ms)" << std::endl;
     }
 
-    void load(const char* pDir, const char* pName, const char* pPassword = nullptr)
+    void load(const OUString& pDir, const char* pName, const char* pPassword = nullptr)
     {
         return loadURL(m_directories.getURLFromSrc(pDir) + OUString::createFromAscii(pName), pName, pPassword);
     }

sw/qa/extras/tiledrendering/tiledrendering.cxx

@@ -35,7 +35,7 @@
 #include <IDocumentRedlineAccess.hxx>
 #include <vcl/scheduler.hxx>
 
-static const char* const DATA_DIRECTORY = "/sw/qa/extras/tiledrendering/data/";
+static char const DATA_DIRECTORY[] = "/sw/qa/extras/tiledrendering/data/";
 
 static std::ostream& operator<<(std::ostream& os, ViewShellId id)
 {

sw/qa/extras/uiwriter/uiwriter.cxx

@@ -111,7 +111,7 @@
 #include <sfx2/watermarkitem.hxx>
 #include <fmthdft.hxx>
 
-static const char* const DATA_DIRECTORY = "/sw/qa/extras/uiwriter/data/";
+static char const DATA_DIRECTORY[] = "/sw/qa/extras/uiwriter/data/";
 
 class SwUiWriterTest : public SwModelTestBase
 {

test/source/screenshot_test.cxx

@@ -54,7 +54,7 @@ void ScreenshotTest::setUp()
     mxDesktop = css::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) );
     CPPUNIT_ASSERT_MESSAGE("no desktop!", mxDesktop.is());
 
-    osl::Directory::create( m_directories.getURLFromWorkdir( OUStringToOString(m_aScreenshotDirectory, RTL_TEXTENCODING_UTF8).getStr())) ;
+    osl::Directory::create( m_directories.getURLFromWorkdir( m_aScreenshotDirectory)) ;
 
     // initialize maKnownDialogs
     if (maKnownDialogs.empty())
@@ -70,8 +70,7 @@ void ScreenshotTest::implSaveScreenshot(const Bitmap& rScreenshot, const OString
     aDirname = m_aScreenshotDirectory + "/" + aDirname +
                ( (maCurrentLanguage == "en-US") ? OUString() : "/" + maCurrentLanguage );
 
-    auto const path = m_directories.getURLFromWorkdir(
-        OUStringToOString(aDirname, RTL_TEXTENCODING_UTF8).getStr());
+    auto const path = m_directories.getURLFromWorkdir(aDirname);
     auto const e = osl::Directory::createPath(path);
     if (e != osl::FileBase::E_EXIST) {
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
@@ -80,7 +79,7 @@ void ScreenshotTest::implSaveScreenshot(const Bitmap& rScreenshot, const OString
             osl::FileBase::E_None, e);
     }
 
-    OUString aFullPath = m_directories.getPathFromWorkdir(OUStringToOString("/" + aDirname + "/" + aBasename + ".png",RTL_TEXTENCODING_UTF8).getStr());
+    OUString aFullPath = m_directories.getPathFromWorkdir("/" + aDirname + "/" + aBasename + ".png");
     SvFileStream aNew(aFullPath, StreamMode::WRITE | StreamMode::TRUNC);
     CPPUNIT_ASSERT_MESSAGE(OUStringToOString("Failed to open <" + aFullPath + ">: " + OUString::number(sal_uInt32(aNew.GetErrorCode())), RTL_TEXTENCODING_UTF8).getStr(), aNew.IsOpen());
 

unotest/source/cpp/directories.cxx

@@ -41,34 +41,24 @@ test::Directories::Directories() {
     m_aWorkdirRootURL = getFileURLFromSystemPath(m_aWorkdirRootPath);
 }
 
-OUString test::Directories::getURLFromSrc( const char *pPath )
-{
-    return m_aSrcRootURL + OUString::createFromAscii( pPath );
-}
-
 OUString test::Directories::getURLFromSrc( const OUString& rPath )
 {
     return m_aSrcRootURL + rPath;
 }
 
-OUString test::Directories::getPathFromSrc( const char *pPath )
-{
-    return m_aSrcRootPath + OUString::createFromAscii( pPath );
-}
-
 OUString test::Directories::getPathFromSrc(const OUString& rPath)
 {
     return m_aSrcRootPath + rPath;;
 }
 
-OUString test::Directories::getURLFromWorkdir( const char *pPath )
+OUString test::Directories::getURLFromWorkdir( const OUString& rPath )
 {
-    return m_aWorkdirRootURL + OUString::createFromAscii( pPath );
+    return m_aWorkdirRootURL + rPath;
 }
 
-OUString test::Directories::getPathFromWorkdir( const char *pPath )
+OUString test::Directories::getPathFromWorkdir( const OUString& rPath )
 {
-    return m_aWorkdirRootPath + OUString::createFromAscii( pPath );
+    return m_aWorkdirRootPath + rPath;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/qa/cppunit/pdfexport/pdfexport.cxx

@@ -120,7 +120,7 @@ void PdfExportTest::tearDown()
 
 #if HAVE_FEATURE_PDFIUM
 
-const char* const DATA_DIRECTORY = "/vcl/qa/cppunit/pdfexport/data/";
+char const DATA_DIRECTORY[] = "/vcl/qa/cppunit/pdfexport/data/";
 
 void PdfExportTest::load(const OUString& rFile, vcl::filter::PDFDocument& rDocument)
 {

xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx

@@ -23,7 +23,7 @@ using namespace com::sun::star;
 
 namespace
 {
-const char* const DATA_DIRECTORY = "/xmlsecurity/qa/unit/pdfsigning/data/";
+char const DATA_DIRECTORY[] = "/xmlsecurity/qa/unit/pdfsigning/data/";
 }
 
 /// Testsuite for the PDF signing feature.

xmlsecurity/qa/unit/signing/signing.cxx

@@ -49,7 +49,7 @@ using namespace com::sun::star;
 
 namespace
 {
-const char* const DATA_DIRECTORY = "/xmlsecurity/qa/unit/signing/data/";
+char const DATA_DIRECTORY[] = "/xmlsecurity/qa/unit/signing/data/";
 }
 
 /// Testsuite for the document signing feature.