[Libreoffice-commits] core.git: sal/qa

[Stephan Bergmann (via logerrit)]

 sal/qa/osl/file/osl_File.cxx |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 8408aea46e36c3fad689ffe47668422f65025795
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Nov 27 10:09:43 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Nov 27 11:32:52 2019 +0100

    Fix some checkUNXBehaviour_getSystemPathFromFileURL tests
    
    Change-Id: I362d277d3ad2b2604107ddb6928c76ebec94efc3
    Reviewed-on: https://gerrit.libreoffice.org/83868
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 3811ab29d3e8..036f31b886a1 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -869,11 +869,9 @@ namespace osl_FileBase
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_51()
     {
-#if 0
         OString sURL("file://c:/tmp");
-        checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:/tmp"); // this is may be a BUG
+        checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
-#endif
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_52()
@@ -885,7 +883,6 @@ namespace osl_FileBase
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_53()
     {
-// is this a legal file path?
         OString sURL("file:///c|/tmp");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c|/tmp");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp");
@@ -908,7 +905,7 @@ namespace osl_FileBase
     void SystemPath_FileURL::getSystemPathFromFileURL_001_7()
     {
         OString sURL("file:///tmp/../second");
-        checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/../second"); // may be a BUG
+        checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/../second");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
     }
 
@@ -954,11 +951,9 @@ namespace osl_FileBase
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_92()
     {
-#if 0
         OString sURL("ca@#;+.,$///78no%01ni..name");
-        checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "");
+        checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
-#endif
     }
 
     // normal legal case