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

[Michael Meeks]

 sal/qa/osl/file/osl_File.cxx |   35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

New commits:
commit 33482731bf0dc8736112f703f14a059231091670
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Mon Mar 28 21:43:53 2016 +0100

    sal: re-enable most getSystemPathFromFileURL tests.
    
    Change-Id: If03ec4f8705b75b9d007078260ef8cca5155a8f3
    Reviewed-on: https://gerrit.libreoffice.org/23576
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 2890c5f..1efaf04 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -773,10 +773,11 @@ namespace osl_FileBase
     }
     void SystemPath_FileURL::getSystemPathFromFileURL_001_21()
     {
-      //        rtl::OString sURL("%2f");
-      rtl::OString sURL("%2F");
+#if 0
+        rtl::OString sURL("%2F");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/"); // LLA: this is may be a BUG
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
+#endif
     }
     void SystemPath_FileURL::getSystemPathFromFileURL_001_22()
     {
@@ -816,9 +817,11 @@ namespace osl_FileBase
     }
     void SystemPath_FileURL::getSystemPathFromFileURL_001_51()
     {
+#if 0
         rtl::OString sURL("file://c:/tmp");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:/tmp"); // LLA: this is may be a BUG
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
+#endif
     }
     void SystemPath_FileURL::getSystemPathFromFileURL_001_52()
     {
@@ -865,13 +868,15 @@ namespace osl_FileBase
     }
     void SystemPath_FileURL::getSystemPathFromFileURL_001_81()
     {
+#if 0
         rtl::OString sURL("file://~/tmp");
-    char* home_path;
-    home_path = getenv("HOME");
-    rtl::OString expResult(home_path);
-    expResult += "/tmp";
-    checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, expResult );
-    //  checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "\\tmp");
+        char* home_path;
+        home_path = getenv("HOME");
+        rtl::OString expResult(home_path);
+        expResult += "/tmp";
+        checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, expResult );
+//      checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "\\tmp");
+#endif
     }
     void SystemPath_FileURL::getSystemPathFromFileURL_001_9()
     {
@@ -888,9 +893,11 @@ namespace osl_FileBase
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_92()
     {
+#if 0
         rtl::OString sURL("ca@#;+.,$///78no%01ni..name");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
+#endif
     }
 
         //normal legal case
@@ -1219,12 +1226,14 @@ namespace osl_FileBase
         CPPUNIT_TEST_SUITE_END();
     };// class createTempFile
 
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getAbsoluteFileURL, "osl_FileBase" );
+// FIXME: remove the _disabled to enable:
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getAbsoluteFileURL, "osl_FileBase_disabled" );
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::SystemPath_FileURL, "osl_FileBase" );
-  //        CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getFileURLFromSystemPath, "osl_FileBase" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::searchFileURL, "osl_FileBase" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getTempDirURL, "osl_FileBase" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::createTempFile, "osl_FileBase" );
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::searchFileURL, "osl_FileBase_disabled" );
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getTempDirURL, "osl_FileBase_disabled" );
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::createTempFile, "osl_FileBase_disabled" );
+
+    CPPUNIT_REGISTRY_ADD_TO_DEFAULT( "osl_FileBase" );
 }// namespace osl_FileBase
 
 namespace osl_FileStatus