osl: final cleanup of sal_File.cxx unit test

Change-Id: I00201c5456904a537e349fa5e30be223b744fc5e

1 files changed, 2149 insertions, 2152 deletions

diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 5f358fd1d802..1471d4310c5b 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -39,38 +39,38 @@ using namespace osl;
 
 /** detailed wrong message.
 */
-inline OString errorToString( const FileBase::RC _nError )
+inline OString errorToString(const osl::FileBase::RC _nError)
 {
     OString sResult;
-    switch ( _nError ) {
-        case FileBase::E_None:
+    switch (_nError) {
+        case osl::FileBase::E_None:
             sResult = "Success";
             break;
-        case FileBase::E_PERM:
+        case osl::FileBase::E_PERM:
             sResult = "Operation not permitted";
             break;
-        case FileBase::E_NOENT:
+        case osl::FileBase::E_NOENT:
             sResult = "No such file or directory";
             break;
-        case FileBase::E_EXIST:
+        case osl::FileBase::E_EXIST:
             sResult = "Already Exist";
             break;
-        case FileBase::E_ACCES:
+        case osl::FileBase::E_ACCES:
             sResult = "Permission denied";
             break;
-        case FileBase::E_INVAL:
+        case osl::FileBase::E_INVAL:
             sResult = "The format of the parameters was not valid";
             break;
-        case FileBase::E_NOTDIR:
+        case osl::FileBase::E_NOTDIR:
             sResult = "Not a directory";
             break;
-        case FileBase::E_ISDIR:
+        case osl::FileBase::E_ISDIR:
             sResult = "Is a directory";
             break;
-        case FileBase::E_BADF:
+        case osl::FileBase::E_BADF:
             sResult = "Bad file";
             break;
-        case FileBase::E_NOTEMPTY:
+        case osl::FileBase::E_NOTEMPTY:
             sResult = "The directory is not empty";
             break;
         default:
@@ -80,9 +80,9 @@ inline OString errorToString( const FileBase::RC _nError )
     return sResult;
 }
 
-rtl::OString errorToStr( FileBase::RC const& nError)
+OString errorToStr(osl::FileBase::RC const& nError)
 {
-    rtl::OString suBuf;
+    OString suBuf;
     suBuf += "The returned error is: " ;
     suBuf += errorToString(nError);
     suBuf += "!\n";
@@ -93,13 +93,13 @@ rtl::OString errorToStr( FileBase::RC const& nError)
 */
 /* FIXME: the above assertion is bogus */
 
-#if ( defined UNX )                      // precision of time in Windows is better than UNX
+#if (defined UNX)                      // precision of time in Windows is better than UNX
 #   define delta 2000                    // time precision, 2000ms
 #else
 #   define delta 1800                    // time precision, 1.8s
 #endif
 
-inline bool t_compareTime( TimeValue *m_aEndTime,  TimeValue *m_aStartTime, sal_Int32 nDelta)
+inline bool t_compareTime(TimeValue *m_aEndTime,  TimeValue *m_aStartTime, sal_Int32 nDelta)
 {
     sal_Int32 nDeltaSeconds = m_aEndTime->Seconds - m_aStartTime->Seconds;
     sal_Int32 nDeltaNanoSec = sal_Int32(m_aEndTime->Nanosec) - sal_Int32(m_aStartTime->Nanosec);
@@ -110,12 +110,12 @@ inline bool t_compareTime( TimeValue *m_aEndTime,  TimeValue *m_aStartTime, sal_
     }
 
     sal_Int32 nDeltaMilliSec = (nDeltaSeconds * 1000) + (nDeltaNanoSec / 1000000);
-    return ( nDeltaMilliSec < nDelta );
+    return (nDeltaMilliSec < nDelta);
 }
 
 /** compare two OUString file name.
 */
-inline bool compareFileName( const OUString & ustr1, const OUString & ustr2 )
+inline bool compareFileName(const OUString & ustr1, const OUString & ustr2)
 {
     bool bOk;
 // on Windows, the separator is '\', so here change to '/', then compare
@@ -131,9 +131,9 @@ inline bool compareFileName( const OUString & ustr1, const OUString & ustr2 )
         ustr2new = ustr2.replace(reverseSlash,'/');
     else
         ustr2new = ustr2;
-    bOk = ustr1new.equalsIgnoreAsciiCase( ustr2new )  ;
+    bOk = ustr1new.equalsIgnoreAsciiCase(ustr2new);
 #else
-    bOk = ustr1.equalsIgnoreAsciiCase( ustr2 );
+    bOk = ustr1.equalsIgnoreAsciiCase(ustr2);
 #endif
     return bOk;
 }
@@ -141,42 +141,42 @@ inline bool compareFileName( const OUString & ustr1, const OUString & ustr2 )
 /** simple version to judge if a file name or directory name is a URL or a system path, just to see if it
     is start with "file:///";.
 */
-inline bool isURL( const OUString& pathname )
+inline bool isURL(const OUString& pathname)
 {
-    return pathname.startsWith( aPreURL );
+    return pathname.startsWith(aPreURL);
 }
 
 /** concat two part to form a URL or system path, add PATH_SEPARATOR between them if necessary, add "file:///" to beginning if necessary.
 */
-inline void concatURL( OUString & pathname1, const OUString & pathname2 )
+inline void concatURL(OUString & pathname1, const OUString & pathname2)
 {
     // check if pathname1 is full qualified URL;
-    if ( !isURL( pathname1 ) )
+    if (!isURL(pathname1))
     {
-        OUString     aPathName   = pathname1.copy( 0 );
-        FileBase::getFileURLFromSystemPath( pathname1, aPathName ); // convert if not full qualified URL
-        pathname1   = aPathName.copy( 0 );
+        OUString     aPathName   = pathname1.copy(0);
+        osl::FileBase::getFileURLFromSystemPath(pathname1, aPathName); // convert if not full qualified URL
+        pathname1   = aPathName.copy(0);
     }
 
     // check if '/' is in the end of pathname1 or at the begin of pathname2;
-    if ( !pathname1.endsWith( aSlashURL ) && !pathname2.startsWith( aSlashURL ) )
+    if (!pathname1.endsWith(aSlashURL) && !pathname2.startsWith(aSlashURL))
         pathname1 += aSlashURL;
     pathname1 += pathname2;
 }
 
 /** create a temp test file using OUString name of full qualified URL or system path.
 */
-inline void createTestFile( const OUString& filename )
+inline void createTestFile(const OUString& filename)
 {
-    OUString     aPathURL   = filename.copy( 0 );
-    FileBase::RC nError;
+    OUString     aPathURL   = filename.copy(0);
+    osl::FileBase::RC nError;
 
-    if ( !isURL( filename ) )
-        FileBase::getFileURLFromSystemPath( filename, aPathURL ); // convert if not full qualified URL
+    if (!isURL(filename))
+        osl::FileBase::getFileURLFromSystemPath(filename, aPathURL); // convert if not full qualified URL
 
     File aFile(aPathURL);
-    nError = aFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
-    if ( ( FileBase::E_None != nError ) && ( nError != FileBase::E_EXIST ))
+    nError = aFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
+    if ((osl::FileBase::E_None != nError) && (nError != osl::FileBase::E_EXIST))
         printf("createTestFile failed!\n");
 
     aFile.close();
@@ -185,93 +185,93 @@ inline void createTestFile( const OUString& filename )
 
 /** create a temp test file using OUString name of full qualified URL or system path in a base directory.
 */
-inline void createTestFile( const OUString& basename, const OUString& filename )
+inline void createTestFile(const OUString& basename, const OUString& filename)
 {
-    OUString aBaseURL = basename.copy( 0 );
+    OUString aBaseURL = basename.copy(0);
 
-    concatURL( aBaseURL, filename );
-    createTestFile( aBaseURL );
+    concatURL(aBaseURL, filename);
+    createTestFile(aBaseURL);
 }
 
 /** delete a temp test file using OUString name.
 */
-inline void deleteTestFile( const OUString& filename )
+inline void deleteTestFile(const OUString& filename)
 {
-    OUString     aPathURL   = filename.copy( 0 );
-    FileBase::RC nError;
+    OUString     aPathURL   = filename.copy(0);
+    osl::FileBase::RC nError;
 
-    if ( !isURL( filename ) )
-        FileBase::getFileURLFromSystemPath( filename, aPathURL ); // convert if not full qualified URL
+    if (!isURL(filename))
+        osl::FileBase::getFileURLFromSystemPath(filename, aPathURL); // convert if not full qualified URL
 
-    nError = File::setAttributes( aPathURL, osl_File_Attribute_GrpWrite| osl_File_Attribute_OwnWrite| osl_File_Attribute_OthWrite ); // if readonly, make writable.
-    CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: set writable ", ( FileBase::E_None == nError ) || ( FileBase::E_NOENT == nError ) );
+    nError = File::setAttributes(aPathURL, osl_File_Attribute_GrpWrite| osl_File_Attribute_OwnWrite| osl_File_Attribute_OthWrite); // if readonly, make writable.
+    CPPUNIT_ASSERT_MESSAGE("In deleteTestFile Function: set writable ", (osl::FileBase::E_None == nError) || (osl::FileBase::E_NOENT == nError));
 
-    nError = File::remove( aPathURL );
-    CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: remove ", ( FileBase::E_None == nError ) || ( nError == FileBase::E_NOENT ) );
+    nError = File::remove(aPathURL);
+    CPPUNIT_ASSERT_MESSAGE("In deleteTestFile Function: remove ", (osl::FileBase::E_None == nError) || (nError == osl::FileBase::E_NOENT));
 }
 
 /** delete a temp test file using OUString name of full qualified URL or system path in a base directory.
 */
-inline void deleteTestFile( const OUString& basename, const OUString& filename )
+inline void deleteTestFile(const OUString& basename, const OUString& filename)
 {
-    OUString aBaseURL   = basename.copy( 0 );
+    OUString aBaseURL   = basename.copy(0);
 
-    concatURL( aBaseURL, filename );
-    deleteTestFile( aBaseURL );
+    concatURL(aBaseURL, filename);
+    deleteTestFile(aBaseURL);
 }
 
 /** create a temp test directory using OUString name of full qualified URL or system path.
 */
-inline void createTestDirectory( const OUString& dirname )
+inline void createTestDirectory(const OUString& dirname)
 {
-    OUString aPathURL   = dirname.copy( 0 );
-    FileBase::RC nError;
+    OUString aPathURL   = dirname.copy(0);
+    osl::FileBase::RC nError;
 
-    if ( !isURL( dirname ) )
-        FileBase::getFileURLFromSystemPath( dirname, aPathURL ); // convert if not full qualified URL
-    nError = Directory::create( aPathURL );
-    if ( ( FileBase::E_None != nError ) && ( nError != FileBase::E_EXIST ))
+    if (!isURL(dirname))
+        osl::FileBase::getFileURLFromSystemPath(dirname, aPathURL); // convert if not full qualified URL
+    nError = Directory::create(aPathURL);
+    if ((osl::FileBase::E_None != nError) && (nError != osl::FileBase::E_EXIST))
         printf("createTestDirectory failed!\n");
 }
 
 /** create a temp test directory using OUString name of full qualified URL or system path in a base directory.
 */
-inline void createTestDirectory( const OUString& basename, const OUString& dirname )
+inline void createTestDirectory(const OUString& basename, const OUString& dirname)
 {
-    OUString aBaseURL   = basename.copy( 0 );
+    OUString aBaseURL   = basename.copy(0);
 
-    concatURL( aBaseURL, dirname );
-    createTestDirectory( aBaseURL );
+    concatURL(aBaseURL, dirname);
+    createTestDirectory(aBaseURL);
 }
 
 /** delete a temp test directory using OUString name of full qualified URL or system path.
 */
-inline void deleteTestDirectory( const OUString& dirname )
+inline void deleteTestDirectory(const OUString& dirname)
 {
-    OUString aPathURL = dirname.copy( 0 );
-    FileBase::RC nError;
-    if ( !isURL( dirname ) )
-        FileBase::getFileURLFromSystemPath( dirname, aPathURL ); // convert if not full qualified URL
+    OUString aPathURL = dirname.copy(0);
+    osl::FileBase::RC nError;
+    if (!isURL(dirname))
+        osl::FileBase::getFileURLFromSystemPath(dirname, aPathURL); // convert if not full qualified URL
 
-    Directory testDir( aPathURL );
-    if ( testDir.isOpen() )
+    Directory testDir(aPathURL);
+    if (testDir.isOpen())
         testDir.close();  // close if still open.
 
-    nError = Directory::remove( aPathURL );
+    nError = Directory::remove(aPathURL);
 
-    rtl::OString strError ("In deleteTestDirectory function: remove Directory ");
-    strError += OUStringToOString( aPathURL, RTL_TEXTENCODING_ASCII_US );
-    CPPUNIT_ASSERT_MESSAGE( strError.getStr(), ( FileBase::E_None == nError ) || ( nError == FileBase::E_NOENT ) );
+    OString strError ("In deleteTestDirectory function: remove Directory ");
+    strError += OUStringToOString(aPathURL, RTL_TEXTENCODING_ASCII_US);
+    CPPUNIT_ASSERT_MESSAGE(strError.getStr(), (osl::FileBase::E_None == nError) || (nError == osl::FileBase::E_NOENT));
 }
 
 /** delete a temp test directory using OUString name of full qualified URL or system path in a base directory.
 */
-inline void deleteTestDirectory( const OUString& basename, const OUString& dirname )
+inline void deleteTestDirectory(const OUString& basename, const OUString& dirname)
 {
-    OUString aBaseURL   = basename.copy( 0 );
+    OUString aBaseURL   = basename.copy(0);
 
-    concatURL( aBaseURL, dirname );
-    deleteTestDirectory( aBaseURL );
+    concatURL(aBaseURL, dirname);
+    deleteTestDirectory(aBaseURL);
 }
 
 /** Check for the file and directory access right.
@@ -283,63 +283,63 @@ enum class oslCheckMode {
 };
 
 // check if the file exist
-inline bool ifFileExist( const OUString & str )
+inline bool ifFileExist(const OUString & str)
 {
-    File testFile( str );
-    return ( osl::FileBase::E_None == testFile.open( osl_File_OpenFlag_Read ) );
+    File testFile(str);
+    return (osl::FileBase::E_None == testFile.open(osl_File_OpenFlag_Read));
 }
 
 // check if the file can be written
-inline bool ifFileCanWrite( const OUString & str )
+inline bool ifFileCanWrite(const OUString & str)
 {
     // on Windows, the file has no write right, but can be written
 #ifdef _WIN32
     bool  bCheckResult = false;
-    OUString  aUStr  = str.copy( 0 );
-    if ( isURL( str ) )
-        FileBase::getSystemPathFromFileURL( str, aUStr );
+    OUString  aUStr  = str.copy(0);
+    if (isURL(str))
+        osl::FileBase::getSystemPathFromFileURL(str, aUStr);
 
-    OString aString = OUStringToOString( aUStr, RTL_TEXTENCODING_ASCII_US );
+    OString aString = OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US);
     const char *path = aString.getStr();
-    if (( _access( path, 2 ) ) != -1 )
+    if ((_access(path, 2)) != -1)
          bCheckResult = sal_True;
      // on UNX, just test if open success with osl_File_OpenFlag_Write
 #else
-    File testFile( str );
-    bool bCheckResult = (osl::FileBase::E_None == testFile.open( osl_File_OpenFlag_Write ));
+    File testFile(str);
+    bool bCheckResult = (osl::FileBase::E_None == testFile.open(osl_File_OpenFlag_Write));
 #endif
     return bCheckResult;
 }
 
-inline bool checkDirectory( const OUString & str, oslCheckMode nCheckMode )
+inline bool checkDirectory(const OUString & str, oslCheckMode nCheckMode)
 {
-    rtl::OUString   aUString;
+    OUString   aUString;
     DirectoryItem   rItem;
-    FileBase::RC    rc;
+    osl::FileBase::RC rc;
     bool        bCheckResult= false;
 
-    Directory aDir( str );
+    Directory aDir(str);
     rc = aDir.open();
 
-    if ( ( FileBase::E_NOENT != rc ) && ( FileBase::E_ACCES != rc ) )
+    if ((osl::FileBase::E_NOENT != rc) && (osl::FileBase::E_ACCES != rc))
     {
-        switch ( nCheckMode )
+        switch (nCheckMode)
         {
             case oslCheckMode::OpenAccess:
-                if ( rc == FileBase::E_None )
+                if (rc == osl::FileBase::E_None)
                     bCheckResult = true;
                 break;
             case oslCheckMode::ReadAccess:
-                rc = aDir.getNextItem( rItem );
-                bCheckResult = ( rc == FileBase::E_None ) || ( rc == FileBase::E_NOENT );
+                rc = aDir.getNextItem(rItem);
+                bCheckResult = (rc == osl::FileBase::E_None) || (rc == osl::FileBase::E_NOENT);
                 break;
             case oslCheckMode::WriteAccess:
-                ( ( aUString += str ) += aSlashURL ) += aTmpName2;
-                if ( ( rc = Directory::create( aUString ) ) == FileBase::E_None )
+                ((aUString += str) += aSlashURL) += aTmpName2;
+                if ((rc = Directory::create(aUString)) == osl::FileBase::E_None)
                 {
                     bCheckResult = true;
-                    rc = Directory::remove( aUString );
-                    CPPUNIT_ASSERT_EQUAL( FileBase::E_None, rc );
+                    rc = Directory::remove(aUString);
+                    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, rc);
                 }
                 else
                     bCheckResult = false;
@@ -350,7 +350,7 @@ inline bool checkDirectory( const OUString & str, oslCheckMode nCheckMode )
         }
 
         rc = aDir.close();
-        CPPUNIT_ASSERT_EQUAL( FileBase::E_None, rc );
+        CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, rc);
     }
 
     return bCheckResult;
@@ -358,10 +358,10 @@ inline bool checkDirectory( const OUString & str, oslCheckMode nCheckMode )
 
 /** construct error message
 */
-inline OString outputError( const OString & returnVal, const OString & rightVal, const sal_Char * msg = "")
+inline OString outputError(const OString & returnVal, const OString & rightVal, const sal_Char * msg = "")
 {
     OString aString;
-    if ( returnVal.equals( rightVal ) )
+    if (returnVal.equals(rightVal))
         return aString;
 
     aString += msg;
@@ -375,21 +375,21 @@ inline OString outputError( const OString & returnVal, const OString & rightVal,
 
 /** Change file mode, two version in UNIX and Windows;.
 */
-#if ( defined UNX )         // chmod() method is differ in Windows
-inline void changeFileMode( OUString & filepath, sal_Int32 mode )
+#if (defined UNX)         // chmod() method is differ in Windows
+inline void changeFileMode(OUString & filepath, sal_Int32 mode)
 {
-    rtl::OString aString;
-    rtl::OUString aUStr = filepath.copy( 0 );
+    OString aString;
+    OUString aUStr = filepath.copy(0);
 
-    if ( isURL( filepath ) )
-        FileBase::getSystemPathFromFileURL( filepath, aUStr );
+    if (isURL(filepath))
+        osl::FileBase::getSystemPathFromFileURL(filepath, aUStr);
 
-    aString = OUStringToOString( aUStr, RTL_TEXTENCODING_ASCII_US );
-    int ret = chmod( aString.getStr(), mode );
+    aString = OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US);
+    int ret = chmod(aString.getStr(), mode);
     CPPUNIT_ASSERT_EQUAL(0, ret);
 }
 #else                                          // Windows version
-inline void changeFileMode( OUString & filepath, sal_Int32 mode )
+inline void changeFileMode(OUString & filepath, sal_Int32 mode)
 {
     (void)filepath;
     (void)mode;
@@ -399,21 +399,19 @@ inline void changeFileMode( OUString & filepath, sal_Int32 mode )
 
 inline OUString getCurrentPID();
 
-// Beginning of the test cases for FileBase class
+// Beginning of the test cases for osl::FileBase class
 
 namespace osl_FileBase
 {
-
     // testing the method
-    // static inline RC getAbsoluteFileURL( const OUString& ustrBaseDirectoryURL,
+    // static inline RC getAbsoluteFileURL(const OUString& ustrBaseDirectoryURL,
     //                                      const OUString& ustrRelativeFileURL,
-    //                                      OUString& ustrAbsoluteFileURL )
+    //                                      OUString& ustrAbsoluteFileURL)
 
-    class getAbsoluteFileURL:public CppUnit::TestFixture
+    class getAbsoluteFileURL : public CppUnit::TestFixture
     {
     public:
-
-        void check_getAbsoluteFileURL( rtl::OUString const& _suBaseURL,  rtl::OString const& _sRelativeURL, FileBase::RC _nAssumeError, rtl::OUString const& _suAssumeResultStr );
+        void check_getAbsoluteFileURL(OUString const& _suBaseURL,  OString const& _sRelativeURL, osl::FileBase::RC _nAssumeError, OUString const& _suAssumeResultStr);
 
         void getAbsoluteFileURL_001_1();
         void getAbsoluteFileURL_001_2();
@@ -427,120 +425,120 @@ namespace osl_FileBase
         void getAbsoluteFileURL_003();
         void getAbsoluteFileURL_004();
 
-        CPPUNIT_TEST_SUITE( getAbsoluteFileURL );
-            CPPUNIT_TEST( getAbsoluteFileURL_001_1 );
-            CPPUNIT_TEST( getAbsoluteFileURL_001_2 );
-            CPPUNIT_TEST( getAbsoluteFileURL_001_3 );
-            CPPUNIT_TEST( getAbsoluteFileURL_001_4 );
-            CPPUNIT_TEST( getAbsoluteFileURL_001_5 );
-            CPPUNIT_TEST( getAbsoluteFileURL_001_6 );
-            CPPUNIT_TEST( getAbsoluteFileURL_001_7 );
-            CPPUNIT_TEST( getAbsoluteFileURL_001_8 );
-            CPPUNIT_TEST( getAbsoluteFileURL_002 );
-            CPPUNIT_TEST( getAbsoluteFileURL_003 );
-            CPPUNIT_TEST( getAbsoluteFileURL_004 );
+        CPPUNIT_TEST_SUITE(getAbsoluteFileURL);
+                CPPUNIT_TEST(getAbsoluteFileURL_001_1);
+                CPPUNIT_TEST(getAbsoluteFileURL_001_2);
+                CPPUNIT_TEST(getAbsoluteFileURL_001_3);
+                CPPUNIT_TEST(getAbsoluteFileURL_001_4);
+                CPPUNIT_TEST(getAbsoluteFileURL_001_5);
+                CPPUNIT_TEST(getAbsoluteFileURL_001_6);
+                CPPUNIT_TEST(getAbsoluteFileURL_001_7);
+                CPPUNIT_TEST(getAbsoluteFileURL_001_8);
+                CPPUNIT_TEST(getAbsoluteFileURL_002);
+                CPPUNIT_TEST(getAbsoluteFileURL_003);
+                CPPUNIT_TEST(getAbsoluteFileURL_004);
         CPPUNIT_TEST_SUITE_END();
     };
 
-    void getAbsoluteFileURL::check_getAbsoluteFileURL( rtl::OUString const& _suBaseURL,  rtl::OString const& _sRelativeURL, FileBase::RC _nAssumeError, rtl::OUString const& _suAssumeResultStr )
+    void getAbsoluteFileURL::check_getAbsoluteFileURL(OUString const& _suBaseURL,  OString const& _sRelativeURL, osl::FileBase::RC _nAssumeError, OUString const& _suAssumeResultStr)
     {
-        rtl::OUString suRelativeURL = rtl::OStringToOUString(_sRelativeURL, RTL_TEXTENCODING_UTF8);
-        rtl::OString sBaseURL = rtl::OUStringToOString(_suBaseURL, RTL_TEXTENCODING_UTF8);
-        rtl::OUString suResultURL;
-        osl::FileBase::RC nError = FileBase::getAbsoluteFileURL( _suBaseURL,  suRelativeURL, suResultURL );
-        rtl::OString sResultURL = rtl::OUStringToOString( suResultURL, RTL_TEXTENCODING_UTF8);
-        rtl::OString sError = errorToString(nError);
-        printf("getAbsoluteFileURL('%s','%s') deliver absolute URL: '%s', error '%s'\n", sBaseURL.getStr(), _sRelativeURL.getStr(),sResultURL.getStr(), sError.getStr() );
-        CPPUNIT_ASSERT_EQUAL_MESSAGE( "Assumption is wrong: error number is wrong", _nAssumeError, nError );
-        if ( nError == FileBase::E_None )
-        {
-            bool bStrAreEqual = _suAssumeResultStr.equals( suResultURL );
-            CPPUNIT_ASSERT_MESSAGE( "Assumption is wrong: ResultURL is not equal to expected URL ", bStrAreEqual );
+        OUString suRelativeURL = OStringToOUString(_sRelativeURL, RTL_TEXTENCODING_UTF8);
+        OString sBaseURL = OUStringToOString(_suBaseURL, RTL_TEXTENCODING_UTF8);
+        OUString suResultURL;
+        osl::FileBase::RC nError = osl::FileBase::getAbsoluteFileURL(_suBaseURL,  suRelativeURL, suResultURL);
+        OString sResultURL = OUStringToOString(suResultURL, RTL_TEXTENCODING_UTF8);
+        OString sError = errorToString(nError);
+        printf("getAbsoluteFileURL('%s','%s') deliver absolute URL: '%s', error '%s'\n", sBaseURL.getStr(), _sRelativeURL.getStr(),sResultURL.getStr(), sError.getStr());
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Assumption is wrong: error number is wrong", _nAssumeError, nError);
+        if (nError == osl::FileBase::E_None)
+        {
+            bool bStrAreEqual = _suAssumeResultStr.equals(suResultURL);
+            CPPUNIT_ASSERT_MESSAGE("Assumption is wrong: ResultURL is not equal to expected URL ", bStrAreEqual);
         }
     }
 
     void getAbsoluteFileURL::getAbsoluteFileURL_001_1()
     {
-        rtl::OUString suAssume = aUserDirectoryURL.concat( "/relative/file1" );
-        check_getAbsoluteFileURL( aUserDirectoryURL, "relative/file1",FileBase::E_None, suAssume );
+        OUString suAssume = aUserDirectoryURL.concat("/relative/file1");
+        check_getAbsoluteFileURL(aUserDirectoryURL, "relative/file1",osl::FileBase::E_None, suAssume);
     }
 
     void getAbsoluteFileURL::getAbsoluteFileURL_001_2()
     {
-        rtl::OUString suAssume = aUserDirectoryURL.concat( "/relative/file2" );
-        check_getAbsoluteFileURL( aUserDirectoryURL, "relative/./file2",FileBase::E_None, suAssume );
+        OUString suAssume = aUserDirectoryURL.concat("/relative/file2");
+        check_getAbsoluteFileURL(aUserDirectoryURL, "relative/./file2",osl::FileBase::E_None, suAssume);
     }
 
     void getAbsoluteFileURL::getAbsoluteFileURL_001_3()
     {
-        rtl::OUString suAssume = aUserDirectoryURL.concat( "/file3" );
-        check_getAbsoluteFileURL( aUserDirectoryURL, "relative/../file3",FileBase::E_None, suAssume );
+        OUString suAssume = aUserDirectoryURL.concat("/file3");
+        check_getAbsoluteFileURL(aUserDirectoryURL, "relative/../file3",osl::FileBase::E_None, suAssume);
     }
 
     void getAbsoluteFileURL::getAbsoluteFileURL_001_4()
     {
-        rtl::OUString suAssume = aUserDirectoryURL.concat( "/file4" );
-        check_getAbsoluteFileURL( aUserDirectoryURL, "././relative/../file4",FileBase::E_None, suAssume );
+        OUString suAssume = aUserDirectoryURL.concat("/file4");
+        check_getAbsoluteFileURL(aUserDirectoryURL, "././relative/../file4",osl::FileBase::E_None, suAssume);
     }
 
     void getAbsoluteFileURL::getAbsoluteFileURL_001_5()
     {
-        rtl::OUString suAssume;
-#if ( defined UNX )
-        suAssume = aUserDirectoryURL.concat( "/relative/" );
+        OUString suAssume;
+#if (defined UNX)
+        suAssume = aUserDirectoryURL.concat("/relative/");
 #else
-        suAssume = aUserDirectoryURL.concat( rtl::OUString("/relative") );
+        suAssume = aUserDirectoryURL.concat(OUString("/relative"));
 #endif
-        check_getAbsoluteFileURL( aUserDirectoryURL, "././relative/.",FileBase::E_None, suAssume );
+        check_getAbsoluteFileURL(aUserDirectoryURL, "././relative/.",osl::FileBase::E_None, suAssume);
     }
 
     void getAbsoluteFileURL::getAbsoluteFileURL_001_6()
     {
-        rtl::OUString suAssume = aUserDirectoryURL.concat( "/.relative" );
-        check_getAbsoluteFileURL( aUserDirectoryURL, "./.relative",FileBase::E_None, suAssume );
+        OUString suAssume = aUserDirectoryURL.concat("/.relative");
+        check_getAbsoluteFileURL(aUserDirectoryURL, "./.relative",osl::FileBase::E_None, suAssume);
     }
 
     void getAbsoluteFileURL::getAbsoluteFileURL_001_7()
     {
-        rtl::OUString suAssume;
-#if (defined UNX )
-        suAssume = aUserDirectoryURL.concat( "/.a/" );
+        OUString suAssume;
+#if (defined UNX)
+        suAssume = aUserDirectoryURL.concat("/.a/");
 #else // windows
-        suAssume = aUserDirectoryURL.concat( rtl::OUString("/.a") );
+        suAssume = aUserDirectoryURL.concat(OUString("/.a"));
 #endif
-        check_getAbsoluteFileURL( aUserDirectoryURL, "./.a/mydir/..",FileBase::E_None, suAssume );
+        check_getAbsoluteFileURL(aUserDirectoryURL, "./.a/mydir/..",osl::FileBase::E_None, suAssume);
     }
 
     void getAbsoluteFileURL::getAbsoluteFileURL_001_8()
     {
-        rtl::OUString suAssume = aUserDirectoryURL.concat( "/tmp/ok" );
-#if ( defined UNX )
-        check_getAbsoluteFileURL( aUserDirectoryURL, "tmp//ok",FileBase::E_None, suAssume );
+        OUString suAssume = aUserDirectoryURL.concat("/tmp/ok");
+#if (defined UNX)
+        check_getAbsoluteFileURL(aUserDirectoryURL, "tmp//ok",osl::FileBase::E_None, suAssume);
 #else
-        check_getAbsoluteFileURL( aUserDirectoryURL, "tmp//ok",FileBase::E_INVAL, suAssume );
+        check_getAbsoluteFileURL(aUserDirectoryURL, "tmp//ok",osl::FileBase::E_INVAL, suAssume);
 #endif
     }
 
     void getAbsoluteFileURL::getAbsoluteFileURL_002()
     {
-#if ( defined UNX )     // Link is not defined in Windows
-        OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
+#if (defined UNX)     // Link is not defined in Windows
+        OUString aUStr_LnkFileSys(aTempDirectorySys), aUStr_SrcFileSys(aTempDirectorySys);
         aUStr_LnkFileSys += aSlashURL + getCurrentPID() + "/link.file";
         aUStr_SrcFileSys += aSlashURL + getCurrentPID() + "/canonical.name";
 
-        rtl::OString strLinkFileName, strSrcFileName;
-        strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
-        strSrcFileName =  OUStringToOString( aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US );
-
-        createTestFile( aCanURL1 );
-        sal_Int32 fd = symlink( strSrcFileName.getStr(), strLinkFileName.getStr() );
-        CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(0), fd );
-        rtl::OString sLnkURL = OUStringToOString( aLnkURL1, RTL_TEXTENCODING_ASCII_US );
-        rtl::OUString suAssume = aUserDirectoryURL.concat( "/canonical.name" );
-        check_getAbsoluteFileURL( aUserDirectoryURL, sLnkURL, FileBase::E_None, suAssume );
-        deleteTestFile( aCanURL1 );
-        fd = remove( strLinkFileName.getStr() );
-        CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(0), fd );
+        OString strLinkFileName, strSrcFileName;
+        strLinkFileName = OUStringToOString(aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US);
+        strSrcFileName =  OUStringToOString(aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US);
+
+        createTestFile(aCanURL1);
+        sal_Int32 fd = symlink(strSrcFileName.getStr(), strLinkFileName.getStr());
+        CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), fd);
+        OString sLnkURL = OUStringToOString(aLnkURL1, RTL_TEXTENCODING_ASCII_US);
+        OUString suAssume = aUserDirectoryURL.concat("/canonical.name");
+        check_getAbsoluteFileURL(aUserDirectoryURL, sLnkURL, osl::FileBase::E_None, suAssume);
+        deleteTestFile(aCanURL1);
+        fd = remove(strLinkFileName.getStr());
+        CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), fd);
 #endif
     }
 
@@ -553,33 +551,33 @@ namespace osl_FileBase
     {
         // create two level directories under $Temp/PID/
         OUString aUStrUpBase = aUserDirectoryURL + "/test1";
-        createTestDirectory( aUStrUpBase );
+        createTestDirectory(aUStrUpBase);
         OUString aUStrBase = aUserDirectoryURL + "/test1/dir1";
-        createTestDirectory( aUStrBase );
+        createTestDirectory(aUStrBase);
 
-        OUString suAssume = aUserDirectoryURL.concat( "/mytestfile" );
-        check_getAbsoluteFileURL( aUStrBase, "../../mytestfile" , FileBase::E_None, suAssume );
-        deleteTestDirectory( aUStrBase );
-        deleteTestDirectory( aUStrUpBase );
+        OUString suAssume = aUserDirectoryURL.concat("/mytestfile");
+        check_getAbsoluteFileURL(aUStrBase, "../../mytestfile" , osl::FileBase::E_None, suAssume);
+        deleteTestDirectory(aUStrBase);
+        deleteTestDirectory(aUStrUpBase);
     }
 
     // testing two methods:
-    // static inline RC getSystemPathFromFileURL( const OUString& ustrFileURL,
-    //                OUString& ustrSystemPath )
-    // static RC getFileURLFromSystemPath( const OUString & ustrSystemPath,
-    //                OUString & ustrFileURL );
+    // static inline RC getSystemPathFromFileURL(const OUString& ustrFileURL,
+    //                OUString& ustrSystemPath)
+    // static RC getFileURLFromSystemPath(const OUString & ustrSystemPath,
+    //                OUString & ustrFileURL);
 
-    class SystemPath_FileURL:public CppUnit::TestFixture
+    class SystemPath_FileURL : public CppUnit::TestFixture
     {
     private:
-        void check_SystemPath_FileURL(rtl::OString const& _sSource, FileBase::RC _nAssumeError, rtl::OString const& _sAssumeResultStr, bool bDirection = true );
-        void checkWNTBehaviour_getSystemPathFromFileURL(rtl::OString const& _sURL, FileBase::RC _nAssumeError, rtl::OString const& _sWNTAssumeResultString );
-        void checkUNXBehaviour_getSystemPathFromFileURL(rtl::OString const& _sURL, FileBase::RC _nAssumeError, rtl::OString const& _sUnixAssumeResultString );
-        void checkWNTBehaviour_getFileURLFromSystemPath(rtl::OString const& _sSysPath, FileBase::RC _nAssumeError, rtl::OString const& _sWNTAssumeResultString);
-        void checkUNXBehaviour_getFileURLFromSystemPath(rtl::OString const& _sSysPath, FileBase::RC _nAssumeError, rtl::OString const& _sUnixAssumeResultString);
+        void check_SystemPath_FileURL(OString const& _sSource, osl::FileBase::RC _nAssumeError, OString const& _sAssumeResultStr, bool bDirection = true);
+        void checkWNTBehaviour_getSystemPathFromFileURL(OString const& _sURL, osl::FileBase::RC _nAssumeError, OString const& _sWNTAssumeResultString);
+        void checkUNXBehaviour_getSystemPathFromFileURL(OString const& _sURL, osl::FileBase::RC _nAssumeError, OString const& _sUnixAssumeResultString);
+        void checkWNTBehaviour_getFileURLFromSystemPath(OString const& _sSysPath, osl::FileBase::RC _nAssumeError, OString const& _sWNTAssumeResultString);
+        void checkUNXBehaviour_getFileURLFromSystemPath(OString const& _sSysPath, osl::FileBase::RC _nAssumeError, OString const& _sUnixAssumeResultString);
 
     public:
-        // test code.
+
         void getSystemPathFromFileURL_001_1();
         void getSystemPathFromFileURL_001_2();
         void getSystemPathFromFileURL_001_21();
@@ -611,78 +609,78 @@ namespace osl_FileBase
         void getFileURLFromSystemPath_004();
         void getFileURLFromSystemPath_005();
 
-        CPPUNIT_TEST_SUITE( SystemPath_FileURL );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_1 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_2 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_21 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_22 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_3 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_31 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_4 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_41 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_5 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_51 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_52 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_53 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_6 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_61 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_7 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_71 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_8 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_81 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_9 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_91 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_001_92 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_004 );
-            CPPUNIT_TEST( getSystemPathFromFileURL_005 );
-            CPPUNIT_TEST( getFileURLFromSystemPath_001 );
-            CPPUNIT_TEST( getFileURLFromSystemPath_002 );
-            CPPUNIT_TEST( getFileURLFromSystemPath_003 );
-            CPPUNIT_TEST( getFileURLFromSystemPath_004 );
-            CPPUNIT_TEST( getFileURLFromSystemPath_005 );
+        CPPUNIT_TEST_SUITE(SystemPath_FileURL);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_1);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_2);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_21);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_22);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_3);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_31);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_4);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_41);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_5);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_51);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_52);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_53);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_6);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_61);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_7);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_71);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_8);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_81);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_9);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_91);
+            CPPUNIT_TEST(getSystemPathFromFileURL_001_92);
+            CPPUNIT_TEST(getSystemPathFromFileURL_004);
+            CPPUNIT_TEST(getSystemPathFromFileURL_005);
+            CPPUNIT_TEST(getFileURLFromSystemPath_001);
+            CPPUNIT_TEST(getFileURLFromSystemPath_002);
+            CPPUNIT_TEST(getFileURLFromSystemPath_003);
+            CPPUNIT_TEST(getFileURLFromSystemPath_004);
+            CPPUNIT_TEST(getFileURLFromSystemPath_005);
         CPPUNIT_TEST_SUITE_END();
     };
 
     // if bDirection==sal_True, check getSystemPathFromFileURL
     // if bDirection==sal_False, check getFileURLFromSystemPath
-    void SystemPath_FileURL::check_SystemPath_FileURL(rtl::OString const& _sSource, FileBase::RC _nAssumeError, rtl::OString const& _sAssumeResultStr, bool bDirection)
+    void SystemPath_FileURL::check_SystemPath_FileURL(OString const& _sSource, osl::FileBase::RC _nAssumeError, OString const& _sAssumeResultStr, bool bDirection)
     {
         // PRE: URL as String
-        rtl::OUString suSource;
-        rtl::OUString suStr;
-        suSource = rtl::OStringToOUString(_sSource, RTL_TEXTENCODING_UTF8);
-        FileBase::RC nError;
+        OUString suSource;
+        OUString suStr;
+        suSource = OStringToOUString(_sSource, RTL_TEXTENCODING_UTF8);
+        osl::FileBase::RC nError;
 
-        if ( bDirection )
-            nError = osl::FileBase::getSystemPathFromFileURL( suSource, suStr );
+        if (bDirection)
+            nError = osl::FileBase::getSystemPathFromFileURL(suSource, suStr);
         else
-            nError = osl::FileBase::getFileURLFromSystemPath( suSource, suStr );
+            nError = osl::FileBase::getFileURLFromSystemPath(suSource, suStr);
 
         // if the given string is gt length 0,
         // we check also this string
-        rtl::OString sStr = rtl::OUStringToOString(suStr, RTL_TEXTENCODING_UTF8);
-        rtl::OString sError = errorToString(nError);
+        OString sStr = OUStringToOString(suStr, RTL_TEXTENCODING_UTF8);
+        OString sError = errorToString(nError);
 
-        if ( bDirection )
-            printf("getSystemPathFromFileURL('%s') deliver system path: '%s', error '%s'\n", _sSource.getStr(), sStr.getStr(), sError.getStr() );
+        if (bDirection)
+            printf("getSystemPathFromFileURL('%s') deliver system path: '%s', error '%s'\n", _sSource.getStr(), sStr.getStr(), sError.getStr());
         else
-            printf("getFileURLFromSystemPath('%s') deliver File URL: '%s', error '%s'\n", _sSource.getStr(), sStr.getStr(), sError.getStr() );
+            printf("getFileURLFromSystemPath('%s') deliver File URL: '%s', error '%s'\n", _sSource.getStr(), sStr.getStr(), sError.getStr());
 
         if (!_sAssumeResultStr.isEmpty())
         {
             bool bStrAreEqual = _sAssumeResultStr.equals(sStr);
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Assumption is wrong",
-                                    _nAssumeError, nError );
-            CPPUNIT_ASSERT_MESSAGE( "Assumption is wrong",
-                                    bStrAreEqual );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("Assumption is wrong",
+                                    _nAssumeError, nError);
+            CPPUNIT_ASSERT_MESSAGE("Assumption is wrong",
+                                    bStrAreEqual);
         }
         else
         {
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "Assumption is wrong", _nAssumeError, nError );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("Assumption is wrong", _nAssumeError, nError);
         }
     }
 
-    void SystemPath_FileURL::checkWNTBehaviour_getSystemPathFromFileURL(rtl::OString const& _sURL, FileBase::RC _nAssumeError, rtl::OString const& _sWNTAssumeResultString)
+    void SystemPath_FileURL::checkWNTBehaviour_getSystemPathFromFileURL(OString const& _sURL, osl::FileBase::RC _nAssumeError, OString const& _sWNTAssumeResultString)
     {
 #if defined(_WIN32)
         check_SystemPath_FileURL(_sURL, _nAssumeError, _sWNTAssumeResultString);
@@ -693,9 +691,9 @@ namespace osl_FileBase
 #endif
     }
 
-    void SystemPath_FileURL::checkUNXBehaviour_getSystemPathFromFileURL(rtl::OString const& _sURL, FileBase::RC _nAssumeError, rtl::OString const& _sUnixAssumeResultString)
+    void SystemPath_FileURL::checkUNXBehaviour_getSystemPathFromFileURL(OString const& _sURL, osl::FileBase::RC _nAssumeError, OString const& _sUnixAssumeResultString)
     {
-#if ( defined UNX )
+#if (defined UNX)
         check_SystemPath_FileURL(_sURL, _nAssumeError, _sUnixAssumeResultString);
 #else
         (void)_sURL;
@@ -704,10 +702,10 @@ namespace osl_FileBase
 #endif
     }
 
-    void SystemPath_FileURL::checkWNTBehaviour_getFileURLFromSystemPath(rtl::OString const& _sSysPath, FileBase::RC _nAssumeError, rtl::OString const& _sWNTAssumeResultString)
+    void SystemPath_FileURL::checkWNTBehaviour_getFileURLFromSystemPath(OString const& _sSysPath, osl::FileBase::RC _nAssumeError, OString const& _sWNTAssumeResultString)
     {
 #if defined(_WIN32)
-        check_SystemPath_FileURL(_sSysPath, _nAssumeError, _sWNTAssumeResultString, sal_False );
+        check_SystemPath_FileURL(_sSysPath, _nAssumeError, _sWNTAssumeResultString, sal_False);
 #else
         (void)_sSysPath;
         (void)_nAssumeError;
@@ -715,10 +713,10 @@ namespace osl_FileBase
 #endif
     }
 
-    void SystemPath_FileURL::checkUNXBehaviour_getFileURLFromSystemPath(rtl::OString const& _sSysPath, FileBase::RC _nAssumeError, rtl::OString const& _sUnixAssumeResultString)
+    void SystemPath_FileURL::checkUNXBehaviour_getFileURLFromSystemPath(OString const& _sSysPath, osl::FileBase::RC _nAssumeError, OString const& _sUnixAssumeResultString)
     {
-#if ( defined UNX )
-        check_SystemPath_FileURL(_sSysPath, _nAssumeError, _sUnixAssumeResultString, false );
+#if (defined UNX)
+        check_SystemPath_FileURL(_sSysPath, _nAssumeError, _sUnixAssumeResultString, false);
 #else
         (void)_sSysPath;
         (void)_nAssumeError;
@@ -737,14 +735,14 @@ namespace osl_FileBase
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_1()
     {
-        rtl::OString sURL("");
+        OString sURL("");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_2()
     {
-        rtl::OString sURL("/");
+        OString sURL("/");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "\\");
     }
@@ -752,7 +750,7 @@ namespace osl_FileBase
     void SystemPath_FileURL::getSystemPathFromFileURL_001_21()
     {
 #if 0
-        rtl::OString sURL("%2F");
+        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
@@ -760,42 +758,42 @@ namespace osl_FileBase
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_22()
     {
-        rtl::OString sURL("file:///tmp%2Fmydir");
+        OString sURL("file:///tmp%2Fmydir");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_3()
     {
-        rtl::OString sURL("a");
+        OString sURL("a");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "a");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "a");
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_31()
     {
-        rtl::OString sURL("tmpname");
+        OString sURL("tmpname");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "tmpname");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "tmpname");
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_4()
     {
-        rtl::OString sURL("file://");
+        OString sURL("file://");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_41()
     {
-        rtl::OString sURL("file://localhost/tmp");
+        OString sURL("file://localhost/tmp");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_5()
     {
-        rtl::OString sURL("file:///tmp");
+        OString sURL("file:///tmp");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
     }
@@ -803,7 +801,7 @@ namespace osl_FileBase
     void SystemPath_FileURL::getSystemPathFromFileURL_001_51()
     {
 #if 0
-        rtl::OString sURL("file://c:/tmp");
+        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
@@ -811,7 +809,7 @@ namespace osl_FileBase
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_52()
     {
-        rtl::OString sURL("file:///c:/tmp");
+        OString sURL("file:///c:/tmp");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp");
     }
@@ -819,42 +817,42 @@ namespace osl_FileBase
     void SystemPath_FileURL::getSystemPathFromFileURL_001_53()
     {
 // LLA: is this a legal file path?
-        rtl::OString sURL("file:///c|/tmp");
+        OString sURL("file:///c|/tmp");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c|/tmp");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp");
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_6()
     {
-        rtl::OString sURL("file:///tmp/first");
+        OString sURL("file:///tmp/first");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/first");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_61()
     {
-        rtl::OString sURL("file:///c:/tmp/first");
+        OString sURL("file:///c:/tmp/first");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp/first");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp\\first");
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_7()
     {
-        rtl::OString sURL("file:///tmp/../second");
+        OString sURL("file:///tmp/../second");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/../second"); // LLA: may be a BUG
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_71()
     {
-        rtl::OString sURL("file:///c:/tmp/../second");
+        OString sURL("file:///c:/tmp/../second");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp/../second");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp\\..\\second");
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_8()
     {
-        rtl::OString sURL("../tmp");
+        OString sURL("../tmp");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "../tmp");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "..\\tmp");
     }
@@ -862,25 +860,25 @@ namespace osl_FileBase
     void SystemPath_FileURL::getSystemPathFromFileURL_001_81()
     {
 #if 0
-        rtl::OString sURL("file://~/tmp");
+        OString sURL("file://~/tmp");
         char* home_path;
         home_path = getenv("HOME");
-        rtl::OString expResult(home_path);
+        OString expResult(home_path);
         expResult += "/tmp";
-        checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, expResult );
+        checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, expResult);
 #endif
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_9()
     {
-        rtl::OString sURL("file:///tmp/first%20second");
+        OString sURL("file:///tmp/first%20second");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/first second");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
     }
 
     void SystemPath_FileURL::getSystemPathFromFileURL_001_91()
     {
-        rtl::OString sURL("file:///c:/tmp/first%20second");
+        OString sURL("file:///c:/tmp/first%20second");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp/first second");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp\\first second");
     }
@@ -888,7 +886,7 @@ namespace osl_FileBase
     void SystemPath_FileURL::getSystemPathFromFileURL_001_92()
     {
 #if 0
-        rtl::OString sURL("ca@#;+.,$///78no%01ni..name");
+        OString sURL("ca@#;+.,$///78no%01ni..name");
         checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "");
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
 #endif
@@ -898,20 +896,20 @@ namespace osl_FileBase
     void SystemPath_FileURL::getSystemPathFromFileURL_004()
     {
         OUString aUStr;
-        OUString aUNormalURL( aTmpName6 );
-        OUString aUResultURL ( aSysPath4 );
-        FileBase::RC nError = osl::FileBase::getSystemPathFromFileURL( aUNormalURL, aUStr );
+        OUString aUNormalURL(aTmpName6);
+        OUString aUResultURL (aSysPath4);
+        osl::FileBase::RC nError = osl::FileBase::getSystemPathFromFileURL(aUNormalURL, aUStr);
 
-        bool bOk = compareFileName( aUStr, aUResultURL );
+        bool bOk = compareFileName(aUStr, aUResultURL);
 
         OString sError("test for getSystemPathFromFileURL(' ");
-        sError += OUStringToOString( aUNormalURL, RTL_TEXTENCODING_ASCII_US );
+        sError += OUStringToOString(aUNormalURL, RTL_TEXTENCODING_ASCII_US);
         sError += " ') function:use an absolute file URL, ";
-        sError += outputError(OUStringToOString( aUStr, RTL_TEXTENCODING_ASCII_US ),
-                            OUStringToOString( aUResultURL, RTL_TEXTENCODING_ASCII_US ));
+        sError += outputError(OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US),
+                            OUStringToOString(aUResultURL, RTL_TEXTENCODING_ASCII_US));
 
-        CPPUNIT_ASSERT_EQUAL_MESSAGE(sError.getStr(), osl::FileBase::E_None, nError );
-        CPPUNIT_ASSERT_MESSAGE(sError.getStr(), bOk );
+        CPPUNIT_ASSERT_EQUAL_MESSAGE(sError.getStr(), osl::FileBase::E_None, nError);
+        CPPUNIT_ASSERT_MESSAGE(sError.getStr(), bOk);
 
     }
 
@@ -919,222 +917,224 @@ namespace osl_FileBase
     void SystemPath_FileURL::getSystemPathFromFileURL_005()
     {
         OUString aUStr;
-        createTestDirectory( aTmpName10 );
-        OUString aUNormalURL( aTmpName10 );
-        OUString aUResultURL ( aSysPath5 );
+        createTestDirectory(aTmpName10);
+        OUString aUNormalURL(aTmpName10);
+        OUString aUResultURL (aSysPath5);
 
-        FileBase::RC nError = osl::FileBase::getSystemPathFromFileURL( aUNormalURL, aUStr );
+        osl::FileBase::RC nError = osl::FileBase::getSystemPathFromFileURL(aUNormalURL, aUStr);
 
-        bool bOk = compareFileName( aUStr, aUResultURL );
+        bool bOk = compareFileName(aUStr, aUResultURL);
 
         OString sError("test for getSystemPathFromFileURL(' ");
-        sError += OUStringToOString( aUNormalURL, RTL_TEXTENCODING_ASCII_US );
+        sError += OUStringToOString(aUNormalURL, RTL_TEXTENCODING_ASCII_US);
         sError += " ') function:use a CJK coded absolute URL, ";
-        sError += outputError(OUStringToOString( aUStr, RTL_TEXTENCODING_ASCII_US ),
-                            OUStringToOString( aUResultURL, RTL_TEXTENCODING_ASCII_US ));
-        deleteTestDirectory( aTmpName10 );
+        sError += outputError(OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US),
+                            OUStringToOString(aUResultURL, RTL_TEXTENCODING_ASCII_US));
+        deleteTestDirectory(aTmpName10);
 
-        CPPUNIT_ASSERT_EQUAL_MESSAGE( sError.getStr(), osl::FileBase::E_None, nError );
-        CPPUNIT_ASSERT_MESSAGE( sError.getStr(), bOk );
+        CPPUNIT_ASSERT_EQUAL_MESSAGE(sError.getStr(), osl::FileBase::E_None, nError);
+        CPPUNIT_ASSERT_MESSAGE(sError.getStr(), bOk);
     }
 
     void SystemPath_FileURL::getFileURLFromSystemPath_001()
     {
-        rtl::OString sSysPath("~/tmp");
+        OString sSysPath("~/tmp");
         char* home_path;
         home_path = getenv("HOME");
-        rtl::OString expResult(home_path);
+        OString expResult(home_path);
         expResult = "file://"+ expResult + "/tmp";
-        checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, expResult );
+        checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, expResult);
         checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "~/tmp");
     }
 
     void SystemPath_FileURL::getFileURLFromSystemPath_002()
     {
-        rtl::OString sSysPath("c:/tmp");
+        OString sSysPath("c:/tmp");
         checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "c:/tmp");
         checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "file:///c:/tmp");
     }
 
     void SystemPath_FileURL::getFileURLFromSystemPath_003()
     {
-        rtl::OString sSysPath("file:///temp");
+        OString sSysPath("file:///temp");
         checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, "");
         checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, "");
     }
 
     void SystemPath_FileURL::getFileURLFromSystemPath_004()
     {
-        rtl::OString sSysPath("//tmp//first start");
+        OString sSysPath("//tmp//first start");
         checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "file:///tmp/first%20start");
         checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, "");
     }
 
     void SystemPath_FileURL::getFileURLFromSystemPath_005()
     {
-        rtl::OString sSysPath("");
+        OString sSysPath("");
         checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, "");
         checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, "");
     }
 
     // testing the method
-    // static inline RC searchFileURL(  const OUString& ustrFileName,
+    // static inline RC searchFileURL( const OUString& ustrFileName,
     //                                  const OUString& ustrSearchPath,
-    //                                  OUString& ustrFileURL )
+    //                                  OUString& ustrFileURL)
 
     class searchFileURL : public CppUnit::TestFixture
     {
+    private:
         OUString aUStr;
-        FileBase::RC nError1, nError2, nError3,nError4;
-
-        public:
+        osl::FileBase::RC nError1, nError2, nError3,nError4;
 
+    public:
         searchFileURL()
-            : nError1(FileBase::E_None)
-            , nError2(FileBase::E_None)
-            , nError3(FileBase::E_None)
-            , nError4(FileBase::E_None) {}
+            : nError1(osl::FileBase::E_None)
+            , nError2(osl::FileBase::E_None)
+            , nError3(osl::FileBase::E_None)
+            , nError4(osl::FileBase::E_None) {}
 
         void searchFileURL_001()
         {
             /* search file is passed by system filename */
-            nError1 = FileBase::searchFileURL( aTmpName1, aUserDirectorySys, aUStr );
+            nError1 = osl::FileBase::searchFileURL(aTmpName1, aUserDirectorySys, aUStr);
             /* search file is passed by full qualified file URL */
-            nError2 = FileBase::searchFileURL( aCanURL1, aUserDirectorySys, aUStr );
+            nError2 = osl::FileBase::searchFileURL(aCanURL1, aUserDirectorySys, aUStr);
             /* search file is passed by relative file path */
-            nError3 = FileBase::searchFileURL( aRelURL4, aUserDirectorySys, aUStr );
+            nError3 = osl::FileBase::searchFileURL(aRelURL4, aUserDirectorySys, aUStr);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched files that is not exist, but it reply invalid error, did not pass in (W32) ",
-                                     osl::FileBase::E_NOENT, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched files that is not exist, but it reply invalid error, did not pass in (W32) ",
-                                     osl::FileBase::E_NOENT, nError2 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched files that is not exist, but it reply invalid error, did not pass in (W32) ",
-                                    osl::FileBase::E_NOENT, nError3 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched files that is not exist, but it reply invalid error, did not pass in (W32) ",
+                                     osl::FileBase::E_NOENT, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched files that is not exist, but it reply invalid error, did not pass in (W32) ",
+                                     osl::FileBase::E_NOENT, nError2);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched files that is not exist, but it reply invalid error, did not pass in (W32) ",
+                                    osl::FileBase::E_NOENT, nError3);
         }
 
          void searchFileURL_002()
         {
             /* search file is passed by system filename */
-            nError1 = FileBase::searchFileURL( aTempDirectorySys, aRootSys, aUStr );
-            bool bOk1 = compareFileName( aUStr, aTempDirectoryURL );
+            nError1 = osl::FileBase::searchFileURL(aTempDirectorySys, aRootSys, aUStr);
+            bool bOk1 = compareFileName(aUStr, aTempDirectoryURL);
             /* search file is passed by full qualified file URL */
-            nError2 = FileBase::searchFileURL( aTempDirectoryURL, aRootSys, aUStr );
-            bool bOk2 = compareFileName( aUStr, aTempDirectoryURL );
+            nError2 = osl::FileBase::searchFileURL(aTempDirectoryURL, aRootSys, aUStr);
+            bool bOk2 = compareFileName(aUStr, aTempDirectoryURL);
             /* search file is passed by relative file path */
-            nError3 = FileBase::searchFileURL( aRelURL5, aRootSys, aUStr );
-            bool bOk3 = compareFileName( aUStr, aTempDirectoryURL );
+            nError3 = osl::FileBase::searchFileURL(aRelURL5, aRootSys, aUStr);
+            bool bOk3 = compareFileName(aUStr, aTempDirectoryURL);
             /* search file is passed by an exist file */
-            createTestFile( aCanURL1 );
-            nError4 = FileBase::searchFileURL( aCanURL4, aUserDirectorySys, aUStr );
-            bool bOk4 = compareFileName( aUStr, aCanURL1 );
-            deleteTestFile( aCanURL1 );
-
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
-                                    osl::FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
-                                    osl::FileBase::E_None, nError2 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
-                                    osl::FileBase::E_None, nError3 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
-                                    osl::FileBase::E_None, nError4 );
-            CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
-                                    bOk1 );
-            CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
-                                    bOk2 );
-            CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
-                                    bOk3 );
-            CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
-                                    bOk4 );
+            createTestFile(aCanURL1);
+            nError4 = osl::FileBase::searchFileURL(aCanURL4, aUserDirectorySys, aUStr);
+            bool bOk4 = compareFileName(aUStr, aCanURL1);
+            deleteTestFile(aCanURL1);
+
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+                                    osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+                                    osl::FileBase::E_None, nError2);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+                                    osl::FileBase::E_None, nError3);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+                                    osl::FileBase::E_None, nError4);
+            CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+                                    bOk1);
+            CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+                                    bOk2);
+            CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+                                    bOk3);
+            CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+                                    bOk4);
         }
 
         void searchFileURL_003()
         {
-            OUString aSystemPathList( TEST_PLATFORM_ROOT ":" TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP ":" TEST_PLATFORM_ROOT "system/path" );
-            nError1 = FileBase::searchFileURL( aUserDirectoryURL, aSystemPathList, aUStr );
-            bool bOk = compareFileName( aUStr, aUserDirectoryURL );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: search directory is a list of system paths",
-                                    osl::FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: search directory is a list of system paths",
-                                    bOk );
+            OUString aSystemPathList(TEST_PLATFORM_ROOT ":" TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP ":" TEST_PLATFORM_ROOT "system/path");
+            nError1 = osl::FileBase::searchFileURL(aUserDirectoryURL, aSystemPathList, aUStr);
+            bool bOk = compareFileName(aUStr, aUserDirectoryURL);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: search directory is a list of system paths",
+                                    osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: search directory is a list of system paths",
+                                    bOk);
         }
 
         void searchFileURL_004()
         {
-            OUString aSystemPathList( TEST_PLATFORM_ROOT PATH_LIST_DELIMITER TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP PATH_LIST_DELIMITER TEST_PLATFORM_ROOT "system/path/../name" );
-            nError1 = FileBase::searchFileURL( aUserDirectoryURL, aSystemPathList, aUStr );
-            bool bOk = compareFileName( aUStr, aUserDirectoryURL );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: search directory is a list of system paths",
-                                    osl::FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: search directory is a list of system paths",
-                                    bOk );
+            OUString aSystemPathList(TEST_PLATFORM_ROOT PATH_LIST_DELIMITER TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP PATH_LIST_DELIMITER TEST_PLATFORM_ROOT "system/path/../name");
+            nError1 = osl::FileBase::searchFileURL(aUserDirectoryURL, aSystemPathList, aUStr);
+            bool bOk = compareFileName(aUStr, aUserDirectoryURL);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: search directory is a list of system paths",
+                                    osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: search directory is a list of system paths",
+                                    bOk);
         }
 
         void searchFileURL_005()
         {
-            nError1 = FileBase::searchFileURL( aUserDirectoryURL, aNullURL, aUStr );
-            bool bOk = compareFileName( aUStr, aUserDirectoryURL );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: search directory is NULL",
-                                    osl::FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: search directory is NULL",
-                                    bOk );
+            nError1 = osl::FileBase::searchFileURL(aUserDirectoryURL, aNullURL, aUStr);
+            bool bOk = compareFileName(aUStr, aUserDirectoryURL);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: search directory is NULL",
+                                    osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: search directory is NULL",
+                                    bOk);
         }
 
-        CPPUNIT_TEST_SUITE( searchFileURL );
-            CPPUNIT_TEST( searchFileURL_001 );
-            CPPUNIT_TEST( searchFileURL_002 );
-            CPPUNIT_TEST( searchFileURL_003 );
-            CPPUNIT_TEST( searchFileURL_004 );
-            CPPUNIT_TEST( searchFileURL_005 );
+        CPPUNIT_TEST_SUITE(searchFileURL);
+                CPPUNIT_TEST(searchFileURL_001);
+                CPPUNIT_TEST(searchFileURL_002);
+                CPPUNIT_TEST(searchFileURL_003);
+                CPPUNIT_TEST(searchFileURL_004);
+                CPPUNIT_TEST(searchFileURL_005);
         CPPUNIT_TEST_SUITE_END();
     };
 
     // testing the method
-    // static inline RC getTempDirURL( OUString& ustrTempDirURL )
+    // static inline RC getTempDirURL(OUString& ustrTempDirURL)
 
-    class getTempDirURL:public CppUnit::TestFixture
+    class getTempDirURL : public CppUnit::TestFixture
     {
+    private:
         OUString aUStr;
-        FileBase::RC nError;
+        osl::FileBase::RC nError;
 
     public:
-        getTempDirURL() : nError(FileBase::E_None) {}
+        getTempDirURL() : nError(osl::FileBase::E_None) {}
 
         void setUp() override
         {
-             nError = FileBase::getTempDirURL( aUStr );
+             nError = osl::FileBase::getTempDirURL(aUStr);
         }
 
         void getTempDirURL_001()
         {
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getTempDirURL function: excution",
-                                     osl::FileBase::E_None, nError );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getTempDirURL function: excution",
+                                     osl::FileBase::E_None, nError);
         }
 
         void getTempDirURL_002()
         {
-            CPPUNIT_ASSERT_MESSAGE( "test for getTempDirURL function: test for open and write access rights",
-                                    checkDirectory( aUStr, oslCheckMode::OpenAccess ) );
-            CPPUNIT_ASSERT_MESSAGE( "test for getTempDirURL function: test for open and write access rights",
-                                    checkDirectory( aUStr, oslCheckMode::ReadAccess ) );
-            CPPUNIT_ASSERT_MESSAGE( "test for getTempDirURL function: test for open and write access rights",
-                                    checkDirectory( aUStr, oslCheckMode::WriteAccess ) );
+            CPPUNIT_ASSERT_MESSAGE("test for getTempDirURL function: test for open and write access rights",
+                                    checkDirectory(aUStr, oslCheckMode::OpenAccess));
+            CPPUNIT_ASSERT_MESSAGE("test for getTempDirURL function: test for open and write access rights",
+                                    checkDirectory(aUStr, oslCheckMode::ReadAccess));
+            CPPUNIT_ASSERT_MESSAGE("test for getTempDirURL function: test for open and write access rights",
+                                    checkDirectory(aUStr, oslCheckMode::WriteAccess));
         }
 
-        CPPUNIT_TEST_SUITE( getTempDirURL );
-        CPPUNIT_TEST( getTempDirURL_001 );
-        CPPUNIT_TEST( getTempDirURL_002 );
+        CPPUNIT_TEST_SUITE(getTempDirURL);
+            CPPUNIT_TEST(getTempDirURL_001);
+            CPPUNIT_TEST(getTempDirURL_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  static inline RC createTempFile( OUString* pustrDirectoryURL,
+    //  static inline RC createTempFile(OUString* pustrDirectoryURL,
     //                                   oslFileHandle* pHandle,
     //                                   OUString* pustrTempFileURL)
 
-    class createTempFile:public CppUnit::TestFixture
+    class createTempFile : public CppUnit::TestFixture
     {
-        FileBase::RC nError1, nError2;
+    private:
+        osl::FileBase::RC nError1, nError2;
         bool bOK;
 
         oslFileHandle   *pHandle;
@@ -1143,8 +1143,8 @@ namespace osl_FileBase
 
     public:
         createTempFile()
-            : nError1(FileBase::E_None)
-            , nError2(FileBase::E_None)
+            : nError1(osl::FileBase::E_None)
+            , nError2(osl::FileBase::E_None)
             , bOK(false)
             , pHandle(nullptr)
             , pUStr_DirURL(nullptr)
@@ -1155,7 +1155,7 @@ namespace osl_FileBase
         void setUp() override
         {
             pHandle = new oslFileHandle();
-            pUStr_DirURL = new OUString( aUserDirectoryURL );
+            pUStr_DirURL = new OUString(aUserDirectoryURL);
             pUStr_FileURL = new OUString();
         }
 
@@ -1168,165 +1168,164 @@ namespace osl_FileBase
 
         void createTempFile_001()
         {
-            nError1 = FileBase::createTempFile( pUStr_DirURL, pHandle, pUStr_FileURL );
-            File testFile( *pUStr_FileURL );
-            nError2 = testFile.open( osl_File_OpenFlag_Create );
+            nError1 = osl::FileBase::createTempFile(pUStr_DirURL, pHandle, pUStr_FileURL);
+            File testFile(*pUStr_FileURL);
+            nError2 = testFile.open(osl_File_OpenFlag_Create);
 
-            if ( osl::FileBase::E_EXIST == nError2 )
+            if (osl::FileBase::E_EXIST == nError2)
             {
-                osl_closeFile( *pHandle );
-                deleteTestFile( *pUStr_FileURL );
+                osl_closeFile(*pHandle);
+                deleteTestFile(*pUStr_FileURL);
             }
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for createTempFile function: create temp file and test the existence",
-                                     osl::FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_MESSAGE( "test for createTempFile function: create temp file and test the existence",
-                                     ( pHandle != nullptr ) );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for createTempFile function: create temp file and test the existence",
-                                     osl::FileBase::E_EXIST, nError2 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for createTempFile function: create temp file and test the existence",
+                                     osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_MESSAGE("test for createTempFile function: create temp file and test the existence",
+                                     (pHandle != nullptr));
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for createTempFile function: create temp file and test the existence",
+                                     osl::FileBase::E_EXIST, nError2);
         }
 
         void createTempFile_002()
         {
             bOK = false;
-            nError1 = FileBase::createTempFile( pUStr_DirURL, pHandle, pUStr_FileURL );
-            File testFile( *pUStr_FileURL );
-            nError2 = testFile.open( osl_File_OpenFlag_Create );
+            nError1 = osl::FileBase::createTempFile(pUStr_DirURL, pHandle, pUStr_FileURL);
+            File testFile(*pUStr_FileURL);
+            nError2 = testFile.open(osl_File_OpenFlag_Create);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
-                osl::FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
-                ( pHandle != nullptr ) );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
-                osl::FileBase::E_EXIST, nError2 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("createTempFile function: create a temp file, but it does not exist",
+                osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_MESSAGE("createTempFile function: create a temp file, but it does not exist",
+                (pHandle != nullptr));
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("createTempFile function: create a temp file, but it does not exist",
+                osl::FileBase::E_EXIST, nError2);
 
             // check file if have the write permission
-            if ( osl::FileBase::E_EXIST == nError2 )
+            if (osl::FileBase::E_EXIST == nError2)
             {
-                bOK = ifFileCanWrite( *pUStr_FileURL );
-                osl_closeFile( *pHandle );
-                deleteTestFile( *pUStr_FileURL );
+                bOK = ifFileCanWrite(*pUStr_FileURL);
+                osl_closeFile(*pHandle);
+                deleteTestFile(*pUStr_FileURL);
             }
 
-            CPPUNIT_ASSERT_MESSAGE( "test for open and write access rights, in (W32), it did not have write access right, but it should be writable.",
-                                     bOK );
+            CPPUNIT_ASSERT_MESSAGE("test for open and write access rights, in (W32), it did not have write access right, but it should be writable.",
+                                     bOK);
         }
 
         void createTempFile_003()
         {
-            nError1 = FileBase::createTempFile( pUStr_DirURL, pHandle, nullptr );
+            nError1 = osl::FileBase::createTempFile(pUStr_DirURL, pHandle, nullptr);
             // the temp file will be removed when return from createTempFile
             bOK = (pHandle != nullptr && nError1 == osl::FileBase::E_None);
-            if ( bOK )
-                osl_closeFile( *pHandle );
+            if (bOK)
+                osl_closeFile(*pHandle);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for createTempFile function: set pUStrFileURL to 0 to let it remove the file after call.",
-                                FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_MESSAGE( "test for createTempFile function: set pUStrFileURL to 0 to let it remove the file after call.",
-                                bOK );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for createTempFile function: set pUStrFileURL to 0 to let it remove the file after call.",
+                                osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_MESSAGE("test for createTempFile function: set pUStrFileURL to 0 to let it remove the file after call.",
+                                bOK);
         }
 
         void createTempFile_004()
         {
-            nError1 = FileBase::createTempFile( pUStr_DirURL, nullptr, pUStr_FileURL );
-            bOK = ( pUStr_FileURL != nullptr);
+            nError1 = osl::FileBase::createTempFile(pUStr_DirURL, nullptr, pUStr_FileURL);
+            bOK = (pUStr_FileURL != nullptr);
             CPPUNIT_ASSERT(bOK);
-            File testFile( *pUStr_FileURL );
-            nError2 = testFile.open( osl_File_OpenFlag_Create );
-            deleteTestFile( *pUStr_FileURL );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
-                osl::FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
-                osl::FileBase::E_EXIST, nError2 );
-            CPPUNIT_ASSERT_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
-                bOK );
-
-        }
-
-        CPPUNIT_TEST_SUITE( createTempFile );
-            CPPUNIT_TEST( createTempFile_001 );
-            CPPUNIT_TEST( createTempFile_002 );
-            CPPUNIT_TEST( createTempFile_003 );
-            CPPUNIT_TEST( createTempFile_004 );
+            File testFile(*pUStr_FileURL);
+            nError2 = testFile.open(osl_File_OpenFlag_Create);
+            deleteTestFile(*pUStr_FileURL);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("createTempFile function: create a temp file, but it does not exist",
+                osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("createTempFile function: create a temp file, but it does not exist",
+                osl::FileBase::E_EXIST, nError2);
+            CPPUNIT_ASSERT_MESSAGE("createTempFile function: create a temp file, but it does not exist",
+                bOK);
+
+        }
+
+        CPPUNIT_TEST_SUITE(createTempFile);
+                CPPUNIT_TEST(createTempFile_001);
+                CPPUNIT_TEST(createTempFile_002);
+                CPPUNIT_TEST(createTempFile_003);
+                CPPUNIT_TEST(createTempFile_004);
         CPPUNIT_TEST_SUITE_END();
     };
 
-// 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::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" );
+    // FIXME: remove the _disabled to enable:
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileBase::getAbsoluteFileURL, "osl_osl::FileBase_disabled");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileBase::SystemPath_FileURL, "osl_osl::FileBase");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileBase::searchFileURL, "osl_osl::FileBase_disabled");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileBase::getTempDirURL, "osl_osl::FileBase_disabled");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileBase::createTempFile, "osl_osl::FileBase_disabled");
 
-    CPPUNIT_REGISTRY_ADD_TO_DEFAULT( "osl_FileBase" );
+    CPPUNIT_REGISTRY_ADD_TO_DEFAULT("osl_osl::FileBase");
 }
 
 namespace osl_FileStatus
 {
     //  testing the method
-    //  FileStatus( sal_uInt32 nMask ): _nMask( nMask )
-
+    //  FileStatus(sal_uInt32 nMask): _nMask(nMask)
     class ctors : public CppUnit::TestFixture
     {
     private:
-        OUString         aUStr;
-        FileBase::RC     nError1;
-        DirectoryItem    rItem;
+        OUString aUStr;
+        osl::FileBase::RC nError1;
+        DirectoryItem rItem;
 
     public:
-        ctors() : nError1(FileBase::E_None) {}
-        // initialization
+        ctors() : nError1(osl::FileBase::E_None) {}
+
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
 
-            Directory aDir( aTmpName3 );
+            Directory aDir(aTmpName3);
             nError1 = aDir.open();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = aDir.getNextItem( rItem );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = aDir.getNextItem(rItem);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             aDir.close();
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
         void ctors_001()
         {
-            FileStatus rFileStatus( osl_FileStatus_Mask_All );
-            nError1 = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            FileStatus rFileStatus(osl_FileStatus_Mask_All);
+            nError1 = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             aUStr = rFileStatus.getFileName();
 
-            CPPUNIT_ASSERT_MESSAGE( "test for ctors function: mask all and see the file name",
-                                    compareFileName( aUStr, aTmpName2)  );
+            CPPUNIT_ASSERT_MESSAGE("test for ctors function: mask all and see the file name",
+                                   compareFileName(aUStr, aTmpName2));
         }
 
         void ctors_002()
         {
-            FileStatus rFileStatus( 0 );
-            nError1 = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            FileStatus rFileStatus(0);
+            nError1 = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             aUStr = rFileStatus.getFileName();
 
-            CPPUNIT_ASSERT_MESSAGE( "test for ctors function: mask is empty",
-                                    compareFileName( aUStr, aNullURL)  );
+            CPPUNIT_ASSERT_MESSAGE("test for ctors function: mask is empty",
+                                   compareFileName(aUStr, aNullURL));
         }
 
-        CPPUNIT_TEST_SUITE( ctors );
-            CPPUNIT_TEST( ctors_001 );
-            CPPUNIT_TEST( ctors_002 );
+        CPPUNIT_TEST_SUITE(ctors);
+            CPPUNIT_TEST(ctors_001);
+            CPPUNIT_TEST(ctors_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline sal_Bool isValid( sal_uInt32 nMask ) const
+    //  inline sal_Bool isValid(sal_uInt32 nMask) const
 
     class isValid : public CppUnit::TestFixture
     {
@@ -1343,41 +1342,41 @@ namespace osl_FileStatus
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
 
-            pDir = new Directory( aTmpName3 );
-                    FileBase::RC nError1 = pDir->open();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = pDir->getNextItem( rItem_file, 1 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            pDir = new Directory(aTmpName3);
+            osl::FileBase::RC nError1 = pDir->open();
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = pDir->getNextItem(rItem_file, 1);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
         }
 
         void tearDown() override
         {
-            FileBase::RC nError1 = pDir->close();
+            osl::FileBase::RC nError1 = pDir->close();
             delete pDir;
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( errorToStr(nError1).getStr(), nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError1).getStr(), nError1, osl::FileBase::E_None);
 
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
         void isValid_001()
         {
             sal_uInt32 mask = 0;
-            FileStatus rFileStatus( mask );
-            FileBase::RC nError1 = rItem_file.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            bool bOk = rFileStatus.isValid( mask );
+            FileStatus rFileStatus(mask);
+            osl::FileBase::RC nError1 = rItem_file.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            bool bOk = rFileStatus.isValid(mask);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for isValid function: no fields specified", bOk );
+            CPPUNIT_ASSERT_MESSAGE("test for isValid function: no fields specified", bOk);
         }
 
         void check_FileStatus(FileStatus const& _aStatus)
         {
-            rtl::OString sStat;
+            OString sStat;
             if (_aStatus.isValid(osl_FileStatus_Mask_Type))
                 sStat += "type ";
             if (_aStatus.isValid(osl_FileStatus_Mask_Attributes))
@@ -1399,7 +1398,7 @@ namespace osl_FileStatus
 
         void isValid_002()
         {
-            createTestFile( aTmpName6 );
+            createTestFile(aTmpName6);
             sal_uInt32 mask_file = osl_FileStatus_Mask_Type |
                                    osl_FileStatus_Mask_Attributes |
                                    osl_FileStatus_Mask_CreationTime |
@@ -1409,14 +1408,14 @@ namespace osl_FileStatus
                                    osl_FileStatus_Mask_FileName |
                                    osl_FileStatus_Mask_FileURL;
 
-            FileStatus rFileStatus( mask_file );
-            DirectoryItem::get( aTmpName6, rItem_file );
-            FileBase::RC nError1 = rItem_file.getFileStatus( rFileStatus );
+            FileStatus rFileStatus(mask_file);
+            DirectoryItem::get(aTmpName6, rItem_file);
+            osl::FileBase::RC nError1 = rItem_file.getFileStatus(rFileStatus);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( errorToStr(nError1).getStr(), nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError1).getStr(), nError1, osl::FileBase::E_None);
 
             check_FileStatus(rFileStatus);
-            deleteTestFile( aTmpName6 );
+            deleteTestFile(aTmpName6);
 
         }
 
@@ -1427,40 +1426,40 @@ namespace osl_FileStatus
 
         void isValid_003()
         {
-#if defined ( UNX )
+#if defined (UNX)
             sal_Int32 fd;
 
-            OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
+            OUString aUStr_LnkFileSys(aTempDirectorySys), aUStr_SrcFileSys(aTempDirectorySys);
             aUStr_LnkFileSys += aSlashURL + getCurrentPID() + "/tmpdir/link.file";
             aUStr_SrcFileSys += aSlashURL + getCurrentPID() + "/tmpdir/tmpname";
 
-            rtl::OString strLinkFileName;
-            rtl::OString strSrcFileName;
-            strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
-            strSrcFileName = OUStringToOString( aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US );
+            OString strLinkFileName;
+            OString strSrcFileName;
+            strLinkFileName = OUStringToOString(aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US);
+            strSrcFileName = OUStringToOString(aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US);
 
             // create a link file and link it to file "/tmp/PID/tmpdir/tmpname"
-            fd = symlink( strSrcFileName.getStr(), strLinkFileName.getStr() );
-            CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(0), fd );
+            fd = symlink(strSrcFileName.getStr(), strLinkFileName.getStr());
+            CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), fd);
 
             // testDirectory is "/tmp/PID/tmpdir/"
-            Directory testDirectory( aTmpName3 );
+            Directory testDirectory(aTmpName3);
             testDirectory.open();
             OUString aFileName ("link.file");
             bool bOk = false;
             while (true)
             {
-                osl::FileBase::RC nError1 = testDirectory.getNextItem( rItem_link, 4 );
+                osl::FileBase::RC nError1 = testDirectory.getNextItem(rItem_link, 4);
 
-                if (FileBase::E_None == nError1)
+                if (osl::FileBase::E_None == nError1)
                 {
                     sal_uInt32 mask_link = osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_LinkTargetURL;
-                    FileStatus rFileStatus( mask_link );
-                    rItem_link.getFileStatus( rFileStatus );
+                    FileStatus rFileStatus(mask_link);
+                    rItem_link.getFileStatus(rFileStatus);
 
-                    if ( compareFileName( rFileStatus.getFileName(), aFileName) )
+                    if (compareFileName(rFileStatus.getFileName(), aFileName))
                     {
-                        if ( rFileStatus.isValid( osl_FileStatus_Mask_LinkTargetURL ) )
+                        if (rFileStatus.isValid(osl_FileStatus_Mask_LinkTargetURL))
                         {
                             bOk = true;
                             break;
@@ -1473,8 +1472,8 @@ namespace osl_FileStatus
                 }
             };
 
-            fd = remove( strLinkFileName.getStr() );
-            CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(0), fd );
+            fd = remove(strLinkFileName.getStr());
+            CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), fd);
 
             CPPUNIT_ASSERT_MESSAGE("test for isValid function: link file, check for LinkTargetURL", bOk);
 #endif
@@ -1483,25 +1482,25 @@ namespace osl_FileStatus
         void isValid_004()
         {
             sal_uInt32 mask_file_all = osl_FileStatus_Mask_All;
-            FileStatus   rFileStatus_all( mask_file_all );
-            FileBase::RC nError1 = rItem_file.getFileStatus( rFileStatus_all );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            FileStatus   rFileStatus_all(mask_file_all);
+            osl::FileBase::RC nError1 = rItem_file.getFileStatus(rFileStatus_all);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             check_FileStatus(rFileStatus_all);
 
             sal_uInt32 mask_file_val = osl_FileStatus_Mask_Validate;
-            FileStatus   rFileStatus_val( mask_file_val );
-            nError1 = rItem_file.getFileStatus( rFileStatus_val );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            FileStatus   rFileStatus_val(mask_file_val);
+            nError1 = rItem_file.getFileStatus(rFileStatus_val);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             check_FileStatus(rFileStatus_val);
         }
 
-        CPPUNIT_TEST_SUITE( isValid );
-            CPPUNIT_TEST( isValid_001 );
-            CPPUNIT_TEST( isValid_002 );
-            CPPUNIT_TEST( isValid_003 );
-            CPPUNIT_TEST( isValid_004 );
+        CPPUNIT_TEST_SUITE(isValid);
+                CPPUNIT_TEST(isValid_001);
+                CPPUNIT_TEST(isValid_002);
+                CPPUNIT_TEST(isValid_003);
+                CPPUNIT_TEST(isValid_004);
         CPPUNIT_TEST_SUITE_END();
     };
 
@@ -1511,13 +1510,13 @@ namespace osl_FileStatus
     class getFileType : public CppUnit::TestFixture
     {
     private:
-        FileBase::RC     nError1;
+        osl::FileBase::RC nError1;
 
-        DirectoryItem    m_aItem_1, m_aItem_2, m_aVolumeItem, m_aFifoItem;
-        DirectoryItem    m_aLinkItem, m_aSocketItem, m_aSpecialItem;
+        DirectoryItem m_aItem_1, m_aItem_2, m_aVolumeItem, m_aFifoItem;
+        DirectoryItem m_aLinkItem, m_aSocketItem, m_aSpecialItem;
 
     public:
-        getFileType() : nError1(FileBase::E_None) {}
+        getFileType() : nError1(osl::FileBase::E_None) {}
 
         void setUp() override
         {
@@ -1525,60 +1524,60 @@ namespace osl_FileStatus
             //        a tempdirectory: $TEMP/tmpdir/tmpdir.
             //        use $ROOT/staroffice as volume ---> use dev/fd as volume.
             // and get their directory item.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName3, aTmpName2 );
-            createTestDirectory( aTmpName3, aTmpName1 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName3, aTmpName2);
+            createTestDirectory(aTmpName3, aTmpName1);
 
-            std::unique_ptr<Directory> xDir( new Directory( aTmpName3 ) );
+            std::unique_ptr<Directory> xDir(new Directory(aTmpName3));
             nError1 = xDir->open();
-            CPPUNIT_ASSERT_EQUAL_MESSAGE("open aTmpName3 failed!", nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("open aTmpName3 failed!", nError1, osl::FileBase::E_None);
             // getNextItem can not assure which item retrieved
-            nError1 = xDir->getNextItem( m_aItem_1, 1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE("get first item failed!", nError1, FileBase::E_None );
+            nError1 = xDir->getNextItem(m_aItem_1, 1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("get first item failed!", nError1, osl::FileBase::E_None);
 
-            nError1 = xDir->getNextItem( m_aItem_2 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE("get second item failed!", nError1, FileBase::E_None );
+            nError1 = xDir->getNextItem(m_aItem_2);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("get second item failed!", nError1, osl::FileBase::E_None);
             xDir->close();
             // FIXME mindy: failed on my RH9,so removed temporaly
-            // nError1 = DirectoryItem::get( aVolURL2, m_aVolumeItem );
-            // CPPUNIT_ASSERT_MESSAGE("get volume item failed!", FileBase::E_None == nError1 );
+            // nError1 = DirectoryItem::get(aVolURL2, m_aVolumeItem);
+            // CPPUNIT_ASSERT_MESSAGE("get volume item failed!", osl::FileBase::E_None == nError1);
         }
 
         void tearDown() override
         {
             // remove all in $TEMP/tmpdir.
-            deleteTestDirectory( aTmpName3, aTmpName1 );
-            deleteTestFile( aTmpName3, aTmpName2 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestDirectory(aTmpName3, aTmpName1);
+            deleteTestFile(aTmpName3, aTmpName2);
+            deleteTestDirectory(aTmpName3);
         }
 
         void getFileType_001()
         {
-            FileStatus   rFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName );
-            nError1 = m_aItem_1.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE("getFileStatus failed", nError1, FileBase::E_None );
+            FileStatus   rFileStatus(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName);
+            nError1 = m_aItem_1.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("getFileStatus failed", nError1, osl::FileBase::E_None);
 
             check_FileType(rFileStatus);
         }
 
-        void check_FileType(osl::FileStatus const& _rFileStatus )
+        void check_FileType(osl::FileStatus const& _rFileStatus)
         {
-            if ( _rFileStatus.isValid(osl_FileStatus_Mask_FileName))
+            if (_rFileStatus.isValid(osl_FileStatus_Mask_FileName))
             {
-                rtl::OUString suFilename = _rFileStatus.getFileName();
+                OUString suFilename = _rFileStatus.getFileName();
 
-                if ( _rFileStatus.isValid(osl_FileStatus_Mask_Type))
+                if (_rFileStatus.isValid(osl_FileStatus_Mask_Type))
                 {
                     osl::FileStatus::Type eType = _rFileStatus.getFileType();
                     bool bOK = false;
 
-                    if ( compareFileName( suFilename, aTmpName2) )
-                        bOK = ( eType == osl::FileStatus::Regular );
+                    if (compareFileName(suFilename, aTmpName2))
+                        bOK = (eType == osl::FileStatus::Regular);
 
-                    if ( compareFileName( suFilename, aTmpName1) )
-                        bOK = ( eType == FileStatus::Directory );
+                    if (compareFileName(suFilename, aTmpName1))
+                        bOK = (eType == FileStatus::Directory);
 
-                    CPPUNIT_ASSERT_MESSAGE( "test for getFileType function: ", bOK );
+                    CPPUNIT_ASSERT_MESSAGE("test for getFileType function: ", bOK);
                 }
             }
             // LLA: it's not a bug, if a FileStatus not exist, so no else
@@ -1586,10 +1585,10 @@ namespace osl_FileStatus
 
         void getFileType_002()
         {
-            FileStatus rFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName );
-            nError1 = m_aItem_2.getFileStatus( rFileStatus );
+            FileStatus rFileStatus(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName);
+            nError1 = m_aItem_2.getFileStatus(rFileStatus);
 
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             check_FileType(rFileStatus);
         }
 
@@ -1600,29 +1599,29 @@ namespace osl_FileStatus
         void getFileType_007()
         {
 #if defined(__sun) // Special file is differ in Windows
-            nError1 = DirectoryItem::get( aTypeURL2, m_aSpecialItem );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = DirectoryItem::get(aTypeURL2, m_aSpecialItem);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             // check for File type
-            FileStatus   rFileStatus( osl_FileStatus_Mask_Type );
-            nError1 = m_aSpecialItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            FileStatus   rFileStatus(osl_FileStatus_Mask_Type);
+            nError1 = m_aSpecialItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             if (rFileStatus.isValid(osl_FileStatus_Mask_Type))
             {
                 osl::FileStatus::Type eType = rFileStatus.getFileType();
 
-                CPPUNIT_ASSERT_MESSAGE( "test for getFileType function: Special, Solaris version ",
-                                        ( eType == FileStatus::Special ) );
+                CPPUNIT_ASSERT_MESSAGE("test for getFileType function: Special, Solaris version ",
+                                        (eType == FileStatus::Special));
             }
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( getFileType );
-            CPPUNIT_TEST( getFileType_001 );
-            CPPUNIT_TEST( getFileType_002 );
-            CPPUNIT_TEST( getFileType_003 );
-            CPPUNIT_TEST( getFileType_007 );
+        CPPUNIT_TEST_SUITE(getFileType);
+                CPPUNIT_TEST(getFileType_001);
+                CPPUNIT_TEST(getFileType_002);
+                CPPUNIT_TEST(getFileType_003);
+                CPPUNIT_TEST(getFileType_007);
         CPPUNIT_TEST_SUITE_END();
     };
 
@@ -1632,124 +1631,124 @@ namespace osl_FileStatus
     class getAttributes : public CppUnit::TestFixture
     {
     private:
-        OUString         aTypeURL, aTypeURL_Hid;
-        FileBase::RC     nError;
-        DirectoryItem    rItem, rItem_hidden;
+        OUString aTypeURL, aTypeURL_Hid;
+        osl::FileBase::RC nError;
+        DirectoryItem rItem, rItem_hidden;
 
     public:
-        getAttributes() : nError(FileBase::E_None) {}
+        getAttributes() : nError(osl::FileBase::E_None) {}
 
         void setUp() override
         {
-            aTypeURL = aUserDirectoryURL.copy( 0 );
-            concatURL( aTypeURL, aTmpName2 );
-            createTestFile( aTypeURL );
-            nError = DirectoryItem::get( aTypeURL, rItem );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            aTypeURL = aUserDirectoryURL.copy(0);
+            concatURL(aTypeURL, aTmpName2);
+            createTestFile(aTypeURL);
+            nError = DirectoryItem::get(aTypeURL, rItem);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
 
-            aTypeURL_Hid = aUserDirectoryURL.copy( 0 );
-            concatURL( aTypeURL_Hid, aHidURL1 );
-            createTestFile( aTypeURL_Hid );
-            nError = DirectoryItem::get( aTypeURL_Hid, rItem_hidden );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            aTypeURL_Hid = aUserDirectoryURL.copy(0);
+            concatURL(aTypeURL_Hid, aHidURL1);
+            createTestFile(aTypeURL_Hid);
+            nError = DirectoryItem::get(aTypeURL_Hid, rItem_hidden);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
         }
 
         void tearDown() override
         {
-            deleteTestFile( aTypeURL );
-            deleteTestFile( aTypeURL_Hid );
+            deleteTestFile(aTypeURL);
+            deleteTestFile(aTypeURL_Hid);
         }
 
-#if ( defined UNX )
+#if (defined UNX)
 // windows only has 3 file attributes: normal, readonly and hidden
         void getAttributes_001()
         {
-            changeFileMode( aTypeURL, S_IRUSR | S_IRGRP | S_IROTH );
+            changeFileMode(aTypeURL, S_IRUSR | S_IRGRP | S_IROTH);
 
-            FileStatus rFileStatus( osl_FileStatus_Mask_Attributes );
-            nError = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            FileStatus rFileStatus(osl_FileStatus_Mask_Attributes);
+            nError = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getAttributes function: ReadOnly, GrpRead, OwnRead, OthRead( UNX version ) ",
-                                    static_cast<sal_uInt64>( osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead ),
-                                    rFileStatus.getAttributes() );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getAttributes function: ReadOnly, GrpRead, OwnRead, OthRead(UNX version) ",
+                                    static_cast<sal_uInt64>(osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead),
+                                    rFileStatus.getAttributes());
         }
 #else // Windows version
         void getAttributes_001()
         {
-            CPPUNIT_ASSERT_MESSAGE( "test for getAttributes function: ReadOnly, GrpRead, OwnRead, OthRead( Windows version )",
-                                     1 == 1 );
+            CPPUNIT_ASSERT_MESSAGE("test for getAttributes function: ReadOnly, GrpRead, OwnRead, OthRead(Windows version)",
+                                     1 == 1);
         }
 #endif
 
         void getAttributes_002()
         {
-#if ( defined UNX )
-            changeFileMode( aTypeURL, S_IXUSR | S_IXGRP | S_IXOTH );
+#if (defined UNX)
+            changeFileMode(aTypeURL, S_IXUSR | S_IXGRP | S_IXOTH);
 
-              FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
-            nError = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+              FileStatus   rFileStatus(osl_FileStatus_Mask_Attributes);
+            nError = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getAttributes function: Executable, GrpExe, OwnExe, OthExe, the result is Readonly, Executable, GrpExe, OwnExe, OthExe, it partly not pass( Solaris version )",
-                                    static_cast<sal_uInt64>( osl_File_Attribute_ReadOnly | osl_File_Attribute_Executable | osl_File_Attribute_GrpExe | osl_File_Attribute_OwnExe | osl_File_Attribute_OthExe ),
-                                    rFileStatus.getAttributes() );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getAttributes function: Executable, GrpExe, OwnExe, OthExe, the result is Readonly, Executable, GrpExe, OwnExe, OthExe, it partly not pass(Solaris version)",
+                                    static_cast<sal_uInt64>(osl_File_Attribute_ReadOnly | osl_File_Attribute_Executable | osl_File_Attribute_GrpExe | osl_File_Attribute_OwnExe | osl_File_Attribute_OthExe),
+                                    rFileStatus.getAttributes());
 #endif
         }
 
-#if ( defined UNX )
+#if (defined UNX)
         void getAttributes_003()
         {
-            changeFileMode( aTypeURL, S_IWUSR | S_IWGRP | S_IWOTH );
+            changeFileMode(aTypeURL, S_IWUSR | S_IWGRP | S_IWOTH);
 
-            FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
-            nError = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            FileStatus   rFileStatus(osl_FileStatus_Mask_Attributes);
+            nError = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getAttributes function: GrpWrite, OwnWrite, OthWrite( Solaris version )",
-                                    static_cast<sal_uInt64>( osl_File_Attribute_GrpWrite | osl_File_Attribute_OwnWrite | osl_File_Attribute_OthWrite ),
-                                    rFileStatus.getAttributes() );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getAttributes function: GrpWrite, OwnWrite, OthWrite(Solaris version)",
+                                    static_cast<sal_uInt64>(osl_File_Attribute_GrpWrite | osl_File_Attribute_OwnWrite | osl_File_Attribute_OthWrite),
+                                    rFileStatus.getAttributes());
         }
 #else // Windows version
         void getAttributes_003()
         {
-            CPPUNIT_ASSERT_MESSAGE( "test for getAttributes function: GrpWrite, OwnWrite, OthWrite( Windows version )",
-                                     1 == 1 );
+            CPPUNIT_ASSERT_MESSAGE("test for getAttributes function: GrpWrite, OwnWrite, OthWrite(Windows version)",
+                                     1 == 1);
         }
 #endif
 
-#if ( defined UNX ) // hidden file definition may be different in Windows
+#if (defined UNX) // hidden file definition may be different in Windows
         void getAttributes_004()
         {
             sal_Int32 test_Attributes = osl_File_Attribute_Hidden;
-            FileStatus rFileStatus( osl_FileStatus_Mask_Attributes );
-            nError = rItem_hidden.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            FileStatus rFileStatus(osl_FileStatus_Mask_Attributes);
+            nError = rItem_hidden.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
             test_Attributes &= rFileStatus.getAttributes();
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getAttributes function: Hidden files( Solaris version )",
-                                    static_cast<sal_Int32>(osl_File_Attribute_Hidden), test_Attributes );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getAttributes function: Hidden files(Solaris version)",
+                                    static_cast<sal_Int32>(osl_File_Attribute_Hidden), test_Attributes);
         }
 #else // Windows version
         void getAttributes_004()
         {
             OUString aUserHiddenFileURL ("file:///c:/AUTOEXEC.BAT");
-            nError = DirectoryItem::get( aUserHiddenFileURL, rItem_hidden );
-            CPPUNIT_ASSERT_MESSAGE("get item fail", nError == FileBase::E_None );
-            FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
-            nError = rItem_hidden.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            nError = DirectoryItem::get(aUserHiddenFileURL, rItem_hidden);
+            CPPUNIT_ASSERT_MESSAGE("get item fail", nError == osl::FileBase::E_None);
+            FileStatus   rFileStatus(osl_FileStatus_Mask_Attributes);
+            nError = rItem_hidden.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
 
-            CPPUNIT_ASSERT_MESSAGE( "Hidden files(Windows version), please check if hidden file c:/AUTOEXEC.BAT exists ",
-                                    (rFileStatus.getAttributes() & osl_File_Attribute_Hidden)!= 0 );
+            CPPUNIT_ASSERT_MESSAGE("Hidden files(Windows version), please check if hidden file c:/AUTOEXEC.BAT exists ",
+                                    (rFileStatus.getAttributes() & osl_File_Attribute_Hidden)!= 0);
         }
 #endif
 
-        CPPUNIT_TEST_SUITE( getAttributes );
-            CPPUNIT_TEST( getAttributes_001 );
-            CPPUNIT_TEST( getAttributes_002 );
-            CPPUNIT_TEST( getAttributes_003 );
-            CPPUNIT_TEST( getAttributes_004 );
+        CPPUNIT_TEST_SUITE(getAttributes);
+                CPPUNIT_TEST(getAttributes_001);
+                CPPUNIT_TEST(getAttributes_002);
+                CPPUNIT_TEST(getAttributes_003);
+                CPPUNIT_TEST(getAttributes_004);
         CPPUNIT_TEST_SUITE_END();
     };
 
@@ -1759,53 +1758,53 @@ namespace osl_FileStatus
     class getAccessTime : public CppUnit::TestFixture
     {
     private:
-        OUString         aTypeURL;
-        FileBase::RC     nError;
-        DirectoryItem    rItem;
+        OUString aTypeURL;
+        osl::FileBase::RC nError;
+        DirectoryItem rItem;
 
     public:
-        getAccessTime() : nError(FileBase::E_None) {}
+        getAccessTime() : nError(osl::FileBase::E_None) {}
 
         void setUp() override
         {
-            aTypeURL = aUserDirectoryURL.copy( 0 );
-            concatURL( aTypeURL, aTmpName2 );
-            createTestFile( aTypeURL );
-            nError = DirectoryItem::get( aTypeURL, rItem );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            aTypeURL = aUserDirectoryURL.copy(0);
+            concatURL(aTypeURL, aTmpName2);
+            createTestFile(aTypeURL);
+            nError = DirectoryItem::get(aTypeURL, rItem);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
 
         }
 
         void tearDown() override
         {
-            deleteTestFile( aTypeURL );
+            deleteTestFile(aTypeURL);
         }
 
         void getAccessTime_001()
         {
             TimeValue *pTV_current = nullptr;
-            CPPUNIT_ASSERT( ( pTV_current = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr );
+            CPPUNIT_ASSERT((pTV_current = static_cast<TimeValue*>(malloc(sizeof(TimeValue)))) != nullptr);
             TimeValue *pTV_access = nullptr;
-            CPPUNIT_ASSERT( ( pTV_access = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr );
+            CPPUNIT_ASSERT((pTV_access = static_cast<TimeValue*>(malloc(sizeof(TimeValue)))) != nullptr);
 
-            FileStatus   rFileStatus( osl_FileStatus_Mask_AccessTime );
-            nError = rItem.getFileStatus( rFileStatus );
-            bool bOk = osl_getSystemTime( pTV_current );
-            CPPUNIT_ASSERT( bOk );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            FileStatus   rFileStatus(osl_FileStatus_Mask_AccessTime);
+            nError = rItem.getFileStatus(rFileStatus);
+            bool bOk = osl_getSystemTime(pTV_current);
+            CPPUNIT_ASSERT(bOk);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
 
             *pTV_access = rFileStatus.getAccessTime();
 
-            bool bOK = t_compareTime( pTV_access, pTV_current, delta );
-            free( pTV_current );
-            free( pTV_access );
+            bool bOK = t_compareTime(pTV_access, pTV_current, delta);
+            free(pTV_current);
+            free(pTV_access);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for getAccessTime function: This test turns out that UNX pricision is no more than 1 sec, don't know how to test this function, in Windows test, it lost hour min sec, only have date time. ",
-                                    bOK );
+            CPPUNIT_ASSERT_MESSAGE("test for getAccessTime function: This test turns out that UNX pricision is no more than 1 sec, don't know how to test this function, in Windows test, it lost hour min sec, only have date time. ",
+                                    bOK);
         }
 
-        CPPUNIT_TEST_SUITE( getAccessTime );
-            CPPUNIT_TEST( getAccessTime_001 );
+        CPPUNIT_TEST_SUITE(getAccessTime);
+                CPPUNIT_TEST(getAccessTime_001);
         CPPUNIT_TEST_SUITE_END();
     };
 
@@ -1815,115 +1814,115 @@ namespace osl_FileStatus
     class getModifyTime : public CppUnit::TestFixture
     {
     private:
-        OUString         aTypeURL;
-        FileBase::RC     nError;
-        DirectoryItem    rItem;
+        OUString aTypeURL;
+        osl::FileBase::RC nError;
+        DirectoryItem rItem;
 
     public:
-        getModifyTime() : nError(FileBase::E_None) {}
+        getModifyTime() : nError(osl::FileBase::E_None) {}
 
         void getModifyTime_001()
         {
             TimeValue *pTV_current = nullptr;
-            CPPUNIT_ASSERT( ( pTV_current = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr );
+            CPPUNIT_ASSERT((pTV_current = static_cast<TimeValue*>(malloc(sizeof(TimeValue)))) != nullptr);
 
             // create file
-            aTypeURL = aUserDirectoryURL.copy( 0 );
-            concatURL( aTypeURL, aTmpName2 );
-            createTestFile( aTypeURL );
+            aTypeURL = aUserDirectoryURL.copy(0);
+            concatURL(aTypeURL, aTmpName2);
+            createTestFile(aTypeURL);
 
             // get current time
-            bool bOk = osl_getSystemTime( pTV_current );
-            CPPUNIT_ASSERT( bOk );
+            bool bOk = osl_getSystemTime(pTV_current);
+            CPPUNIT_ASSERT(bOk);
 
             // get instance item and filestatus
-            nError = DirectoryItem::get( aTypeURL, rItem );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
-            FileStatus   rFileStatus( osl_FileStatus_Mask_ModifyTime );
-            nError = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            nError = DirectoryItem::get(aTypeURL, rItem);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
+            FileStatus   rFileStatus(osl_FileStatus_Mask_ModifyTime);
+            nError = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
 
             // get modify time
             TimeValue* pTV_modify = nullptr;
-            CPPUNIT_ASSERT( ( pTV_modify = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr );
+            CPPUNIT_ASSERT((pTV_modify = static_cast<TimeValue*>(malloc(sizeof(TimeValue)))) != nullptr);
             *pTV_modify = rFileStatus.getModifyTime();
 
-            bool bOK = t_compareTime( pTV_modify, pTV_current, delta );
+            bool bOK = t_compareTime(pTV_modify, pTV_current, delta);
             // delete file
-            deleteTestFile( aTypeURL );
-            free( pTV_current );
-            free( pTV_modify );
+            deleteTestFile(aTypeURL);
+            free(pTV_current);
+            free(pTV_modify);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for getModifyTime function: This test turns out that UNX pricision is no more than 1 sec, don't know how to improve this function.  ",
-                                    bOK );
+            CPPUNIT_ASSERT_MESSAGE("test for getModifyTime function: This test turns out that UNX pricision is no more than 1 sec, don't know how to improve this function.  ",
+                                    bOK);
         }
 
-        CPPUNIT_TEST_SUITE( getModifyTime );
-            CPPUNIT_TEST( getModifyTime_001 );
+        CPPUNIT_TEST_SUITE(getModifyTime);
+                CPPUNIT_TEST(getModifyTime_001);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
     //  inline sal_uInt64 getFileSize() const
 
-    class  getFileSize : public CppUnit::TestFixture
+    class getFileSize : public CppUnit::TestFixture
     {
     private:
-        OUString         aTypeURL;
-        FileBase::RC     nError;
-        DirectoryItem    rItem;
+        OUString aTypeURL;
+        osl::FileBase::RC nError;
+        DirectoryItem rItem;
 
     public:
-        getFileSize() : nError(FileBase::E_None) {}
+        getFileSize() : nError(osl::FileBase::E_None) {}
 
         void setUp() override
         {
-            aTypeURL = aUserDirectoryURL.copy( 0 );
-            concatURL( aTypeURL, aTmpName2 );
-            createTestFile( aTypeURL );
-            nError = DirectoryItem::get( aTypeURL, rItem );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            aTypeURL = aUserDirectoryURL.copy(0);
+            concatURL(aTypeURL, aTmpName2);
+            createTestFile(aTypeURL);
+            nError = DirectoryItem::get(aTypeURL, rItem);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
         }
 
         void tearDown() override
         {
-            deleteTestFile( aTypeURL );
+            deleteTestFile(aTypeURL);
         }
 
         void getFileSize_001()
         {
-            FileStatus   rFileStatus( osl_FileStatus_Mask_FileSize );
-            nError = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            FileStatus   rFileStatus(osl_FileStatus_Mask_FileSize);
+            nError = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
 
             sal_uInt64 uFileSize = rFileStatus.getFileSize();
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getFileSize function: empty file ",
-                                    static_cast<sal_uInt64>(0), uFileSize );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getFileSize function: empty file ",
+                                    static_cast<sal_uInt64>(0), uFileSize);
         }
 
         void getFileSize_002()
         {
-            File testfile( aTypeURL );
-            nError = testfile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Read );
-            CPPUNIT_ASSERT_EQUAL( nError, FileBase::E_None );
-            nError = testfile.setSize( TEST_FILE_SIZE );
-            CPPUNIT_ASSERT_EQUAL( nError, FileBase::E_None );
-
-            nError = DirectoryItem::get( aTypeURL, rItem );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
-            FileStatus   rFileStatus( osl_FileStatus_Mask_FileSize );
-            nError = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            File testfile(aTypeURL);
+            nError = testfile.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Read);
+            CPPUNIT_ASSERT_EQUAL(nError, osl::FileBase::E_None);
+            nError = testfile.setSize(TEST_FILE_SIZE);
+            CPPUNIT_ASSERT_EQUAL(nError, osl::FileBase::E_None);
+
+            nError = DirectoryItem::get(aTypeURL, rItem);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
+            FileStatus   rFileStatus(osl_FileStatus_Mask_FileSize);
+            nError = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
             sal_uInt64 uFileSize = rFileStatus.getFileSize();
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getFileSize function: file with size of TEST_FILE_SIZE, did not pass in (W32). ",
-                                    static_cast<sal_uInt64>(TEST_FILE_SIZE), uFileSize );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getFileSize function: file with size of TEST_FILE_SIZE, did not pass in (W32). ",
+                                    static_cast<sal_uInt64>(TEST_FILE_SIZE), uFileSize);
         }
 
-        CPPUNIT_TEST_SUITE( getFileSize );
-            CPPUNIT_TEST( getFileSize_001 );
-            CPPUNIT_TEST( getFileSize_002 );
+        CPPUNIT_TEST_SUITE(getFileSize);
+                CPPUNIT_TEST(getFileSize_001);
+                CPPUNIT_TEST(getFileSize_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
@@ -1933,42 +1932,41 @@ namespace osl_FileStatus
     class getFileName : public CppUnit::TestFixture
     {
     private:
-        OUString         aTypeURL;
-        FileBase::RC     nError;
-        DirectoryItem    rItem;
+        OUString aTypeURL;
+        osl::FileBase::RC nError;
+        DirectoryItem rItem;
 
     public:
-        getFileName() : nError(FileBase::E_None) {}
-        // initialization
+        getFileName() : nError(osl::FileBase::E_None) {}
         void setUp() override
         {
-            aTypeURL = aUserDirectoryURL.copy( 0 );
-            concatURL( aTypeURL, aTmpName2 );
-            createTestFile( aTypeURL );
-            nError = DirectoryItem::get( aTypeURL, rItem );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            aTypeURL = aUserDirectoryURL.copy(0);
+            concatURL(aTypeURL, aTmpName2);
+            createTestFile(aTypeURL);
+            nError = DirectoryItem::get(aTypeURL, rItem);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
         }
 
         void tearDown() override
         {
-            deleteTestFile( aTypeURL );
+            deleteTestFile(aTypeURL);
         }
 
-        // test code.
+
         void getFileName_001()
         {
-            FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
-            nError = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            FileStatus rFileStatus(osl_FileStatus_Mask_FileName);
+            nError = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
 
             OUString aFileName = rFileStatus.getFileName();
 
-            CPPUNIT_ASSERT_MESSAGE( "test for getFileName function: name compare with specify",
-                                    compareFileName( aFileName, aTmpName2 ) );
+            CPPUNIT_ASSERT_MESSAGE("test for getFileName function: name compare with specify",
+                                    compareFileName(aFileName, aTmpName2));
         }
 
-        CPPUNIT_TEST_SUITE( getFileName );
-            CPPUNIT_TEST( getFileName_001 );
+        CPPUNIT_TEST_SUITE(getFileName);
+            CPPUNIT_TEST(getFileName_001);
         CPPUNIT_TEST_SUITE_END();
     };
 
@@ -1977,1433 +1975,1433 @@ namespace osl_FileStatus
 
     class getFileURL : public CppUnit::TestFixture
     {
-        FileBase::RC     nError;
-        DirectoryItem    rItem;
+        osl::FileBase::RC nError;
+        DirectoryItem rItem;
 
     public:
-        getFileURL() : nError(FileBase::E_None) {}
+        getFileURL() : nError(osl::FileBase::E_None) {}
+
 
-        // initialization
         void setUp() override
         {
-            createTestFile( aTmpName6 );
-            nError = DirectoryItem::get( aTmpName6, rItem );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+            createTestFile(aTmpName6);
+            nError = DirectoryItem::get(aTmpName6, rItem);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
         }
 
         void tearDown() override
         {
-            deleteTestFile( aTmpName6 );
+            deleteTestFile(aTmpName6);
         }
 
-        // test code.
+
         void getFileURL_001()
         {
-              FileStatus   rFileStatus( osl_FileStatus_Mask_FileURL );
-            nError = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError );
+              FileStatus   rFileStatus(osl_FileStatus_Mask_FileURL);
+            nError = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError);
 
             OUString aFileURL = rFileStatus.getFileURL();
 
-            CPPUNIT_ASSERT_MESSAGE( "test for getFileURL function: ",
-                                    compareFileName( aFileURL, aTmpName6 ) );
+            CPPUNIT_ASSERT_MESSAGE("test for getFileURL function: ",
+                                    compareFileName(aFileURL, aTmpName6));
         }
 
-        CPPUNIT_TEST_SUITE( getFileURL );
-        CPPUNIT_TEST( getFileURL_001 );
+        CPPUNIT_TEST_SUITE(getFileURL);
+            CPPUNIT_TEST(getFileURL_001);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
     //  inline OUString getLinkTargetURL() const
 
-    class  getLinkTargetURL : public CppUnit::TestFixture
+    class getLinkTargetURL : public CppUnit::TestFixture
     {
-        OUString         aTypeURL;
-        FileBase::RC     nError;
-        DirectoryItem    rItem;
+    private:
+        OUString aTypeURL;
+        osl::FileBase::RC nError;
+        DirectoryItem rItem;
 
-        public:
+    public:
+        getLinkTargetURL() : nError(osl::FileBase::E_None) {}
 
-        getLinkTargetURL() : nError(FileBase::E_None) {}
-        // test code.
-        // initialization
         void setUp() override
         {
-            aTypeURL = aUserDirectoryURL.copy( 0 );
-            concatURL( aTypeURL, aTmpName2 );
-            createTestFile( aTypeURL );
+            aTypeURL = aUserDirectoryURL.copy(0);
+            concatURL(aTypeURL, aTmpName2);
+            createTestFile(aTypeURL);
         }
 
         void tearDown() override
         {
-            deleteTestFile( aTypeURL );
+            deleteTestFile(aTypeURL);
         }
 
-#if ( defined UNX )            // Link file is not define in Windows
+#if (defined UNX)            // Link file is not define in Windows
         void getLinkTargetURL_001()
         {
             // create a link file;
-            OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
+            OUString aUStr_LnkFileSys(aTempDirectorySys), aUStr_SrcFileSys(aTempDirectorySys);
             aUStr_LnkFileSys += aSlashURL + getCurrentPID() + "/link.file";
             aUStr_SrcFileSys += aSlashURL + getCurrentPID() + "/tmpname";
 
-                rtl::OString strLinkFileName, strSrcFileName;
-                strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
-                strSrcFileName  = OUStringToOString( aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US );
+                OString strLinkFileName, strSrcFileName;
+                strLinkFileName = OUStringToOString(aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US);
+                strSrcFileName  = OUStringToOString(aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US);
 
             sal_Int32 fd;
-                fd = symlink( strSrcFileName.getStr(), strLinkFileName.getStr() );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "in creating link file",  static_cast<sal_Int32>(0), fd );
+                fd = symlink(strSrcFileName.getStr(), strLinkFileName.getStr());
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("in creating link file",  static_cast<sal_Int32>(0), fd);
 
             // get linkTarget URL
-            nError = DirectoryItem::get( aLnkURL1, rItem );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "in getting link file item", FileBase::E_None, nError );
+            nError = DirectoryItem::get(aLnkURL1, rItem);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("in getting link file item", osl::FileBase::E_None, nError);
 
-              FileStatus   rFileStatus( osl_FileStatus_Mask_LinkTargetURL );
-            nError = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "in getting link file status", FileBase::E_None, nError );
+              FileStatus   rFileStatus(osl_FileStatus_Mask_LinkTargetURL);
+            nError = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("in getting link file status", osl::FileBase::E_None, nError);
             OUString aFileURL = rFileStatus.getLinkTargetURL();
 
             // remove link file
-                fd = remove( strLinkFileName.getStr() );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "in deleting link file",  static_cast<sal_Int32>(0), fd );
+                fd = remove(strLinkFileName.getStr());
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("in deleting link file",  static_cast<sal_Int32>(0), fd);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for getLinkTargetURL function: Solaris version, create a file, and a link file link to it, get its LinkTargetURL and compare",
-                                    compareFileName( aFileURL, aTypeURL ) );
+            CPPUNIT_ASSERT_MESSAGE("test for getLinkTargetURL function: Solaris version, create a file, and a link file link to it, get its LinkTargetURL and compare",
+                                    compareFileName(aFileURL, aTypeURL));
         }
 #else
         void getLinkTargetURL_001()
         {
-            CPPUNIT_ASSERT_MESSAGE( "test for getLinkTargetURL function: Windows version, not tested",
-                                    1 );
+            CPPUNIT_ASSERT_MESSAGE("test for getLinkTargetURL function: Windows version, not tested",
+                                    1);
         }
 #endif
 
-        CPPUNIT_TEST_SUITE( getLinkTargetURL );
-        CPPUNIT_TEST( getLinkTargetURL_001 );
+        CPPUNIT_TEST_SUITE(getLinkTargetURL);
+            CPPUNIT_TEST(getLinkTargetURL_001);
         CPPUNIT_TEST_SUITE_END();
     };
 
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::ctors, "osl_FileStatus" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::isValid, "osl_FileStatus" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::getFileType, "osl_FileStatus" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::getAttributes, "osl_FileStatus" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::getAccessTime, "osl_FileStatus" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::getModifyTime, "osl_FileStatus" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::getFileSize, "osl_FileStatus" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::getFileName, "osl_FileStatus" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::getFileURL, "osl_FileStatus" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::getLinkTargetURL, "osl_FileStatus" );
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileStatus::ctors, "osl_FileStatus");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileStatus::isValid, "osl_FileStatus");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileStatus::getFileType, "osl_FileStatus");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileStatus::getAttributes, "osl_FileStatus");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileStatus::getAccessTime, "osl_FileStatus");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileStatus::getModifyTime, "osl_FileStatus");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileStatus::getFileSize, "osl_FileStatus");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileStatus::getFileName, "osl_FileStatus");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileStatus::getFileURL, "osl_FileStatus");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileStatus::getLinkTargetURL, "osl_FileStatus");
 }
 
 namespace osl_File
 {
 
     //  testing the method
-    //  File( const OUString& ustrFileURL )
+    //  File(const OUString& ustrFileURL)
 
-    class  ctors : public CppUnit::TestFixture
+    class ctors : public CppUnit::TestFixture
     {
-        // FileBase::RC     nError1;
-
-        public:
-        // initialization
+    public:
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
         void ctors_001()
         {
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
 
-            FileBase::RC nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            FileBase::RC nError2 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for ctors function: initialize a File and test its open and close",
-                                     FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for ctors function: initialize a File and test its open and close",
-                                     FileBase::E_None, nError2 );
+            osl::FileBase::RC nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            osl::FileBase::RC nError2 = testFile.close();
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: initialize a File and test its open and close",
+                                     osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: initialize a File and test its open and close",
+                                     osl::FileBase::E_None, nError2);
         }
 
         void ctors_002()
         {
-            File testFile( aTmpName5 );
+            File testFile(aTmpName5);
             sal_Char buffer[30] = "Test for File constructor";
             sal_uInt64 nCount;
 
-                FileBase::RC nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-                FileBase::RC nError2 = testFile.write( buffer, 30, nCount );
+                osl::FileBase::RC nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+                osl::FileBase::RC nError2 = testFile.write(buffer, 30, nCount);
             testFile.close();
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for ctors function: test relative file URL, this test show that relative file URL is also acceptable",
-                                     FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for ctors function: test relative file URL, this test show that relative file URL is also acceptable",
-                                     FileBase::E_None, nError2 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: test relative file URL, this test show that relative file URL is also acceptable",
+                                     osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: test relative file URL, this test show that relative file URL is also acceptable",
+                                     osl::FileBase::E_None, nError2);
         }
 
-        CPPUNIT_TEST_SUITE( ctors );
-        CPPUNIT_TEST( ctors_001 );
-        CPPUNIT_TEST( ctors_002 );
+        CPPUNIT_TEST_SUITE(ctors);
+            CPPUNIT_TEST(ctors_001);
+            CPPUNIT_TEST(ctors_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline RC open( sal_uInt32 uFlags )
+    //  inline RC open(sal_uInt32 uFlags)
 
-    class  open : public CppUnit::TestFixture
+    class open : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2, nError3;
+    private:
+        osl::FileBase::RC nError1, nError2, nError3;
 
-        public:
+    public:
         open()
-            : nError1(FileBase::E_None)
-            , nError2(FileBase::E_None)
-            , nError3(FileBase::E_None) {}
-        // initialization
+            : nError1(osl::FileBase::E_None)
+            , nError2(osl::FileBase::E_None)
+            , nError3(osl::FileBase::E_None) {}
+
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
+
         void open_001()
         {
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
             nError2 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL_MESSAGE("close error", nError2, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("close error", nError2, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for open function: open a regular file",
-                                     nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: open a regular file",
+                                     nError1, osl::FileBase::E_None);
         }
 
         void open_002()
         {
-            File testFile( aTmpName3 );
+            File testFile(aTmpName3);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read );
+            nError1 = testFile.open(osl_File_OpenFlag_Read);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for open function: open a directory",
-                                     ( File::E_INVAL == nError1 ) || ( File::E_ACCES == nError1 ) );
+            CPPUNIT_ASSERT_MESSAGE("test for open function: open a directory",
+                                     (File::E_INVAL == nError1) || (File::E_ACCES == nError1));
         }
 
         void open_003()
         {
-            File testFile( aCanURL1 );
+            File testFile(aCanURL1);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for open function: open a non-exist file",
-                                     nError1, File::E_NOENT );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: open a non-exist file",
+                                     nError1, File::E_NOENT);
         }
 
         void open_004()
         {
-            OUString  aTestFile( aRootURL );
-            concatURL( aTestFile, aTmpName2 );
-            File testFile( aTestFile );
+            OUString  aTestFile(aRootURL);
+            concatURL(aTestFile, aTmpName2);
+            File testFile(aTestFile);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Create );
-            bool bOK = ( File::E_ACCES == nError1 );
+            nError1 = testFile.open(osl_File_OpenFlag_Create);
+            bool bOK = (File::E_ACCES == nError1);
 #ifdef _WIN32
             bOK = true;  /// in Windows, you can create file in c:\ any way.
             testFile.close();
-            deleteTestFile( aTestFile);
+            deleteTestFile(aTestFile);
 #endif
 
-            CPPUNIT_ASSERT_MESSAGE( "test for open function: create an illegal file",
-                                    bOK );
+            CPPUNIT_ASSERT_MESSAGE("test for open function: create an illegal file",
+                                    bOK);
         }
 
         void open_005()
         {
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Create );
+            nError1 = testFile.open(osl_File_OpenFlag_Create);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for open function: create an exist file",
-                                     nError1, File::E_EXIST );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: create an exist file",
+                                     nError1, File::E_EXIST);
         }
 
         void open_006()
         {
-            File testFile( aCanURL1 );
+            File testFile(aCanURL1);
             sal_Char buffer_write[30] = "Test for File open";
             sal_Char buffer_read[30];
             sal_uInt64 nCount_write, nCount_read;
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
-            nError2 = testFile.write( buffer_write, 30, nCount_write );
-             FileBase::RC nError4 = testFile.setPos( osl_Pos_Absolut, 0 );
-            CPPUNIT_ASSERT_EQUAL( nError4, FileBase::E_None );
-            nError3 = testFile.read( buffer_read, 10, nCount_read );
-
-             FileBase::RC nError5 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError5, FileBase::E_None );
-            FileBase::RC nError6 = osl::File::remove( aCanURL1 );
-            CPPUNIT_ASSERT_EQUAL( nError6, FileBase::E_None );
-
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for open function: test for osl_File_OpenFlag_Read, osl_File_OpenFlag_Write and osl_File_OpenFlag_Create",
-                                    FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for open function: test for osl_File_OpenFlag_Read, osl_File_OpenFlag_Write and osl_File_OpenFlag_Create",
-                                    FileBase::E_None, nError2 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for open function: test for osl_File_OpenFlag_Read, osl_File_OpenFlag_Write and osl_File_OpenFlag_Create",
-                                    FileBase::E_None, nError3 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for open function: test for osl_File_OpenFlag_Read, osl_File_OpenFlag_Write and osl_File_OpenFlag_Create",
-                                    sal_uInt64(30), nCount_write );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for open function: test for osl_File_OpenFlag_Read, osl_File_OpenFlag_Write and osl_File_OpenFlag_Create",
-                                    sal_uInt64(10), nCount_read );
-        }
-
-        CPPUNIT_TEST_SUITE( open );
-        CPPUNIT_TEST( open_001 );
-        CPPUNIT_TEST( open_002 );
-        CPPUNIT_TEST( open_003 );
-        CPPUNIT_TEST( open_004 );
-        CPPUNIT_TEST( open_005 );
-        CPPUNIT_TEST( open_006 );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
+            nError2 = testFile.write(buffer_write, 30, nCount_write);
+            osl::FileBase::RC nError4 = testFile.setPos(osl_Pos_Absolut, 0);
+            CPPUNIT_ASSERT_EQUAL(nError4, osl::FileBase::E_None);
+            nError3 = testFile.read(buffer_read, 10, nCount_read);
+
+            osl::FileBase::RC nError5 = testFile.close();
+            CPPUNIT_ASSERT_EQUAL(nError5, osl::FileBase::E_None);
+            osl::FileBase::RC nError6 = osl::File::remove(aCanURL1);
+            CPPUNIT_ASSERT_EQUAL(nError6, osl::FileBase::E_None);
+
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: test for osl_File_OpenFlag_Read, osl_File_OpenFlag_Write and osl_File_OpenFlag_Create",
+                                    osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: test for osl_File_OpenFlag_Read, osl_File_OpenFlag_Write and osl_File_OpenFlag_Create",
+                                    osl::FileBase::E_None, nError2);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: test for osl_File_OpenFlag_Read, osl_File_OpenFlag_Write and osl_File_OpenFlag_Create",
+                                    osl::FileBase::E_None, nError3);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: test for osl_File_OpenFlag_Read, osl_File_OpenFlag_Write and osl_File_OpenFlag_Create",
+                                    sal_uInt64(30), nCount_write);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: test for osl_File_OpenFlag_Read, osl_File_OpenFlag_Write and osl_File_OpenFlag_Create",
+                                    sal_uInt64(10), nCount_read);
+        }
+
+        CPPUNIT_TEST_SUITE(open);
+            CPPUNIT_TEST(open_001);
+            CPPUNIT_TEST(open_002);
+            CPPUNIT_TEST(open_003);
+            CPPUNIT_TEST(open_004);
+            CPPUNIT_TEST(open_005);
+            CPPUNIT_TEST(open_006);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
     //  inline RC close()
 
-    class  close : public CppUnit::TestFixture
+    class close : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2, nError3;
+    private:
+        osl::FileBase::RC nError1, nError2, nError3;
 
-        public:
+    public:
         close()
-            : nError1(FileBase::E_None)
-            , nError2(FileBase::E_None)
-            , nError3(FileBase::E_None) {}
-        // initialization
+            : nError1(osl::FileBase::E_None)
+            , nError2(osl::FileBase::E_None)
+            , nError3(osl::FileBase::E_None) {}
+
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
+
         void close_001()
         {
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             nError2 = testFile.close();
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for close function: close a regular file",
-                                     nError2, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for close function: close a regular file",
+                                     nError2, osl::FileBase::E_None);
         }
 
         void close_002()
         {
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             nError2 = testFile.close();
 
-             nError3 = testFile.setPos( osl_Pos_Absolut, 0 );
+             nError3 = testFile.setPos(osl_Pos_Absolut, 0);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for close function: manipulate a file after it has been closed",
-                                     FileBase::E_None, nError2 );
-            CPPUNIT_ASSERT_MESSAGE( "test for close function: manipulate a file after it has been closed",
-                                    ( FileBase::E_None != nError3 ) );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for close function: manipulate a file after it has been closed",
+                                     osl::FileBase::E_None, nError2);
+            CPPUNIT_ASSERT_MESSAGE("test for close function: manipulate a file after it has been closed",
+                                    (osl::FileBase::E_None != nError3));
         }
 
-        CPPUNIT_TEST_SUITE( close );
-        CPPUNIT_TEST( close_001 );
-        CPPUNIT_TEST( close_002 );
+        CPPUNIT_TEST_SUITE(close);
+            CPPUNIT_TEST(close_001);
+            CPPUNIT_TEST(close_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline RC setPos( sal_uInt32 uHow, sal_Int64 uPos )
+    //  inline RC setPos(sal_uInt32 uHow, sal_Int64 uPos)
 
-    class  setPos : public CppUnit::TestFixture
+    class setPos : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1;
+    private:
+        osl::FileBase::RC nError1;
         sal_uInt64 nCount_write, nCount_read;
 
-        public:
+    public:
         setPos()
-            : nError1(FileBase::E_None)
+            : nError1(osl::FileBase::E_None)
             , nCount_write(0)
             , nCount_read(0)
         {
         }
 
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
 
             // write chars into the file.
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
              nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
         void setPos_001()
         {
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
             sal_Char buffer_read[2];
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-             nError1 = testFile.setPos( osl_Pos_Absolut, 26 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.read( buffer_read, 1, nCount_read );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.setPos(osl_Pos_Absolut, 26);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.read(buffer_read, 1, nCount_read);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for setPos function: test for osl_Pos_Absolut, set the position to 26, test if the 26th char in file is correct",
-                                     pBuffer_Char[26], buffer_read[0] );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setPos function: test for osl_Pos_Absolut, set the position to 26, test if the 26th char in file is correct",
+                                     pBuffer_Char[26], buffer_read[0]);
         }
 
         void setPos_002()
         {
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
             sal_Char buffer_read[2];
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-             nError1 = testFile.setPos( osl_Pos_Absolut, sizeof( pBuffer_Char ) - 2 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-             nError1 = testFile.setPos( osl_Pos_Current, 0);
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.read( buffer_read, 1, nCount_read );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.setPos(osl_Pos_Absolut, sizeof(pBuffer_Char) - 2);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.setPos(osl_Pos_Current, 0);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.read(buffer_read, 1, nCount_read);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for setPos function: test for osl_Pos_Current, set the position to end, test if the ( end -1 ) char in file is correct",
-                                     pBuffer_Char[sizeof( pBuffer_Char ) - 2], buffer_read[0] );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setPos function: test for osl_Pos_Current, set the position to end, test if the (end -1) char in file is correct",
+                                     pBuffer_Char[sizeof(pBuffer_Char) - 2], buffer_read[0]);
         }
 
         void setPos_003()
         {
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
             sal_Char buffer_read[2];
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             // the file size is smaller than 100
-            nError1 = testFile.setPos( osl_Pos_End,  -100 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "should return error", nError1, FileBase::E_INVAL );
+            nError1 = testFile.setPos(osl_Pos_End,  -100);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("should return error", nError1, osl::FileBase::E_INVAL);
 
-             nError1 = testFile.setPos( osl_Pos_End, -53 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.read( buffer_read, 1, nCount_read );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.setPos(osl_Pos_End, -53);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.read(buffer_read, 1, nCount_read);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for setPos function: test for osl_Pos_End, set the position to end, test if the first char in file is correct",
-                                     pBuffer_Char[0], buffer_read[0] );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setPos function: test for osl_Pos_End, set the position to end, test if the first char in file is correct",
+                                     pBuffer_Char[0], buffer_read[0]);
         }
 
-        CPPUNIT_TEST_SUITE( setPos );
-        CPPUNIT_TEST( setPos_001 );
-        CPPUNIT_TEST( setPos_002 );
-        CPPUNIT_TEST( setPos_003 );
+        CPPUNIT_TEST_SUITE(setPos);
+            CPPUNIT_TEST(setPos_001);
+            CPPUNIT_TEST(setPos_002);
+            CPPUNIT_TEST(setPos_003);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline RC getPos( sal_uInt64& uPos )
+    //  inline RC getPos(sal_uInt64& uPos)
 
-    class  getPos : public CppUnit::TestFixture
+    class getPos : public CppUnit::TestFixture
     {
-        FileBase::RC      nError1;
+    private:
+        osl::FileBase::RC nError1;
         sal_uInt64 nCount_write;
 
-        public:
+    public:
         getPos()
-            : nError1(FileBase::E_None)
+            : nError1(osl::FileBase::E_None)
             , nCount_write(0)
         {
         }
 
-        // initialization
+
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
 
             // write chars into the file.
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.close();
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
+
         void getPos_001()
         {
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
             sal_uInt64 nFilePointer;
 
-            nError1 = testFile.getPos( nFilePointer );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_INVAL );
+            nError1 = testFile.getPos(nFilePointer);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_INVAL);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-             nError1 = testFile.setPos( osl_Pos_Absolut, 26 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-             nError1 = testFile.getPos( nFilePointer );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.setPos(osl_Pos_Absolut, 26);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.getPos(nFilePointer);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getPos function: set the position to 26, get position and check if it is right",
-                                     static_cast<sal_uInt64>(26), nFilePointer );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getPos function: set the position to 26, get position and check if it is right",
+                                     static_cast<sal_uInt64>(26), nFilePointer);
         }
 
-        CPPUNIT_TEST_SUITE( getPos );
-        CPPUNIT_TEST( getPos_001 );
+        CPPUNIT_TEST_SUITE(getPos);
+            CPPUNIT_TEST(getPos_001);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline RC isEndOfFile( sal_Bool *pIsEOF )
+    //  inline RC isEndOfFile(sal_Bool *pIsEOF)
 
-    class  isEndOfFile : public CppUnit::TestFixture
+    class isEndOfFile : public CppUnit::TestFixture
     {
-        FileBase::RC      nError1;
+    private:
+        osl::FileBase::RC nError1;
         sal_uInt64 nCount_write;
 
-        public:
+    public:
         isEndOfFile()
-            : nError1(FileBase::E_None)
+            : nError1(osl::FileBase::E_None)
             , nCount_write(0)
         {
         }
 
-        // initialization
+
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
 
             // write chars into the file.
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
              nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
+
         void isEndOfFile_001()
         {
-            File   testFile( aTmpName4 );
+            File   testFile(aTmpName4);
             sal_Bool      bEOF  = false;
             sal_Bool      *pEOF = &bEOF;
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-             nError1 = testFile.setPos( osl_Pos_End, 0 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.isEndOfFile( pEOF );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.setPos(osl_Pos_End, 0);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.isEndOfFile(pEOF);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for isEndOfFile function: set the position to end, check if reach end",
-                                     *pEOF );
+            CPPUNIT_ASSERT_MESSAGE("test for isEndOfFile function: set the position to end, check if reach end",
+                                     *pEOF);
         }
 
         void isEndOfFile_002()
         {
-             File   testFile( aTmpName4 );
+            File   testFile(aTmpName4);
             sal_Bool      bEOF  = false;
             sal_Bool      *pEOF = &bEOF;
             sal_uInt64    nFilePointer = 0;
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-             nError1 = testFile.setPos( osl_Pos_Absolut, 0 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.setPos(osl_Pos_Absolut, 0);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             *pEOF = false;
-             while ( !( *pEOF ) )
+
+            while (!(*pEOF))
             {
-                nError1 = testFile.isEndOfFile( pEOF );
-                CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-                nError1 = testFile.setPos( osl_Pos_Current, 1 );
-                CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+                nError1 = testFile.isEndOfFile(pEOF);
+                CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+                nError1 = testFile.setPos(osl_Pos_Current, 1);
+                CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             }
-            nError1 = testFile.getPos( nFilePointer );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+
+            nError1 = testFile.getPos(nFilePointer);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for isEndOfFile function: use isEndOfFile to move pointer step by step",
-                                      nFilePointer, static_cast<sal_uInt64>(sizeof( pBuffer_Char ) + 1) );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for isEndOfFile function: use isEndOfFile to move pointer step by step",
+                                      nFilePointer, static_cast<sal_uInt64>(sizeof(pBuffer_Char) + 1));
         }
-        CPPUNIT_TEST_SUITE( isEndOfFile );
-        CPPUNIT_TEST( isEndOfFile_001 );
-        CPPUNIT_TEST( isEndOfFile_002 );
+        CPPUNIT_TEST_SUITE(isEndOfFile);
+            CPPUNIT_TEST(isEndOfFile_001);
+            CPPUNIT_TEST(isEndOfFile_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline RC setSize( sal_uInt64 uSize )
+    //  inline RC setSize(sal_uInt64 uSize)
 
-    class  setSize : public CppUnit::TestFixture
+    class setSize : public CppUnit::TestFixture
     {
-        FileBase::RC      nError1;
+    private:
+        osl::FileBase::RC nError1;
         sal_uInt64 nCount_write;
 
-        public:
+    public:
         setSize()
-            : nError1(FileBase::E_None)
+            : nError1(osl::FileBase::E_None)
             , nCount_write(0)
         {
         }
 
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
 
             // write chars into the file.
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.close();
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
+
         void setSize_001()
         {
-            File   testFile( aTmpName4 );
+            File   testFile(aTmpName4);
             // sal_Bool      bEOF  = sal_False;
             // sal_Bool      *pEOF = &bEOF;
             sal_uInt64     nFilePointer;
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             // enlarge the file to size of 100;
-             nError1 = testFile.setSize( 100 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.setSize(100);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             // get the file size;
-             nError1 = testFile.setPos( osl_Pos_End, 0 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-             nError1 = testFile.getPos( nFilePointer );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.setPos(osl_Pos_End, 0);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.getPos(nFilePointer);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for setSize function: enlarge the file ",
-                                     static_cast<sal_uInt64>(100), nFilePointer );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setSize function: enlarge the file ",
+                                     static_cast<sal_uInt64>(100), nFilePointer);
         }
 
         void setSize_002()
         {
-            File   testFile( aTmpName4 );
+            File   testFile(aTmpName4);
             sal_uInt64     nFilePointer;
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             // enlarge the file to size of 100;
-             nError1 = testFile.setSize( 10 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.setSize(10);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             // get the file size;
-             nError1 = testFile.setPos( osl_Pos_End, 0 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-             nError1 = testFile.getPos( nFilePointer );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.setPos(osl_Pos_End, 0);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.getPos(nFilePointer);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for setSize function: truncate the file ",
-                                     static_cast<sal_uInt64>(10), nFilePointer );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setSize function: truncate the file ",
+                                     static_cast<sal_uInt64>(10), nFilePointer);
         }
 
-        CPPUNIT_TEST_SUITE( setSize );
-        CPPUNIT_TEST( setSize_001 );
-        CPPUNIT_TEST( setSize_002 );
+        CPPUNIT_TEST_SUITE(setSize);
+            CPPUNIT_TEST(setSize_001);
+            CPPUNIT_TEST(setSize_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline RC read( void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64& rBytesRead )
+    //  inline RC read(void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64& rBytesRead)
 
-    class  read : public CppUnit::TestFixture
+    class read : public CppUnit::TestFixture
     {
-        FileBase::RC      nError1;
+    private:
+        osl::FileBase::RC nError1;
         sal_uInt64 nCount_write, nCount_read;
 
-        public:
+    public:
         read()
-            : nError1(FileBase::E_None)
+            : nError1(osl::FileBase::E_None)
             , nCount_write(0)
             , nCount_read(0)
         {
         }
-        // initialization
+
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
 
             // write chars into the file.
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.close();
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
+
         void read_001()
         {
-            File    testFile( aTmpName4 );
-            sal_uInt64     nFilePointer;
-            sal_Char       buffer_read[10];
+            File testFile(aTmpName4);
+            sal_uInt64 nFilePointer;
+            sal_Char buffer_read[10];
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            nError1 = testFile.read( buffer_read, 10, nCount_read );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-             nError1 = testFile.getPos( nFilePointer );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.read(buffer_read, 10, nCount_read);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.getPos(nFilePointer);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for read function: read whole content in the file to a buffer",
-                                     sal_uInt64(10), nFilePointer );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for read function: read whole content in the file to a buffer",
-                                     0, strncmp( buffer_read, pBuffer_Char, 10 ) );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for read function: read whole content in the file to a buffer",
+                                     sal_uInt64(10), nFilePointer);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for read function: read whole content in the file to a buffer",
+                                     0, strncmp(buffer_read, pBuffer_Char, 10));
         }
 
         void read_002()
         {
-            File    testFile( aTmpName4 );
-            sal_uInt64     nFilePointer;
-            sal_Char       buffer_read[26];
+            File testFile(aTmpName4);
+            sal_uInt64 nFilePointer;
+            sal_Char buffer_read[26];
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-             nError1 = testFile.setPos( osl_Pos_Absolut, 26 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.read( buffer_read, 26, nCount_read );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-             nError1 = testFile.getPos( nFilePointer );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.setPos(osl_Pos_Absolut, 26);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.read(buffer_read, 26, nCount_read);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.getPos(nFilePointer);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for read function: read from a special position in the file",
-                                     sal_uInt64(52), nFilePointer );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for read function: read from a special position in the file",
-                                     sal_uInt64(26), nCount_read );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for read function: read from a special position in the file",
-                                     0, strncmp( buffer_read, &pBuffer_Char[26], 26 ) );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for read function: read from a special position in the file",
+                                     sal_uInt64(52), nFilePointer);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for read function: read from a special position in the file",
+                                     sal_uInt64(26), nCount_read);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for read function: read from a special position in the file",
+                                     0, strncmp(buffer_read, &pBuffer_Char[26], 26));
         }
 
-        CPPUNIT_TEST_SUITE( read );
-        CPPUNIT_TEST( read_001 );
-        CPPUNIT_TEST( read_002 );
+        CPPUNIT_TEST_SUITE(read);
+            CPPUNIT_TEST(read_001);
+            CPPUNIT_TEST(read_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
     //  inline RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten)
 
-    class  write : public CppUnit::TestFixture
+    class write : public CppUnit::TestFixture
     {
-        FileBase::RC      nError1;
+        osl::FileBase::RC nError1;
         sal_uInt64 nCount_write, nCount_read;
 
-        public:
+    public:
         write()
-            : nError1(FileBase::E_None)
+            : nError1(osl::FileBase::E_None)
             , nCount_write(0)
             , nCount_read(0)
         {
         }
 
-        // initialization
+
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpname.
-            createTestFile( aTmpName6 );
+            createTestFile(aTmpName6);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpname.
-            deleteTestFile( aTmpName6 );
+            deleteTestFile(aTmpName6);
         }
 
-        // test code.
+
         void write_001()
         {
-            File    testFile( aTmpName6 );
-            sal_uInt64     nFilePointer;
-            sal_Char       buffer_read[10];
+            File testFile(aTmpName6);
+            sal_uInt64 nFilePointer;
+            sal_Char buffer_read[10];
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             // write chars into the file.
-            nError1 = testFile.write( pBuffer_Char, 10, nCount_write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.write(pBuffer_Char, 10, nCount_write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             // get the current pointer;
-             nError1 = testFile.getPos( nFilePointer );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+             nError1 = testFile.getPos(nFilePointer);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             // reset pointer to the beginning;
-             nError1 = testFile.setPos( osl_Pos_Absolut, 0 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.read( buffer_read, 10, nCount_read );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+             nError1 = testFile.setPos(osl_Pos_Absolut, 0);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.read(buffer_read, 10, nCount_read);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for write function: read whole content in the file to a buffer. Note, buffer size can not smaller than the read size",
-                                     sal_uInt64(10), nFilePointer );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for write function: read whole content in the file to a buffer. Note, buffer size can not smaller than the read size",
-                                    0, strncmp( buffer_read, pBuffer_Char, 10 ) );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for write function: read whole content in the file to a buffer. Note, buffer size can not smaller than the read size",
-                                    sal_uInt64(10), nCount_write );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for write function: read whole content in the file to a buffer. Note, buffer size can not smaller than the read size",
+                                     sal_uInt64(10), nFilePointer);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for write function: read whole content in the file to a buffer. Note, buffer size can not smaller than the read size",
+                                    0, strncmp(buffer_read, pBuffer_Char, 10));
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for write function: read whole content in the file to a buffer. Note, buffer size can not smaller than the read size",
+                                    sal_uInt64(10), nCount_write);
         }
 
-        CPPUNIT_TEST_SUITE( write );
-        CPPUNIT_TEST( write_001 );
+        CPPUNIT_TEST_SUITE(write);
+            CPPUNIT_TEST(write_001);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline RC readLine( ::rtl::ByteSequence& aSeq )
+    //  inline RC readLine(::ByteSequence& aSeq)
 
-    class  readLine : public CppUnit::TestFixture
+    class readLine : public CppUnit::TestFixture
     {
-        FileBase::RC      nError1;
+        osl::FileBase::RC nError1;
         sal_uInt64 nCount_write;
-        ::rtl::ByteSequence      aSequence;
+        rtl::ByteSequence aSequence;
 
-        public:
+    public:
         readLine()
-            : nError1(FileBase::E_None)
+            : nError1(osl::FileBase::E_None)
             , nCount_write(0)
         {
         }
-        // initialization
+
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpname.
-            createTestFile( aTmpName6 );
+            createTestFile(aTmpName6);
 
             // write some strings into the file.
-            File testFile( aTmpName6 );
+            File testFile(aTmpName6);
             sal_Char ppStrSeq[3][27]  =  { "abcde\n",
                                         "1234567890\n",
                                         "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                                       };
 
-            nError1 = testFile.open( osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            for ( int nCount = 0; nCount < 3; nCount++ )
+            for (int nCount = 0; nCount < 3; nCount++)
             {
-                nError1 = testFile.write( ppStrSeq[nCount], strlen( ppStrSeq[nCount] ), nCount_write );
-                CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+                nError1 = testFile.write(ppStrSeq[nCount], strlen(ppStrSeq[nCount]), nCount_write);
+                CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             }
 
              nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpname.
-            deleteTestFile( aTmpName6 );
+            deleteTestFile(aTmpName6);
         }
 
-        // test code.
+
         void readLine_001()
         {
-             File    testFile( aTmpName6 );
+            File testFile(aTmpName6);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.readLine( aSequence );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for readLine function: read the first line of the file.",
-                                    FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for readLine function: read the first line of the file.",
-                                    0, strncmp( reinterpret_cast<char *>(aSequence.getArray()), pBuffer_Char, 5 ) );
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.readLine(aSequence);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for readLine function: read the first line of the file.",
+                                    osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for readLine function: read the first line of the file.",
+                                    0, strncmp(reinterpret_cast<char *>(aSequence.getArray()), pBuffer_Char, 5));
         }
 
         void readLine_002()
         {
-            File testFile( aTmpName6 );
+            File testFile(aTmpName6);
             sal_Bool bEOF  = false;
             sal_Bool *pEOF = &bEOF;
 
-            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            for ( int nCount = 0; nCount < 3; nCount++ )
+            nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            for (int nCount = 0; nCount < 3; nCount++)
             {
-                nError1 = testFile.readLine( aSequence );
-                CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+                nError1 = testFile.readLine(aSequence);
+                CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             }
-             nError1 = testFile.isEndOfFile( pEOF );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.isEndOfFile(pEOF);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for readLine function: read three lines of the file and check the file pointer moving.",
-                                     *pEOF );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for readLine function: read three lines of the file and check the file pointer moving.",
-                                    0, strncmp( reinterpret_cast<char *>(aSequence.getArray()), &pBuffer_Char[26], 26 ) );
+            CPPUNIT_ASSERT_MESSAGE("test for readLine function: read three lines of the file and check the file pointer moving.",
+                                     *pEOF);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for readLine function: read three lines of the file and check the file pointer moving.",
+                                    0, strncmp(reinterpret_cast<char *>(aSequence.getArray()), &pBuffer_Char[26], 26));
         }
-        CPPUNIT_TEST_SUITE( readLine );
-        CPPUNIT_TEST( readLine_001 );
-        CPPUNIT_TEST( readLine_002 );
+        CPPUNIT_TEST_SUITE(readLine);
+            CPPUNIT_TEST(readLine_001);
+            CPPUNIT_TEST(readLine_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline static RC copy( const OUString& ustrSourceFileURL, const OUString& ustrDestFileURL )
+    //  inline static RC copy(const OUString& ustrSourceFileURL, const OUString& ustrDestFileURL)
 
-    class  copy : public CppUnit::TestFixture
+    class copy : public CppUnit::TestFixture
     {
-        FileBase::RC      nError1;
+        osl::FileBase::RC nError1;
         sal_uInt64 nCount_write;
 
-        public:
+    public:
         copy()
-            : nError1(FileBase::E_None)
+            : nError1(osl::FileBase::E_None)
             , nCount_write(0)
         {
         }
 
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
 
             // write chars into the file.
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
              nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
         void copy_001()
         {
-             File    testFile( aTmpName6 );
+             File    testFile(aTmpName6);
 
             // copy $TEMP/tmpdir/tmpname to $TEMP/tmpname.
-            nError1 = File::copy( aTmpName4, aTmpName6 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = File::copy(aTmpName4, aTmpName6);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             // check
-            nError1 = testFile.open( osl_File_OpenFlag_Create );
-            deleteTestFile( aTmpName6 );
+            nError1 = testFile.open(osl_File_OpenFlag_Create);
+            deleteTestFile(aTmpName6);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for copy function: copy file to upper directory",
-                                     nError1, FileBase::E_EXIST );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for copy function: copy file to upper directory",
+                                     nError1, osl::FileBase::E_EXIST);
         }
 
         void copy_002()
         {
             // copy $TEMP/tmpdir/tmpname to $TEMP/tmpdir.
-            nError1 = File::copy( aTmpName4, aTmpName3 );
+            nError1 = File::copy(aTmpName4, aTmpName3);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for copy function: use directory as destination",
-                                     ( FileBase::E_ISDIR == nError1 ) ||( FileBase::E_ACCES == nError1 )  );
+            CPPUNIT_ASSERT_MESSAGE("test for copy function: use directory as destination",
+                                     (osl::FileBase::E_ISDIR == nError1) ||(osl::FileBase::E_ACCES == nError1));
         }
 
         void copy_003()
         {
             // copy $TEMP/tmpdir/tmpname to $ROOT/tmpname.
-            nError1 = File::copy( aTmpName4, aTmpName7 );
+            nError1 = File::copy(aTmpName4, aTmpName7);
 #if defined(_WIN32)
-            nError1 = FileBase::E_ACCES;  /// for Windows, c:\ is writable anyway.
-            deleteTestFile( aTmpName7);
+            nError1 = osl::FileBase::E_ACCES;  /// for Windows, c:\ is writable anyway.
+            deleteTestFile(aTmpName7);
 #endif
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for copy function: copy to an illegal place",
-                                     nError1, FileBase::E_ACCES );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for copy function: copy to an illegal place",
+                                     nError1, osl::FileBase::E_ACCES);
         }
 
         void copy_004()
         {
             // copy $TEMP/tmpname to $TEMP/tmpdir/tmpname.
-            nError1 = File::copy( aTmpName6, aTmpName4 );
+            nError1 = File::copy(aTmpName6, aTmpName4);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for copy function: copy a not exist file",
-                                     nError1, FileBase::E_NOENT );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for copy function: copy a not exist file",
+                                     nError1, osl::FileBase::E_NOENT);
         }
 
         void copy_005()
         {
             // copy $TEMP/tmpname to $TEMP/system.path using system path.
-            nError1 = File::copy( aTmpName6, aSysPath1 );
-
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for copy function: copy a file using system file path",
-                                     nError1, FileBase::E_INVAL );
-        }
-      void copy_006()
-      {
-        createTestFile( aTmpName6 );
-        File tmpFile( aTmpName6 );
-        FileBase::RC err = tmpFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Read );
-        (void)err;
-        tmpFile.setSize( 200 );
-        tmpFile.close();
-        // copy to new path
-        nError1 = File::copy( aTmpName6, aTmpName4 );
-        CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError1 );
-
-        // check if is the new file
-        File newFile( aTmpName4 );
-        newFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Read );
-        nError1 = newFile.setPos( osl_Pos_End, 0 );
-        CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-        sal_uInt64     nFilePointer;
-        nError1 = newFile.getPos( nFilePointer );
-        CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-        newFile.close();
-        deleteTestFile( aTmpName6 );
-        CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for copy function: the dest file exist",
-                    static_cast<sal_uInt64>(200), nFilePointer );
-      }
-
-        CPPUNIT_TEST_SUITE( copy );
-        CPPUNIT_TEST( copy_001 );
-        CPPUNIT_TEST( copy_002 );
-        CPPUNIT_TEST( copy_003 );
-        CPPUNIT_TEST( copy_004 );
-        CPPUNIT_TEST( copy_005 );
-        CPPUNIT_TEST( copy_006 );
+            nError1 = File::copy(aTmpName6, aSysPath1);
+
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for copy function: copy a file using system file path",
+                                     nError1, osl::FileBase::E_INVAL);
+        }
+
+        void copy_006()
+        {
+            createTestFile(aTmpName6);
+            File tmpFile(aTmpName6);
+            osl::FileBase::RC err = tmpFile.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Read);
+            (void)err;
+            tmpFile.setSize(200);
+            tmpFile.close();
+            // copy to new path
+            nError1 = File::copy(aTmpName6, aTmpName4);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
+
+            // check if is the new file
+            File newFile(aTmpName4);
+            newFile.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Read);
+            nError1 = newFile.setPos(osl_Pos_End, 0);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            sal_uInt64     nFilePointer;
+            nError1 = newFile.getPos(nFilePointer);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            newFile.close();
+            deleteTestFile(aTmpName6);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for copy function: the dest file exist",
+                        static_cast<sal_uInt64>(200), nFilePointer);
+        }
+
+        CPPUNIT_TEST_SUITE(copy);
+            CPPUNIT_TEST(copy_001);
+            CPPUNIT_TEST(copy_002);
+            CPPUNIT_TEST(copy_003);
+            CPPUNIT_TEST(copy_004);
+            CPPUNIT_TEST(copy_005);
+            CPPUNIT_TEST(copy_006);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline static RC move( const OUString& ustrSourceFileURL, const OUString& ustrDestFileURL )
+    //  inline static RC move(const OUString& ustrSourceFileURL, const OUString& ustrDestFileURL)
 
-    class  move : public CppUnit::TestFixture
+    class move : public CppUnit::TestFixture
     {
-        FileBase::RC      nError1, nError2;
+        osl::FileBase::RC nError1, nError2;
         sal_uInt64 nCount_write;
 
-        public:
+    public:
         move()
-            : nError1(FileBase::E_None)
-            , nError2(FileBase::E_None)
+            : nError1(osl::FileBase::E_None)
+            , nError2(osl::FileBase::E_None)
             , nCount_write(0)
         {
         }
 
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
 
             // write chars into the file.
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.close();
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
+
         void move_001()
         {
             // rename $TEMP/tmpdir/tmpname to $TEMP/canonical.name.
-            nError1 = File::move( aTmpName4, aCanURL1 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = File::move(aTmpName4, aCanURL1);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             // check
-             File    testFile( aCanURL1 );
-            nError2 = testFile.open( osl_File_OpenFlag_Create );
-            deleteTestFile( aCanURL1 );
+            File  testFile(aCanURL1);
+            nError2 = testFile.open(osl_File_OpenFlag_Create);
+            deleteTestFile(aCanURL1);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for move function: rename file to another directory",
-                                     nError2, FileBase::E_EXIST );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: rename file to another directory",
+                                     nError2, osl::FileBase::E_EXIST);
         }
 
         void move_002()
         {
             // move $TEMP/tmpdir/tmpname to $TEMP/tmpdir.
-            nError1 = File::move( aTmpName4, aTmpName3 );
-            // returned FileBase::E_ACCES on WNT
-            CPPUNIT_ASSERT_MESSAGE( "test for move function: use directory as destination",
-                 ( FileBase::E_ACCES == nError1 || FileBase::E_ISDIR == nError1 ) ||( FileBase::E_EXIST == nError1 )  );
+            nError1 = File::move(aTmpName4, aTmpName3);
+            // returned osl::FileBase::E_ACCES on WNT
+            CPPUNIT_ASSERT_MESSAGE("test for move function: use directory as destination",
+                 (osl::FileBase::E_ACCES == nError1 || osl::FileBase::E_ISDIR == nError1) ||(osl::FileBase::E_EXIST == nError1));
         }
 
         void move_003()
         {
             // move $TEMP/tmpdir/tmpname to $ROOT/tmpname.
-            nError1 = File::move( aTmpName4, aTmpName7 );
+            nError1 = File::move(aTmpName4, aTmpName7);
 #if defined(_WIN32)
-            nError1 = FileBase::E_ACCES;  /// for Windows, c:\ is writable any way.
-            deleteTestFile( aTmpName7);
+            nError1 = osl::FileBase::E_ACCES;  /// for Windows, c:\ is writable any way.
+            deleteTestFile(aTmpName7);
 #endif
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for move function: move to an illegal place",
-                                     nError1, FileBase::E_ACCES );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: move to an illegal place",
+                                     nError1, osl::FileBase::E_ACCES);
         }
 
         void move_004()
         {
             // move $TEMP/tmpname to $TEMP/tmpdir/tmpname.
-            nError1 = File::move( aTmpName6, aTmpName4 );
+            nError1 = File::move(aTmpName6, aTmpName4);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for move function: move a not exist file",
-                                     nError1, FileBase::E_NOENT );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: move a not exist file",
+                                     nError1, osl::FileBase::E_NOENT);
         }
 
         void move_005()
         {
             // move $TEMP/tmpname to $TEMP/system.path using system path.
-            nError1 = File::move( aTmpName6, aSysPath1 );
+            nError1 = File::move(aTmpName6, aSysPath1);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for move function: move a file using system file",
-                                     nError1, FileBase::E_INVAL );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: move a file using system file",
+                                     nError1, osl::FileBase::E_INVAL);
         }
 
         void move_006()
         {
             // move directory $TEMP/tmpname to $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName6 );
-            nError1 = File::move( aTmpName6, aTmpName4 );
+            createTestDirectory(aTmpName6);
+            nError1 = File::move(aTmpName6, aTmpName4);
             // move file $TEMP/tmpdir/tmpname to $TEMP/tmpname
-            nError2 = File::move( aTmpName4, aTmpName6 );
-            deleteTestDirectory( aTmpName6 );
+            nError2 = File::move(aTmpName4, aTmpName6);
+            deleteTestDirectory(aTmpName6);
 #if defined(_WIN32)
-            deleteTestDirectory( aTmpName4 );// in Windows, it can be moved!!!!! this is only for not influence the following test.
-            deleteTestFile( aTmpName6 );
-            nError1 = FileBase::E_NOTDIR;
-            nError2 = FileBase::E_ISDIR;
+            deleteTestDirectory(aTmpName4);// in Windows, it can be moved!!!!! this is only for not influence the following test.
+            deleteTestFile(aTmpName6);
+            nError1 = osl::FileBase::E_NOTDIR;
+            nError2 = osl::FileBase::E_ISDIR;
 #endif
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for move function: move a directory to an exist file with same name, did not pass in (W32)",
-                                     FileBase::E_NOTDIR, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for move function: move a directory to an exist file with same name, did not pass in (W32)",
-                                     FileBase::E_ISDIR, nError2 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: move a directory to an exist file with same name, did not pass in (W32)",
+                                     osl::FileBase::E_NOTDIR, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: move a directory to an exist file with same name, did not pass in (W32)",
+                                     osl::FileBase::E_ISDIR, nError2);
         }
 
         void move_007()
         {
             // create directory $TEMP/tmpname.
-            createTestDirectory( aTmpName6 );
+            createTestDirectory(aTmpName6);
             // move directory $TEMP/tmpdir to $TEMP/tmpname/tmpdir
-            nError1 = File::move( aTmpName3, aTmpName8 );
+            nError1 = File::move(aTmpName3, aTmpName8);
             // check
-            nError2 = Directory::create( aTmpName8 );
-            File::move( aTmpName8, aTmpName3 );
-            deleteTestDirectory( aTmpName6 );
+            nError2 = Directory::create(aTmpName8);
+            File::move(aTmpName8, aTmpName3);
+            deleteTestDirectory(aTmpName6);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for move function: move a directory to an exist file with same name",
-                                     FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for move function: move a directory to an exist file with same name",
-                                    FileBase::E_EXIST, nError2 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: move a directory to an exist file with same name",
+                                     osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: move a directory to an exist file with same name",
+                                    osl::FileBase::E_EXIST, nError2);
         }
       // bugid# 115420, after the bug fix, add the case
-        CPPUNIT_TEST_SUITE( move );
-        CPPUNIT_TEST( move_001 );
-        CPPUNIT_TEST( move_002 );
-        CPPUNIT_TEST( move_003 );
-        CPPUNIT_TEST( move_004 );
-        CPPUNIT_TEST( move_005 );
-        CPPUNIT_TEST( move_006 );
-        CPPUNIT_TEST( move_007 );
+        CPPUNIT_TEST_SUITE(move);
+            CPPUNIT_TEST(move_001);
+            CPPUNIT_TEST(move_002);
+            CPPUNIT_TEST(move_003);
+            CPPUNIT_TEST(move_004);
+            CPPUNIT_TEST(move_005);
+            CPPUNIT_TEST(move_006);
+            CPPUNIT_TEST(move_007);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline static RC remove( const OUString& ustrFileURL )
+    //  inline static RC remove(const OUString& ustrFileURL)
 
-    class  remove : public CppUnit::TestFixture
+    class remove : public CppUnit::TestFixture
     {
-        FileBase::RC      nError1, nError2;
+        osl::FileBase::RC nError1, nError2;
         sal_uInt64 nCount_write;
 
-        public:
+    public:
         remove()
-            : nError1(FileBase::E_None)
-            , nError2(FileBase::E_None)
+            : nError1(osl::FileBase::E_None)
+            , nError2(osl::FileBase::E_None)
             , nCount_write(0)
         {
         }
 
-        // initialization
+
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
 
             // write chars into the file.
-            File testFile( aTmpName4 );
+            File testFile(aTmpName4);
 
-            nError1 = testFile.open( osl_File_OpenFlag_Write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-            nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-             nError1 = testFile.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testFile.open(osl_File_OpenFlag_Write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+            nError1 = testFile.close();
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
+
         void remove_001()
         {
             // remove $TEMP/tmpdir/tmpname.
-            nError1 = File::remove( aTmpName4 );
+            nError1 = File::remove(aTmpName4);
             // check
-             File    testFile( aTmpName4 );
-            nError2 = testFile.open( osl_File_OpenFlag_Create );
+            File    testFile(aTmpName4);
+            nError2 = testFile.open(osl_File_OpenFlag_Create);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for remove function: remove a file",
-                                    FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_MESSAGE( "test for remove function: remove a file",
-                                     ( FileBase::E_EXIST != nError2 ) );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for remove function: remove a file",
+                                    osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_MESSAGE("test for remove function: remove a file",
+                                     (osl::FileBase::E_EXIST != nError2));
         }
 
         void remove_002()
         {
             // remove $TEMP/tmpname.
-            nError1 = File::remove( aTmpName6 );
+            nError1 = File::remove(aTmpName6);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for remove function: remove a file not exist",
-                                    FileBase::E_NOENT, nError1 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for remove function: remove a file not exist",
+                                    osl::FileBase::E_NOENT, nError1);
         }
 
         void remove_003()
         {
             // remove $TEMP/system/path.
-            nError1 = File::remove( aSysPath2 );
+            nError1 = File::remove(aSysPath2);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for remove function: removing a file not using full qualified URL",
-                                    FileBase::E_INVAL, nError1 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for remove function: removing a file not using full qualified URL",
+                                    osl::FileBase::E_INVAL, nError1);
         }
 
         void remove_004()
         {
             // remove $TEMP/tmpdir.
-            nError1 = File::remove( aTmpName3 );
+            nError1 = File::remove(aTmpName3);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for remove function: remove a directory",
-                                    ( FileBase::E_ISDIR == nError1 ) || ( FileBase::E_ACCES == nError1 ));
+            CPPUNIT_ASSERT_MESSAGE("test for remove function: remove a directory",
+                                    (osl::FileBase::E_ISDIR == nError1) || (osl::FileBase::E_ACCES == nError1));
         }
 
-        CPPUNIT_TEST_SUITE( remove );
-        CPPUNIT_TEST( remove_001 );
-        CPPUNIT_TEST( remove_002 );
-        CPPUNIT_TEST( remove_003 );
-        CPPUNIT_TEST( remove_004 );
+        CPPUNIT_TEST_SUITE(remove);
+            CPPUNIT_TEST(remove_001);
+            CPPUNIT_TEST(remove_002);
+            CPPUNIT_TEST(remove_003);
+            CPPUNIT_TEST(remove_004);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline static RC setAttributes( const OUString& ustrFileURL, sal_uInt64 uAttributes )
+    //  inline static RC setAttributes(const OUString& ustrFileURL, sal_uInt64 uAttributes)
 
-    class  setAttributes : public CppUnit::TestFixture
+    class setAttributes : public CppUnit::TestFixture
     {
-        FileBase::RC      nError1, nError2;
-        DirectoryItem    rItem, rItem_hidden;
+    private:
+        osl::FileBase::RC nError1, nError2;
+        DirectoryItem rItem, rItem_hidden;
+
+    public:
+        setAttributes() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {}
 
-        public:
-        setAttributes() : nError1(FileBase::E_None),nError2(FileBase::E_None) {}
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestFile( aTmpName6 );
+            createTestFile(aTmpName6);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName6 );
+            deleteTestFile(aTmpName6);
         }
 
-        // test code.
+
         void setAttributes_001()
         {
         // on windows, only can set 2 attributes: osl_File_Attribute_ReadOnly,  osl_File_Attribute_Hidden
 #ifdef UNX
             // set the file to readonly
-            nError2 = File::setAttributes( aTmpName6, osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError2 );
-            nError1 = DirectoryItem::get( aTmpName6, rItem );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError1 );
+            nError2 = File::setAttributes(aTmpName6, osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2);
+            nError1 = DirectoryItem::get(aTmpName6, rItem);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
             // get the file attributes
-              FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
-            nError1 = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError1 );
+            FileStatus   rFileStatus(osl_FileStatus_Mask_Attributes);
+            nError1 = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for setAttributes function: set file attributes and get it to verify.",
-                                    static_cast<sal_uInt64>( osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead ),
-                                    rFileStatus.getAttributes() );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setAttributes function: set file attributes and get it to verify.",
+                                    static_cast<sal_uInt64>(osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead),
+                                    rFileStatus.getAttributes());
 #else
             // please see GetFileAttributes
-            nError2 = File::setAttributes( aTmpName6, osl_File_Attribute_ReadOnly );
-            CPPUNIT_ASSERT( nError2 == FileBase::E_None);
-            nError1 = DirectoryItem::get( aTmpName6, rItem );
-            CPPUNIT_ASSERT( nError1 == FileBase::E_None);
+            nError2 = File::setAttributes(aTmpName6, osl_File_Attribute_ReadOnly);
+            CPPUNIT_ASSERT(nError2 == osl::FileBase::E_None);
+            nError1 = DirectoryItem::get(aTmpName6, rItem);
+            CPPUNIT_ASSERT(nError1 == osl::FileBase::E_None);
             // get the file attributes
-              FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
-            nError1 = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError1 );
+            FileStatus   rFileStatus(osl_FileStatus_Mask_Attributes);
+            nError1 = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
             // here the file has 2 Attributes: FILE_ATTRIBUTE_READONLY and FILE_ATTRIBUTE_NORMAL,
             // but FILE_ATTRIBUTE_NORMAL is valid only if used alone, so this is maybe a bug
-            /*OString aString = OUStringToOString( aTmpName6, RTL_TEXTENCODING_ASCII_US );
-            DWORD dwFileAttributes = GetFileAttributes( aString.getStr() );
+            /*OString aString = OUStringToOString(aTmpName6, RTL_TEXTENCODING_ASCII_US);
+            DWORD dwFileAttributes = GetFileAttributes(aString.getStr());
             if (dwFileAttributes & FILE_ATTRIBUTE_NORMAL)
                 printf("has normal attribute");
             if (dwFileAttributes & FILE_ATTRIBUTE_READONLY)
                 printf("has readonly attribute");
             */
-            CPPUNIT_ASSERT_MESSAGE( "test for setAttributes function: set file attributes READONLY and get it to verify.",
-                                    (osl_File_Attribute_ReadOnly & rFileStatus.getAttributes()) != 0  );
+            CPPUNIT_ASSERT_MESSAGE("test for setAttributes function: set file attributes READONLY and get it to verify.",
+                                    (osl_File_Attribute_ReadOnly & rFileStatus.getAttributes()) != 0);
 #endif
     }
         void setAttributes_002()
@@ -3411,24 +3409,24 @@ namespace osl_File
         // on UNX, can not set hidden attribute to file, rename file can set the attribute
 #ifdef _WIN32
             // set the file to hidden
-            nError2 = File::setAttributes( aTmpName6, osl_File_Attribute_Hidden);
+            nError2 = File::setAttributes(aTmpName6, osl_File_Attribute_Hidden);
 
-            CPPUNIT_ASSERT( nError2 == FileBase::E_None);
-            nError1 = DirectoryItem::get( aTmpName6, rItem );
-            CPPUNIT_ASSERT( nError1 == FileBase::E_None);
+            CPPUNIT_ASSERT(nError2 == osl::FileBase::E_None);
+            nError1 = DirectoryItem::get(aTmpName6, rItem);
+            CPPUNIT_ASSERT(nError1 == osl::FileBase::E_None);
             // get the file attributes
-              FileStatus rFileStatus( osl_FileStatus_Mask_Attributes );
-            nError1 = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError1 );
+            FileStatus rFileStatus(osl_FileStatus_Mask_Attributes);
+            nError1 = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for setAttributes function: set file attributes and get it to verify.",
-                                    (osl_File_Attribute_Hidden & rFileStatus.getAttributes()) != 0 );
+            CPPUNIT_ASSERT_MESSAGE("test for setAttributes function: set file attributes and get it to verify.",
+                                    (osl_File_Attribute_Hidden & rFileStatus.getAttributes()) != 0);
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( setAttributes );
-        CPPUNIT_TEST( setAttributes_001 );
-        CPPUNIT_TEST( setAttributes_002 );
+        CPPUNIT_TEST_SUITE(setAttributes);
+            CPPUNIT_TEST(setAttributes_001);
+            CPPUNIT_TEST(setAttributes_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
@@ -3437,165 +3435,167 @@ namespace osl_File
     //         const OUString& ustrFileURL,
     //         const TimeValue& rCreationTime,
     //         const TimeValue& rLastAccessTime,
-    //         const TimeValue& rLastWriteTime )
+    //         const TimeValue& rLastWriteTime)
 
-    class  setTime : public CppUnit::TestFixture
+    class setTime : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2;
-        DirectoryItem    rItem;
+    private:
+        osl::FileBase::RC nError1, nError2;
+        DirectoryItem rItem;
+
+    public:
+        setTime() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {}
 
-        public:
-        setTime() : nError1(FileBase::E_None),nError2(FileBase::E_None) {}
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestFile( aTmpName6 );
+            createTestFile(aTmpName6);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName6 );
+            deleteTestFile(aTmpName6);
         }
 
-        // test code.
+
         void setTime_001()
         {
-             TimeValue *pTV_current  = nullptr;
-            CPPUNIT_ASSERT( ( pTV_current = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr );
+            TimeValue *pTV_current  = nullptr;
+            CPPUNIT_ASSERT((pTV_current = static_cast<TimeValue*>(malloc(sizeof(TimeValue)))) != nullptr);
             TimeValue *pTV_creation = nullptr;
-            CPPUNIT_ASSERT( ( pTV_creation = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr );
+            CPPUNIT_ASSERT((pTV_creation = static_cast<TimeValue*>(malloc(sizeof(TimeValue)))) != nullptr);
             TimeValue *pTV_access   = nullptr;
-            CPPUNIT_ASSERT( ( pTV_access = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr );
+            CPPUNIT_ASSERT((pTV_access = static_cast<TimeValue*>(malloc(sizeof(TimeValue)))) != nullptr);
             TimeValue *pTV_modify   = nullptr;
-            CPPUNIT_ASSERT( ( pTV_modify = static_cast<TimeValue*>(malloc( sizeof( TimeValue ) )) ) != nullptr );
+            CPPUNIT_ASSERT((pTV_modify = static_cast<TimeValue*>(malloc(sizeof(TimeValue)))) != nullptr);
 
             // get current time
-            bool bOk = osl_getSystemTime( pTV_current );
-            CPPUNIT_ASSERT( bOk );
+            bool bOk = osl_getSystemTime(pTV_current);
+            CPPUNIT_ASSERT(bOk);
 
             // set the file time
-            nError2 = File::setTime( aTmpName6, *pTV_current, *pTV_current, *pTV_current );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( errorToStr( nError2 ).getStr(), FileBase::E_None, nError2);
+            nError2 = File::setTime(aTmpName6, *pTV_current, *pTV_current, *pTV_current);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError2).getStr(), osl::FileBase::E_None, nError2);
 
              // get the file access time, creation time, modify time
-            nError1 = DirectoryItem::get( aTmpName6, rItem );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( errorToStr( nError1 ).getStr(), FileBase::E_None, nError1);
+            nError1 = DirectoryItem::get(aTmpName6, rItem);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError1).getStr(), osl::FileBase::E_None, nError1);
 
-              FileStatus   rFileStatus( osl_FileStatus_Mask_AccessTime );
-            nError1 = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( errorToStr( nError1 ).getStr(), FileBase::E_None, nError1 );
+            FileStatus   rFileStatus(osl_FileStatus_Mask_AccessTime);
+            nError1 = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError1).getStr(), osl::FileBase::E_None, nError1);
             *pTV_access = rFileStatus.getAccessTime();
 
-              FileStatus   rFileStatus1( osl_FileStatus_Mask_CreationTime );
-            nError1 = rItem.getFileStatus( rFileStatus1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( errorToStr( nError1 ).getStr(), FileBase::E_None, nError1 );
+            FileStatus   rFileStatus1(osl_FileStatus_Mask_CreationTime);
+            nError1 = rItem.getFileStatus(rFileStatus1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError1).getStr(), osl::FileBase::E_None, nError1);
             *pTV_creation = rFileStatus1.getCreationTime();
 
-              FileStatus   rFileStatus2( osl_FileStatus_Mask_ModifyTime );
-            nError1 = rItem.getFileStatus( rFileStatus2 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( errorToStr( nError1 ).getStr(), FileBase::E_None, nError1 );
+            FileStatus   rFileStatus2(osl_FileStatus_Mask_ModifyTime);
+            nError1 = rItem.getFileStatus(rFileStatus2);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError1).getStr(), osl::FileBase::E_None, nError1);
             *pTV_modify = rFileStatus2.getModifyTime();
 
-            CPPUNIT_ASSERT_MESSAGE( "test for setTime function: set access time then get it. time precision is still a problem for it cut off the nanosec.",
-                t_compareTime( pTV_access, pTV_current, delta ) );
+            CPPUNIT_ASSERT_MESSAGE("test for setTime function: set access time then get it. time precision is still a problem for it cut off the nanosec.",
+                t_compareTime(pTV_access, pTV_current, delta));
 #if defined(_WIN32)
             // Unfortunately there is no way to get the creation time of a file under Unix (it's a Windows only feature).
             // That means the flag osl_FileStatus_Mask_CreationTime should be deprecated under Unix.
-            CPPUNIT_ASSERT_MESSAGE( "test for setTime function: set creation time then get it. ",
-                sal_True == t_compareTime( pTV_creation, pTV_current, delta ) ) ;
+            CPPUNIT_ASSERT_MESSAGE("test for setTime function: set creation time then get it. ",
+                sal_True == t_compareTime(pTV_creation, pTV_current, delta));
 #endif
-            CPPUNIT_ASSERT_MESSAGE( "test for setTime function: set modify time then get it. ",
-                t_compareTime( pTV_modify, pTV_current, delta ) );
-            free( pTV_current );
-            free( pTV_creation );
-            free( pTV_access );
-            free( pTV_modify );
+            CPPUNIT_ASSERT_MESSAGE("test for setTime function: set modify time then get it. ",
+                t_compareTime(pTV_modify, pTV_current, delta));
+            free(pTV_current);
+            free(pTV_creation);
+            free(pTV_access);
+            free(pTV_modify);
         }
 
-        CPPUNIT_TEST_SUITE( setTime );
-        CPPUNIT_TEST( setTime_001 );
+        CPPUNIT_TEST_SUITE(setTime);
+            CPPUNIT_TEST(setTime_001);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
     //  inline static RC sync()
 
-        class  sync : public CppUnit::TestFixture
+    class sync : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2;
-        DirectoryItem    rItem;
+    private:
+        osl::FileBase::RC nError1, nError2;
+        DirectoryItem rItem;
+
+    public:
+        sync() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {}
 
-        public:
-        sync() : nError1(FileBase::E_None),nError2(FileBase::E_None) {}
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestFile( aTmpName6 );
+            createTestFile(aTmpName6);
 
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName6 );
+            deleteTestFile(aTmpName6);
         }
 
         // test case: if The file is located on a read only file system.
         void sync_001()
         {
 #ifdef UNX
-            nError1 = DirectoryItem::get( aTmpName6, rItem );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError1 );
+            nError1 = DirectoryItem::get(aTmpName6, rItem);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
 
-            File tmp_file( aTmpName6 );
-            FileBase::RC err = tmp_file.open(osl_File_OpenFlag_Write );
+            File tmp_file(aTmpName6);
+            osl::FileBase::RC err = tmp_file.open(osl_File_OpenFlag_Write);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE("File open failed", FileBase::E_None, err);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("File open failed", osl::FileBase::E_None, err);
 
             char buffer[50000];
             sal_uInt64 written = 0;
             nError1 = tmp_file.write(static_cast<void*>(buffer), sizeof(buffer), written);
-            CPPUNIT_ASSERT_EQUAL_MESSAGE("write failed!", FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("write failed!", osl::FileBase::E_None, nError1);
 
             // set the file to readonly
-            nError2 = File::setAttributes( aTmpName6, osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError2 );
+            nError2 = File::setAttributes(aTmpName6, osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2);
 
             nError2 = tmp_file.sync();
 
-                CPPUNIT_ASSERT_EQUAL_MESSAGE("can not sync to readonly file!", FileBase::E_None, nError2);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("can not sync to readonly file!", osl::FileBase::E_None, nError2);
 
             tmp_file.close();
 #endif
         }
       // test case:no enough space, how to create such case???see test_cpy_wrt_file.cxx::test_osl_writeFile
 
-        CPPUNIT_TEST_SUITE( sync );
-        CPPUNIT_TEST( sync_001 );
+        CPPUNIT_TEST_SUITE(sync);
+            CPPUNIT_TEST(sync_001);
         CPPUNIT_TEST_SUITE_END();
     };
 
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::ctors, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::open, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::close, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::setPos, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::getPos, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::isEndOfFile, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::setSize, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::read, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::write, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::readLine, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::copy, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::move, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::remove, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::setAttributes, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::setTime, "osl_File" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::sync, "osl_File" );
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::ctors, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::open, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::close, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::setPos, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::getPos, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::isEndOfFile, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::setSize, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::read, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::write, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::readLine, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::copy, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::move, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::remove, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::setAttributes, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::setTime, "osl_File");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::sync, "osl_File");
 // FIXME: to enable these tests (when they work cross-platform) we need to add the below:
-//    CPPUNIT_REGISTRY_ADD_TO_DEFAULT( "osl_File" );
+//  CPPUNIT_REGISTRY_ADD_TO_DEFAULT("osl_File");
 
 }
 
@@ -3603,411 +3603,411 @@ namespace osl_File
 
 namespace osl_DirectoryItem
 {
-
     //  testing the method
-    //  DirectoryItem(): _pData( NULL )
+    //  DirectoryItem(): _pData(NULL)
 
-    class  ctors : public CppUnit::TestFixture
+    class ctors : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1;
+    private:
+        osl::FileBase::RC nError1;
+
+    public:
+        ctors() : nError1(osl::FileBase::E_None) {}
 
-        public:
-        ctors() : nError1(FileBase::E_None) {}
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpname.
-            createTestFile( aTmpName6 );
+            createTestFile(aTmpName6);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpname.
-            deleteTestFile( aTmpName6 );
+            deleteTestFile(aTmpName6);
         }
 
-        // test code.
         void ctors_001()
         {
-            File testFile( aTmpName6 );
-            DirectoryItem    rItem;  // constructor
+            File testFile(aTmpName6);
+            DirectoryItem rItem;  // constructor
 
              // get the DirectoryItem.
-            nError1 = DirectoryItem::get( aTmpName6, rItem );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = DirectoryItem::get(aTmpName6, rItem);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for ctors function: initialize a new instance of DirectoryItem and get an item to check.",
-                                      FileBase::E_None, nError1  );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: initialize a new instance of DirectoryItem and get an item to check.",
+                                      osl::FileBase::E_None, nError1);
         }
 
-        CPPUNIT_TEST_SUITE( ctors );
-        CPPUNIT_TEST( ctors_001 );
+        CPPUNIT_TEST_SUITE(ctors);
+            CPPUNIT_TEST(ctors_001);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  DirectoryItem( const DirectoryItem& rItem ): _pData( rItem._pData)
+    //  DirectoryItem(const DirectoryItem& rItem): _pData(rItem._pData)
 
-    class  copy_assin_Ctors : public CppUnit::TestFixture
+    class copy_assin_Ctors : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1;
+    private:
+        osl::FileBase::RC nError1;
+
+    public:
+        copy_assin_Ctors() : nError1(osl::FileBase::E_None) {}
 
-        public:
-        copy_assin_Ctors() : nError1(FileBase::E_None) {}
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpname.
-            createTestFile( aTmpName6 );
+            createTestFile(aTmpName6);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpname.
-            deleteTestFile( aTmpName6 );
+            deleteTestFile(aTmpName6);
         }
 
-        // test code.
+
         void copy_assin_Ctors_001()
         {
-            DirectoryItem    rItem;  // constructor
+            DirectoryItem rItem;  // constructor
              // get the DirectoryItem.
-            nError1 = DirectoryItem::get( aTmpName6, rItem );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = DirectoryItem::get(aTmpName6, rItem);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            DirectoryItem    copyItem( rItem ); // copy constructor
-              FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
-            nError1 = copyItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError1 );
+            DirectoryItem copyItem(rItem); // copy constructor
+            FileStatus rFileStatus(osl_FileStatus_Mask_FileName);
+            nError1 = copyItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for copy_assin_Ctors function: use copy constructor to get an item and check filename.",
-                                    compareFileName( rFileStatus.getFileName(), aTmpName2 ) );
+            CPPUNIT_ASSERT_MESSAGE("test for copy_assin_Ctors function: use copy constructor to get an item and check filename.",
+                                    compareFileName(rFileStatus.getFileName(), aTmpName2));
         }
 
         void copy_assin_Ctors_002()
         {
-            DirectoryItem    rItem;  // constructor
+            DirectoryItem rItem;  // constructor
              // get the DirectoryItem.
-            nError1 = DirectoryItem::get( aTmpName6, rItem );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = DirectoryItem::get(aTmpName6, rItem);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            DirectoryItem    copyItem;
+            DirectoryItem copyItem;
             copyItem = rItem;               // assinment operator
-              FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
-            nError1 = copyItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError1 );
+            FileStatus rFileStatus(osl_FileStatus_Mask_FileName);
+            nError1 = copyItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for copy_assin_Ctors function: test assinment operator here since it is same as copy constructor in test way.",
-                                    compareFileName( rFileStatus.getFileName(), aTmpName2 ) );
+            CPPUNIT_ASSERT_MESSAGE("test for copy_assin_Ctors function: test assinment operator here since it is same as copy constructor in test way.",
+                                    compareFileName(rFileStatus.getFileName(), aTmpName2));
         }
 
-        CPPUNIT_TEST_SUITE( copy_assin_Ctors );
-        CPPUNIT_TEST( copy_assin_Ctors_001 );
-        CPPUNIT_TEST( copy_assin_Ctors_002 );
+        CPPUNIT_TEST_SUITE(copy_assin_Ctors);
+            CPPUNIT_TEST(copy_assin_Ctors_001);
+            CPPUNIT_TEST(copy_assin_Ctors_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
     //  inline sal_Bool is()
 
-    class  is : public CppUnit::TestFixture
+    class is : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1;
+    private:
+        osl::FileBase::RC nError1;
+
+    public:
+        is() : nError1(osl::FileBase::E_None) {}
 
-        public:
-        is() : nError1(FileBase::E_None) {}
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpname.
-            createTestFile( aTmpName6 );
+            createTestFile(aTmpName6);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpname.
-            deleteTestFile( aTmpName6 );
+            deleteTestFile(aTmpName6);
         }
 
-        // test code.
         void is_001()
         {
-            DirectoryItem    rItem;  // constructor
+            DirectoryItem rItem;  // constructor
 
-            CPPUNIT_ASSERT_MESSAGE( "test for is function: use an uninitialized instance.",
-                                    !rItem.is() );
+            CPPUNIT_ASSERT_MESSAGE("test for is function: use an uninitialized instance.",
+                                    !rItem.is());
         }
 
         void is_002()
         {
             DirectoryItem    rItem;  // constructor
              // get the DirectoryItem.
-            nError1 = DirectoryItem::get( aTmpName6, rItem );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = DirectoryItem::get(aTmpName6, rItem);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for is function: use an uninitialized instance.",
-                                    rItem.is() );
+            CPPUNIT_ASSERT_MESSAGE("test for is function: use an uninitialized instance.",
+                                    rItem.is());
         }
 
-        CPPUNIT_TEST_SUITE( is );
-        CPPUNIT_TEST( is_001 );
-        CPPUNIT_TEST( is_002 );
+        CPPUNIT_TEST_SUITE(is);
+            CPPUNIT_TEST(is_001);
+            CPPUNIT_TEST(is_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  static inline RC get( const OUString& ustrFileURL, DirectoryItem& rItem )
+    //  static inline RC get(const OUString& ustrFileURL, DirectoryItem& rItem)
 
-    class  get : public CppUnit::TestFixture
+    class get : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2;
+    private:
+        osl::FileBase::RC nError1, nError2;
+
+    public:
+        get() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {}
 
-        public:
-        get() : nError1(FileBase::E_None),nError2(FileBase::E_None) {}
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpname.
-            createTestFile( aTmpName6 );
+            createTestFile(aTmpName6);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpname.
-            deleteTestFile( aTmpName6 );
+            deleteTestFile(aTmpName6);
         }
 
-        // test code.
+
         void get_001()
         {
-            DirectoryItem    rItem;  // constructor
-             // get the DirectoryItem.
-            nError2 = DirectoryItem::get( aTmpName6, rItem );
+            DirectoryItem rItem;
+            nError2 = DirectoryItem::get(aTmpName6, rItem);
 
             // check the file name
-              FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
-            nError1 = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_EQUAL( FileBase::E_None, nError1 );
+            FileStatus   rFileStatus(osl_FileStatus_Mask_FileName);
+            nError1 = rItem.getFileStatus(rFileStatus);
+            CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for get function: use copy constructor to get an item and check filename.",
-                                    FileBase::E_None, nError2 );
-            CPPUNIT_ASSERT_MESSAGE( "test for get function: use copy constructor to get an item and check filename.",
-                                    compareFileName( rFileStatus.getFileName(), aTmpName2 ) );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for get function: use copy constructor to get an item and check filename.",
+                                    osl::FileBase::E_None, nError2);
+            CPPUNIT_ASSERT_MESSAGE("test for get function: use copy constructor to get an item and check filename.",
+                                    compareFileName(rFileStatus.getFileName(), aTmpName2));
         }
 
         void get_002()
         {
-            DirectoryItem    rItem;
-             // get the DirectoryItem.
-            nError1 = DirectoryItem::get( aSysPath1, rItem );
+            DirectoryItem rItem;
+            nError1 = DirectoryItem::get(aSysPath1, rItem);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for get function: use a system name instead of a URL.",
-                                    nError1, FileBase::E_INVAL );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for get function: use a system name instead of a URL.",
+                                    nError1, osl::FileBase::E_INVAL);
         }
 
         void get_003()
         {
-            DirectoryItem    rItem;
-             // get the DirectoryItem.
-            nError1 = DirectoryItem::get( aTmpName3, rItem );
+            DirectoryItem rItem;
+
+            nError1 = DirectoryItem::get(aTmpName3, rItem);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for get function: use a non existed file URL.",
-                                    nError1, FileBase::E_NOENT );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for get function: use a non existed file URL.",
+                                    nError1, osl::FileBase::E_NOENT);
         }
 
-        CPPUNIT_TEST_SUITE( get );
-        CPPUNIT_TEST( get_001 );
-        CPPUNIT_TEST( get_002 );
-        CPPUNIT_TEST( get_003 );
+        CPPUNIT_TEST_SUITE(get);
+            CPPUNIT_TEST(get_001);
+            CPPUNIT_TEST(get_002);
+            CPPUNIT_TEST(get_003);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline RC getFileStatus( FileStatus& rStatus )
+    //  inline RC getFileStatus(FileStatus& rStatus)
 
-    class  getFileStatus : public CppUnit::TestFixture
+    class getFileStatus : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2;
+    private:
+        osl::FileBase::RC nError1, nError2;
+
+    public:
+        getFileStatus() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {}
 
-        public:
-        getFileStatus() : nError1(FileBase::E_None),nError2(FileBase::E_None) {}
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
+
         void getFileStatus_001()
         {
-            DirectoryItem    rItem;  // constructor
+            DirectoryItem rItem;
              // get the DirectoryItem.
-            nError1 = DirectoryItem::get( aTmpName4, rItem );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = DirectoryItem::get(aTmpName4, rItem);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             // check the file name
-              FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
-            nError2 = rItem.getFileStatus( rFileStatus );
+            FileStatus rFileStatus(osl_FileStatus_Mask_FileName);
+            nError2 = rItem.getFileStatus(rFileStatus);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getFileStatus function: get file status and check filename",
-                                    FileBase::E_None, nError2 );
-            CPPUNIT_ASSERT_MESSAGE( "test for getFileStatus function: get file status and check filename",
-                                    compareFileName( rFileStatus.getFileName(), aTmpName2 ) );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getFileStatus function: get file status and check filename",
+                                    osl::FileBase::E_None, nError2);
+            CPPUNIT_ASSERT_MESSAGE("test for getFileStatus function: get file status and check filename",
+                                    compareFileName(rFileStatus.getFileName(), aTmpName2));
         }
 
         void getFileStatus_002()
         {
-            DirectoryItem    rItem;  // constructor
+            DirectoryItem rItem;  // constructor
              // get the DirectoryItem.
-            nError1 = DirectoryItem::get( aTmpName6, rItem );
+            nError1 = DirectoryItem::get(aTmpName6, rItem);
 
             // check the file name
-              FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
-            nError2 = rItem.getFileStatus( rFileStatus );
+            FileStatus rFileStatus(osl_FileStatus_Mask_FileName);
+            nError2 = rItem.getFileStatus(rFileStatus);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getFileStatus function: file not existed",
-                                    FileBase::E_INVAL, nError2 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getFileStatus function: file not existed",
+                                    osl::FileBase::E_INVAL, nError2);
         }
 
         void getFileStatus_003()
         {
             DirectoryItem    rItem;  // constructor
              // get the DirectoryItem.
-            nError1 = DirectoryItem::get( aTmpName3, rItem );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = DirectoryItem::get(aTmpName3, rItem);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             // check the file name
-              FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
-            nError2 = rItem.getFileStatus( rFileStatus );
+            FileStatus rFileStatus(osl_FileStatus_Mask_FileName);
+            nError2 = rItem.getFileStatus(rFileStatus);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getFileStatus function: get directory information",
-                                    FileBase::E_None, nError2 );
-            CPPUNIT_ASSERT_MESSAGE( "test for getFileStatus function: get directory information",
-                                    compareFileName( rFileStatus.getFileName(), aTmpName1 ) );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getFileStatus function: get directory information",
+                                    osl::FileBase::E_None, nError2);
+            CPPUNIT_ASSERT_MESSAGE("test for getFileStatus function: get directory information",
+                                    compareFileName(rFileStatus.getFileName(), aTmpName1));
         }
 
-        CPPUNIT_TEST_SUITE( getFileStatus );
-        CPPUNIT_TEST( getFileStatus_001 );
-        CPPUNIT_TEST( getFileStatus_002 );
-        CPPUNIT_TEST( getFileStatus_003 );
+        CPPUNIT_TEST_SUITE(getFileStatus);
+            CPPUNIT_TEST(getFileStatus_001);
+            CPPUNIT_TEST(getFileStatus_002);
+            CPPUNIT_TEST(getFileStatus_003);
         CPPUNIT_TEST_SUITE_END();
     };
 
-     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::ctors, "osl_DirectoryItem" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::copy_assin_Ctors, "osl_DirectoryItem" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::is, "osl_DirectoryItem" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::get, "osl_DirectoryItem" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::getFileStatus, "osl_DirectoryItem" );
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DirectoryItem::ctors, "osl_DirectoryItem");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DirectoryItem::copy_assin_Ctors, "osl_DirectoryItem");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DirectoryItem::is, "osl_DirectoryItem");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DirectoryItem::get, "osl_DirectoryItem");
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DirectoryItem::getFileStatus, "osl_DirectoryItem");
 }
 
 // Beginning of the test cases for Directory class
 
 namespace osl_Directory
 {
-
     //  testing the method
-    //  Directory( const OUString& strPath ): _pData( 0 ), _aPath( strPath )
+    //  Directory(const OUString& strPath): _pData(0), _aPath(strPath)
 
-    class  ctors : public CppUnit::TestFixture
+    class ctors : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2;
+    private:
+        osl::FileBase::RC nError1, nError2;
+
+    public:
+        ctors() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {}
 
-        public:
-        ctors() : nError1(FileBase::E_None),nError2(FileBase::E_None) {}
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
             // LLA: t_print("tearDown done.\n");
         }
 
-        // test code.
+
         void ctors_001()
         {
-            Directory testDirectory( aTmpName3 ); // constructor
+            Directory testDirectory(aTmpName3); // constructor
 
             // open a directory
             nError1 = testDirectory.open();
-             CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+             CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             // close a directory
             nError2 = testDirectory.close();
-             CPPUNIT_ASSERT_EQUAL( nError2, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError2, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for ctors function: create an instance and check open and close",
-                                     FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for ctors function: create an instance and check open and close",
-                                    FileBase::E_None, nError2 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: create an instance and check open and close",
+                                     osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: create an instance and check open and close",
+                                    osl::FileBase::E_None, nError2);
         }
 
         void ctors_002()
         {
-            Directory testDirectory( aTmpName9 ); // constructor
+            Directory testDirectory(aTmpName9); // constructor
 
             // open a directory
             nError1 = testDirectory.open();
-             CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             // close a directory
             nError2 = testDirectory.close();
-             CPPUNIT_ASSERT_EQUAL( nError2, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError2, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for ctors function: relative URL, :-), it is also worked",
-                                     FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for ctors function: relative URL, :-), it is also worked",
-                                    FileBase::E_None, nError2 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: relative URL, :-), it is also worked",
+                                     osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: relative URL, :-), it is also worked",
+                                    osl::FileBase::E_None, nError2);
         }
 
-        CPPUNIT_TEST_SUITE( ctors );
-        CPPUNIT_TEST( ctors_001 );
-        CPPUNIT_TEST( ctors_002 );
+        CPPUNIT_TEST_SUITE(ctors);
+            CPPUNIT_TEST(ctors_001);
+            CPPUNIT_TEST(ctors_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
     //  inline RC open()
 
-    class  open : public CppUnit::TestFixture
+    class open : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2;
+    private:
+        osl::FileBase::RC nError1, nError2;
+
+    public:
+        open() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {}
 
-        public:
-        open() : nError1(FileBase::E_None),nError2(FileBase::E_None) {}
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
         void open_001()
         {
-            Directory testDirectory( aTmpName3 ); // constructor
+            Directory testDirectory(aTmpName3);
 
             // open a directory
             nError1 = testDirectory.open();
@@ -4016,98 +4016,96 @@ namespace osl_Directory
             // close a directory
             nError2 = testDirectory.close();
 
-            CPPUNIT_ASSERT_MESSAGE( "test for open function: open a directory and check for open",
-                                    bOk );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for open function: open a directory and check for open",
-                                     FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for open function: open a directory and check for open",
-                                    FileBase::E_None, nError2 );
+            CPPUNIT_ASSERT_MESSAGE("test for open function: open a directory and check for open",
+                                    bOk);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: open a directory and check for open",
+                                     osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: open a directory and check for open",
+                                    osl::FileBase::E_None, nError2);
         }
 
         void open_002()
         {
-            Directory testDirectory( aTmpName6 ); // constructor
+            Directory testDirectory(aTmpName6);
 
-            // open a directory
             nError1 = testDirectory.open();
-             if ( FileBase::E_None == nError1 )
+             if (osl::FileBase::E_None == nError1)
             {
                 nError2 = testDirectory.close();
-                CPPUNIT_ASSERT_EQUAL( nError2, FileBase::E_None );
+                CPPUNIT_ASSERT_EQUAL(nError2, osl::FileBase::E_None);
             }
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for open function: open a file that is not existed",
-                                     FileBase::E_NOENT, nError1 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: open a file that is not existed",
+                                     osl::FileBase::E_NOENT, nError1);
         }
 
         void open_003()
         {
-            Directory testDirectory( aUserDirectorySys ); // constructor
+            Directory testDirectory(aUserDirectorySys);
 
-            // open a directory
             nError1 = testDirectory.open();
-             if ( FileBase::E_None == nError1 )
+             if (osl::FileBase::E_None == nError1)
             {
                 nError2 = testDirectory.close();
-                CPPUNIT_ASSERT_EQUAL( nError2, FileBase::E_None );
+                CPPUNIT_ASSERT_EQUAL(nError2, osl::FileBase::E_None);
             }
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for open function: using system path",
-                                     FileBase::E_INVAL, nError1 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: using system path",
+                                     osl::FileBase::E_INVAL, nError1);
         }
 
         void open_004()
         {
-            Directory testDirectory( aTmpName4 ); // constructor
+            Directory testDirectory(aTmpName4);
 
-            // open a directory
             nError1 = testDirectory.open();
-             if ( FileBase::E_None == nError1 )
+             if (osl::FileBase::E_None == nError1)
             {
                 nError2 = testDirectory.close();
-                CPPUNIT_ASSERT_EQUAL( nError2, FileBase::E_None );
+                CPPUNIT_ASSERT_EQUAL(nError2, osl::FileBase::E_None);
             }
 
-            CPPUNIT_ASSERT_MESSAGE( "test for open function: open a file instead of a directory",
-                                     ( FileBase::E_NOTDIR == nError1 ) || ( FileBase::E_ACCES == nError1 ) );
+            CPPUNIT_ASSERT_MESSAGE("test for open function: open a file instead of a directory",
+                                     (osl::FileBase::E_NOTDIR == nError1) || (osl::FileBase::E_ACCES == nError1));
         }
 
-        CPPUNIT_TEST_SUITE( open );
-        CPPUNIT_TEST( open_001 );
-        CPPUNIT_TEST( open_002 );
-        CPPUNIT_TEST( open_003 );
-        CPPUNIT_TEST( open_004 );
+        CPPUNIT_TEST_SUITE(open);
+            CPPUNIT_TEST(open_001);
+            CPPUNIT_TEST(open_002);
+            CPPUNIT_TEST(open_003);
+            CPPUNIT_TEST(open_004);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
     //  inline sal_Bool isOpen() { return _pData != NULL; };
 
-    class  isOpen : public CppUnit::TestFixture
+    class isOpen : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2;
+    private:
+        osl::FileBase::RC nError1, nError2;
+
+    public:
+        isOpen() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {}
 
-        public:
-        isOpen() : nError1(FileBase::E_None),nError2(FileBase::E_None) {}
-        // initialization
         void setUp() override
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
         }
 
         void tearDown() override
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
+
         void isOpen_001()
         {
-            Directory testDirectory( aTmpName3 ); // constructor
+            Directory testDirectory(aTmpName3); // constructor
 
             // open a directory
             nError1 = testDirectory.open();
@@ -4116,53 +4114,53 @@ namespace osl_Directory
             // close a directory
             nError2 = testDirectory.close();
 
-            CPPUNIT_ASSERT_MESSAGE( "test for isOpen function: open a directory and check for open",
-                                    bOk );
+            CPPUNIT_ASSERT_MESSAGE("test for isOpen function: open a directory and check for open",
+                                    bOk);
         }
 
         void isOpen_002()
         {
-            Directory testDirectory( aTmpName3 ); // constructor
+            Directory testDirectory(aTmpName3); // constructor
 
             // check if directory is opened.
             bool bOk = testDirectory.isOpen();
 
-            CPPUNIT_ASSERT_MESSAGE( "test for isOpen function: do not open a directory and check for open",
-                                    !bOk );
+            CPPUNIT_ASSERT_MESSAGE("test for isOpen function: do not open a directory and check for open",
+                                    !bOk);
         }
 
-        CPPUNIT_TEST_SUITE( isOpen );
-        CPPUNIT_TEST( isOpen_001 );
-        CPPUNIT_TEST( isOpen_002 );
+        CPPUNIT_TEST_SUITE(isOpen);
+            CPPUNIT_TEST(isOpen_001);
+            CPPUNIT_TEST(isOpen_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
     //  inline RC close()
 
-    class  close : public CppUnit::TestFixture
+    class close : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2;
+    private:
+        osl::FileBase::RC nError1, nError2;
+
+    public:
+        close() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {}
 
-        public:
-        close() : nError1(FileBase::E_None),nError2(FileBase::E_None) {}
-        // initialization
         void setUp() override
         {
             // create a tempdirectory : $TEMP/tmpdir.
-            createTestDirectory( aTmpName3 );
+            createTestDirectory(aTmpName3);
         }
 
         void tearDown() override
         {
             // remove a tempdirectory : $TEMP/tmpdir.
-            deleteTestDirectory( aTmpName3 );
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
         void close_001()
         {
-            Directory testDirectory( aTmpName3 ); // constructor
+            Directory testDirectory(aTmpName3);
 
             // open a directory
             nError1 = testDirectory.open();
@@ -4171,209 +4169,212 @@ namespace osl_Directory
             // check if directory is opened.
             bool bOk = testDirectory.isOpen();
 
-            CPPUNIT_ASSERT_MESSAGE( "test for isOpen function: close a directory and check for open",
-                                    !bOk );
+            CPPUNIT_ASSERT_MESSAGE("test for isOpen function: close a directory and check for open",
+                                    !bOk);
         }
 
         void close_002()
         {
-            Directory testDirectory( aTmpName3 ); // constructor
+            Directory testDirectory(aTmpName3);
 
             // close a directory
             nError1 = testDirectory.close();
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for isOpen function: close a not opened directory",
-                                    FileBase::E_BADF, nError1 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for isOpen function: close a not opened directory",
+                                    osl::FileBase::E_BADF, nError1);
         }
 
-        CPPUNIT_TEST_SUITE( close );
-        CPPUNIT_TEST( close_001 );
-        CPPUNIT_TEST( close_002 );
+        CPPUNIT_TEST_SUITE(close);
+            CPPUNIT_TEST(close_001);
+            CPPUNIT_TEST(close_002);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
     //  inline RC reset()
 
-    class  reset : public CppUnit::TestFixture
+    class reset : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2;
+    private:
+        osl::FileBase::RC nError1, nError2;
         DirectoryItem    rItem;
 
-        public:
-        reset() : nError1(FileBase::E_None),nError2(FileBase::E_None) {}
-        // initialization
+    public:
+        reset() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {}
+
         void setUp() override
         {
             // create a tempdirectory : $TEMP/tmpdir.
-            createTestDirectory( aTmpName3 );
+            createTestDirectory(aTmpName3);
             // create three files : $TEMP/tmpdir/tmpname, $TEMP/tmpdir/tmpdir, $TEMP/tmpdir/hiddenfile,
-            createTestFile( aTmpName3, aTmpName2);
-            createTestFile( aTmpName3, aTmpName1);
-            createTestFile( aTmpName3, aHidURL1);
+            createTestFile(aTmpName3, aTmpName2);
+            createTestFile(aTmpName3, aTmpName1);
+            createTestFile(aTmpName3, aHidURL1);
         }
 
         void tearDown() override
         {
             // remove three files : $TEMP/tmpdir/tmpname, $TEMP/tmpdir/tmpdir, $TEMP/tmpdir/hiddenfile,
-            deleteTestFile( aTmpName3, aHidURL1);
-            deleteTestFile( aTmpName3, aTmpName1);
-            deleteTestFile( aTmpName3, aTmpName2);
+            deleteTestFile(aTmpName3, aHidURL1);
+            deleteTestFile(aTmpName3, aTmpName1);
+            deleteTestFile(aTmpName3, aTmpName2);
             // remove a tempdirectory : $TEMP/tmpdir.
-            deleteTestDirectory( aTmpName3 );
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
+
         void reset_001()
         {
-            Directory testDirectory( aTmpName3 ); // constructor
+            Directory testDirectory(aTmpName3); // constructor
 
             // open a directory
             nError1 = testDirectory.open();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             // get first Item
-            nError1 = testDirectory.getNextItem( rItem, 1 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testDirectory.getNextItem(rItem, 1);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             // check the file name of first Item
-              FileStatus   rFileStatusFirst( osl_FileStatus_Mask_FileName );
-            nError1 = rItem.getFileStatus( rFileStatusFirst );
+              FileStatus   rFileStatusFirst(osl_FileStatus_Mask_FileName);
+            nError1 = rItem.getFileStatus(rFileStatusFirst);
 
             // get second Item
-            // mindy: nError1 = testDirectory.getNextItem( rItem, 0 );
-            // mindy: CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            // mindy: nError1 = testDirectory.getNextItem(rItem, 0);
+            // mindy: CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             // reset enumeration
             nError2 = testDirectory.reset();
-            CPPUNIT_ASSERT_EQUAL( nError2, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError2, osl::FileBase::E_None);
             // get reseted Item, if reset does not work, getNextItem() should return the second Item (aTmpName1)
-            nError1 = testDirectory.getNextItem( rItem );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = testDirectory.getNextItem(rItem);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             // check the file name again
-              FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
-            nError1 = rItem.getFileStatus( rFileStatus );
+              FileStatus   rFileStatus(osl_FileStatus_Mask_FileName);
+            nError1 = rItem.getFileStatus(rFileStatus);
             // close a directory
             nError1 = testDirectory.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             bool bOK1,bOK2,bOK3;
-            bOK1 = compareFileName( rFileStatus.getFileName(), aTmpName2 );
-            bOK2 = compareFileName( rFileStatus.getFileName(), aHidURL1 );
-            bOK3 = compareFileName( rFileStatus.getFileName(), rFileStatusFirst.getFileName() );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for reset function: get two directory item, reset it, then get again, check the filename",
-                                    FileBase::E_None, nError2 );
-            CPPUNIT_ASSERT_MESSAGE( "test for reset function: get two directory item, reset it, then get again, check the filename",
-                                    ( bOK1 || bOK2 || bOK3 ) );
+            bOK1 = compareFileName(rFileStatus.getFileName(), aTmpName2);
+            bOK2 = compareFileName(rFileStatus.getFileName(), aHidURL1);
+            bOK3 = compareFileName(rFileStatus.getFileName(), rFileStatusFirst.getFileName());
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for reset function: get two directory item, reset it, then get again, check the filename",
+                                    osl::FileBase::E_None, nError2);
+            CPPUNIT_ASSERT_MESSAGE("test for reset function: get two directory item, reset it, then get again, check the filename",
+                                    (bOK1 || bOK2 || bOK3));
         }
 
         void reset_002()
         {
-            Directory testDirectory( aTmpName6 ); // constructor
+            Directory testDirectory(aTmpName6); // constructor
 
             // close a directory
             nError1 = testDirectory.reset();
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for reset function: reset a non existed directory",
-                                    FileBase::E_NOENT, nError1 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for reset function: reset a non existed directory",
+                                    osl::FileBase::E_NOENT, nError1);
         }
 
         void reset_003()
         {
-            Directory testDirectory( aTmpName4 ); // constructor
+            Directory testDirectory(aTmpName4); // constructor
 
             // close a directory
             nError1 = testDirectory.reset();
 
-            CPPUNIT_ASSERT_MESSAGE( "test for reset function: reset a file instead of a directory",
-                                    ( FileBase::E_NOTDIR == nError1 ) || ( FileBase::E_NOENT == nError1 ) );
+            CPPUNIT_ASSERT_MESSAGE("test for reset function: reset a file instead of a directory",
+                                    (osl::FileBase::E_NOTDIR == nError1) || (osl::FileBase::E_NOENT == nError1));
         }
 
         void reset_004()
         {
-            Directory testDirectory( aUserDirectorySys ); // constructor
+            Directory testDirectory(aUserDirectorySys); // constructor
 
             // close a directory
             nError1 = testDirectory.reset();
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for reset function: use a system path",
-                                    FileBase::E_INVAL, nError1 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for reset function: use a system path",
+                                    osl::FileBase::E_INVAL, nError1);
         }
 
-        CPPUNIT_TEST_SUITE( reset );
-        CPPUNIT_TEST( reset_001 );
-        CPPUNIT_TEST( reset_002 );
-        CPPUNIT_TEST( reset_003 );
-        CPPUNIT_TEST( reset_004 );
+        CPPUNIT_TEST_SUITE(reset);
+            CPPUNIT_TEST(reset_001);
+            CPPUNIT_TEST(reset_002);
+            CPPUNIT_TEST(reset_003);
+            CPPUNIT_TEST(reset_004);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline RC getNextItem( DirectoryItem& rItem, sal_uInt32 nHint = 0 )
+    //  inline RC getNextItem(DirectoryItem& rItem, sal_uInt32 nHint = 0)
 
-    class  getNextItem : public CppUnit::TestFixture
+    class getNextItem : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2;
-        DirectoryItem    rItem;
+    private:
+        osl::FileBase::RC nError1, nError2;
+        DirectoryItem rItem;
+
+    public:
+        getNextItem() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {}
 
-        public:
-        getNextItem() : nError1(FileBase::E_None),nError2(FileBase::E_None) {}
-        // initialization
         void setUp() override
         {
             // create a tempdirectory : $TEMP/tmpdir.
-            createTestDirectory( aTmpName3 );
+            createTestDirectory(aTmpName3);
             // create three files : $TEMP/tmpdir/tmpname, $TEMP/tmpdir/tmpdir, $TEMP/tmpdir/hiddenfile,
-            createTestFile( aTmpName3, aTmpName2 );
-            createTestFile( aTmpName3, aTmpName1 );
-            createTestFile( aTmpName3, aHidURL1 );
+            createTestFile(aTmpName3, aTmpName2);
+            createTestFile(aTmpName3, aTmpName1);
+            createTestFile(aTmpName3, aHidURL1);
 
         }
 
         void tearDown() override
         {
             // remove three files : $TEMP/tmpdir/tmpname, $TEMP/tmpdir/tmpdir, $TEMP/tmpdir/hiddenfile,
-            deleteTestFile( aTmpName3, aHidURL1 );
-            deleteTestFile( aTmpName3, aTmpName1 );
-            deleteTestFile( aTmpName3, aTmpName2 );
+            deleteTestFile(aTmpName3, aHidURL1);
+            deleteTestFile(aTmpName3, aTmpName1);
+            deleteTestFile(aTmpName3, aTmpName2);
             // remove a tempdirectory : $TEMP/tmpdir.
-            deleteTestDirectory( aTmpName3 );
+            deleteTestDirectory(aTmpName3);
         }
 
-        // test code.
+
         void getNextItem_001()
         {
-             Directory testDirectory( aTmpName3 ); // constructor
+             Directory testDirectory(aTmpName3); // constructor
 
             // open a directory
             nError1 = testDirectory.open();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
             // check the file name
-            bool            bOk1 = false;
+            bool bOk1 = false;
             bool bOk2 = false;
             bool bOk3 = false;
-              FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
-            for ( int nCount = 0; nCount < 3; nCount++ )
+            FileStatus rFileStatus(osl_FileStatus_Mask_FileName);
+
+            for (int nCount = 0; nCount < 3; nCount++)
             {
                 // get three Items
-                nError1 = testDirectory.getNextItem( rItem, 2 );
-                CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
-                nError1 = rItem.getFileStatus( rFileStatus );
-                CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+                nError1 = testDirectory.getNextItem(rItem, 2);
+                CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+                nError1 = rItem.getFileStatus(rFileStatus);
+                CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
                 // a special order is not guaranteed. So any file may occur on any time.
                 // But every file name should occur only once.
-                if ( !bOk1 && compareFileName( rFileStatus.getFileName(), aTmpName1 ) )
+                if (!bOk1 && compareFileName(rFileStatus.getFileName(), aTmpName1))
                 {
                     bOk1 = true;
                 }
 
-                if ( !bOk2 && compareFileName( rFileStatus.getFileName(), aTmpName2 ) )
+                if (!bOk2 && compareFileName(rFileStatus.getFileName(), aTmpName2))
                 {
                     bOk2 = true;
                 }
 
-                if ( !bOk3 && compareFileName( rFileStatus.getFileName(), aHidURL1 ) )
+                if (!bOk3 && compareFileName(rFileStatus.getFileName(), aHidURL1))
                 {
                     bOk3 = true;
                 }
@@ -4381,44 +4382,44 @@ namespace osl_Directory
 
             // close a directory
             nError1 = testDirectory.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for getNextItem function: retrieve three items and check their names.",
-                                    bOk1 );
-            CPPUNIT_ASSERT_MESSAGE( "test for getNextItem function: retrieve three items and check their names.",
-                                    bOk2 );
-            CPPUNIT_ASSERT_MESSAGE( "test for getNextItem function: retrieve three items and check their names.",
-                                    bOk3 );
+            CPPUNIT_ASSERT_MESSAGE("test for getNextItem function: retrieve three items and check their names.",
+                                    bOk1);
+            CPPUNIT_ASSERT_MESSAGE("test for getNextItem function: retrieve three items and check their names.",
+                                    bOk2);
+            CPPUNIT_ASSERT_MESSAGE("test for getNextItem function: retrieve three items and check their names.",
+                                    bOk3);
         }
 
         void getNextItem_002()
         {
-             Directory testDirectory( aTmpName3 ); // constructor
-            nError1 = testDirectory.getNextItem( rItem );
+             Directory testDirectory(aTmpName3); // constructor
+            nError1 = testDirectory.getNextItem(rItem);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getNextItem function: retrieve an item in a directory which is not opened, also test for nHint's default value.",
-                                    FileBase::E_INVAL, nError1 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getNextItem function: retrieve an item in a directory which is not opened, also test for nHint's default value.",
+                                    osl::FileBase::E_INVAL, nError1);
         }
 
         void getNextItem_003()
         {
-             Directory testDirectory( aTmpName3 ); // constructor
+             Directory testDirectory(aTmpName3); // constructor
 
             // open a directory
             nError1 = testDirectory.open();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            for ( int nCount = 0; nCount < 4; nCount++ )
+            for (int nCount = 0; nCount < 4; nCount++)
             {
-                nError2 = testDirectory.getNextItem( rItem, 3 );
+                nError2 = testDirectory.getNextItem(rItem, 3);
             }
 
             // close a directory
             nError1 = testDirectory.close();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getNextItem function: retrieve 4 times in a directory which contain only 3 files.",
-                                    FileBase::E_NOENT, nError2 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getNextItem function: retrieve 4 times in a directory which contain only 3 files.",
+                                    osl::FileBase::E_NOENT, nError2);
         }
 
         void getNextItem_004()
@@ -4428,33 +4429,33 @@ namespace osl_Directory
             bool bLnkOK = false;
             bool bFoundOK = false;
 
-            OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
+            OUString aUStr_LnkFileSys(aTempDirectorySys), aUStr_SrcFileSys(aTempDirectorySys);
             aUStr_LnkFileSys += aSlashURL + "/tmpdir/link.file";
             aUStr_SrcFileSys += aSlashURL + "/tmpdir/tmpname";
 
             OString strLinkFileName, strSrcFileName;
-            strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
-            strSrcFileName  = OUStringToOString( aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US );
+            strLinkFileName = OUStringToOString(aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US);
+            strSrcFileName  = OUStringToOString(aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US);
 
             // create a link file and link it to file "/tmp/PID/tmpdir/tmpname"
-            sal_Int32 fd = symlink( strSrcFileName.getStr(), strLinkFileName.getStr() );
-            CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(0), fd );
-            Directory testDirectory( aTmpName3 );
+            sal_Int32 fd = symlink(strSrcFileName.getStr(), strLinkFileName.getStr());
+            CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), fd);
+            Directory testDirectory(aTmpName3);
 
             // open a directory
             nError1 = testDirectory.open();
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             OUString aFileName ("link.file");
 
             while (true) {
-                nError1 = testDirectory.getNextItem( rItem, 4 );
-                if (FileBase::E_None == nError1) {
-                    FileStatus   rFileStatus( osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Type );
-                    rItem.getFileStatus( rFileStatus );
-                    if ( compareFileName( rFileStatus.getFileName(), aFileName) )
+                nError1 = testDirectory.getNextItem(rItem, 4);
+                if (osl::FileBase::E_None == nError1) {
+                    FileStatus   rFileStatus(osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Type);
+                    rItem.getFileStatus(rFileStatus);
+                    if (compareFileName(rFileStatus.getFileName(), aFileName))
                     {
                         bFoundOK = true;
-                        if ( FileStatus::Link == rFileStatus.getFileType())
+                        if (FileStatus::Link == rFileStatus.getFileType())
                         {
                             bLnkOK = true;
                             break;
@@ -4464,148 +4465,154 @@ namespace osl_Directory
                 else
                     break;
             };
-                fd = std::remove( strLinkFileName.getStr() );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "remove link file failed", static_cast<sal_Int32>(0), fd );
-            CPPUNIT_ASSERT_MESSAGE( "test for getNextItem function: check if can retrieve the link file name",
-                                    bFoundOK );
-            CPPUNIT_ASSERT_MESSAGE( "test for getNextItem function: check if link file has file type link",
-                                    bLnkOK );
+                fd = std::remove(strLinkFileName.getStr());
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("remove link file failed", static_cast<sal_Int32>(0), fd);
+            CPPUNIT_ASSERT_MESSAGE("test for getNextItem function: check if can retrieve the link file name",
+                                    bFoundOK);
+            CPPUNIT_ASSERT_MESSAGE("test for getNextItem function: check if link file has file type link",
+                                    bLnkOK);
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( getNextItem );
-        CPPUNIT_TEST( getNextItem_001 );
-        CPPUNIT_TEST( getNextItem_002 );
-        CPPUNIT_TEST( getNextItem_003 );
-        CPPUNIT_TEST( getNextItem_004 );
+        CPPUNIT_TEST_SUITE(getNextItem);
+            CPPUNIT_TEST(getNextItem_001);
+            CPPUNIT_TEST(getNextItem_002);
+            CPPUNIT_TEST(getNextItem_003);
+            CPPUNIT_TEST(getNextItem_004);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline static RC getVolumeInfo( const OUString& ustrDirectoryURL, VolumeInfo& rInfo )
+    //  inline static RC getVolumeInfo(const OUString& ustrDirectoryURL, VolumeInfo& rInfo)
 
-    class  getVolumeInfo : public CppUnit::TestFixture
+    class getVolumeInfo : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1;
+    private:
+        osl::FileBase::RC nError1;
 
-        public:
+    public:
+        getVolumeInfo() : nError1(osl::FileBase::E_None) {}
 
-        getVolumeInfo() : nError1(FileBase::E_None) {}
-        // test code.
         void checkValidMask(osl::VolumeInfo const& _aVolumeInfo, sal_Int32 _nMask)
-            {
-                if (_nMask == osl_VolumeInfo_Mask_FileSystemName)
         {
-            // get file system name
-            OUString aFileSysName( aNullURL );
-                    aFileSysName = _aVolumeInfo.getFileSystemName();
-
-                    bool bRes2 = compareFileName( aFileSysName, aNullURL );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getVolumeInfo function: getVolumeInfo of root directory.",
-                                    osl::FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_MESSAGE( "test for getVolumeInfo function: getVolumeInfo of root directory.",
-                                    !bRes2 );
-                }
-                if (_nMask == osl_VolumeInfo_Mask_Attributes)
-                {
-                    bool b1 = _aVolumeInfo.getRemoteFlag();
-                    bool b2 = _aVolumeInfo.getRemoveableFlag();
-                    bool b3 = _aVolumeInfo.getCompactDiscFlag();
-                    bool b4 = _aVolumeInfo.getFloppyDiskFlag();
-                    bool b5 = _aVolumeInfo.getFixedDiskFlag();
-                    bool b6 = _aVolumeInfo.getRAMDiskFlag();
-
-                    rtl::OString sAttr;
-                    if (b1) sAttr =  "Remote";
-                    if (b2) sAttr += " Removeable";
-                    if (b3) sAttr += " CDROM";
-                    if (b4) sAttr += " Floppy";
-                    if (b5) sAttr += " FixedDisk";
-                    if (b6) sAttr += " RAMDisk";
-
-                    printf("Attributes: %s\n", sAttr.getStr() );
-                }
-                if (_nMask == osl_VolumeInfo_Mask_TotalSpace)
-                {
-                    // within Linux, df / * 1024 bytes is the result
-                    sal_uInt64 nSize = _aVolumeInfo.getTotalSpace();
-                    printf("Total space: %" SAL_PRIuUINT64 "\n", nSize);
-                }
-                if (_nMask == osl_VolumeInfo_Mask_UsedSpace)
-                {
-                    sal_uInt64 nSize = _aVolumeInfo.getUsedSpace();
-                    printf(" Used space: %" SAL_PRIuUINT64 "\n", nSize);
-                }
-                if (_nMask == osl_VolumeInfo_Mask_FreeSpace)
-                {
-                    sal_uInt64 nSize = _aVolumeInfo.getFreeSpace();
-                    printf(" Free space: %" SAL_PRIuUINT64 "\n", nSize);
-                }
-                if (_nMask == osl_VolumeInfo_Mask_MaxNameLength)
-                {
-                    sal_uInt32 nLength = _aVolumeInfo.getMaxNameLength();
-                    printf("max name length: %" SAL_PRIuUINT32 "\n", nLength);
-                }
-                if (_nMask == osl_VolumeInfo_Mask_MaxPathLength)
-                {
-                    sal_uInt32 nLength = _aVolumeInfo.getMaxPathLength();
-                    printf("max path length: %" SAL_PRIuUINT32 "\n", nLength);
-                }
-                if (_nMask == osl_VolumeInfo_Mask_FileSystemCaseHandling)
-                {
-                    bool bIsCase = _aVolumeInfo.isCaseSensitiveFileSystem();
-                    printf("filesystem case sensitive: %s\n", bIsCase ? "yes" : "no");
-                }
+            if (_nMask == osl_VolumeInfo_Mask_FileSystemName)
+            {
+                // get file system name
+                OUString aFileSysName(aNullURL);
+                        aFileSysName = _aVolumeInfo.getFileSystemName();
+
+                        bool bRes2 = compareFileName(aFileSysName, aNullURL);
+                CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getVolumeInfo function: getVolumeInfo of root directory.",
+                                        osl::FileBase::E_None, nError1);
+                CPPUNIT_ASSERT_MESSAGE("test for getVolumeInfo function: getVolumeInfo of root directory.",
+                                        !bRes2);
             }
 
-        void checkVolumeInfo(sal_Int32 _nMask)
+            if (_nMask == osl_VolumeInfo_Mask_Attributes)
             {
-                VolumeInfo aVolumeInfo( _nMask );
-                // call getVolumeInfo here
-                nError1 = Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
-                // LLA: IMHO it's not a bug, if VolumeInfo is not valid, it's a feature
-                // LLA: CPPUNIT_ASSERT_MESSAGE("mask is not valid", sal_True == aVolumeInfo.isValid( _nMask ) );
-                if (aVolumeInfo.isValid( _nMask))
-                {
-                    checkValidMask(aVolumeInfo, _nMask);
-                }
+                bool b1 = _aVolumeInfo.getRemoteFlag();
+                bool b2 = _aVolumeInfo.getRemoveableFlag();
+                bool b3 = _aVolumeInfo.getCompactDiscFlag();
+                bool b4 = _aVolumeInfo.getFloppyDiskFlag();
+                bool b5 = _aVolumeInfo.getFixedDiskFlag();
+                bool b6 = _aVolumeInfo.getRAMDiskFlag();
+
+                OString sAttr;
+                if (b1) sAttr =  "Remote";
+                if (b2) sAttr += " Removeable";
+                if (b3) sAttr += " CDROM";
+                if (b4) sAttr += " Floppy";
+                if (b5) sAttr += " FixedDisk";
+                if (b6) sAttr += " RAMDisk";
+
+                printf("Attributes: %s\n", sAttr.getStr());
+            }
+            if (_nMask == osl_VolumeInfo_Mask_TotalSpace)
+            {
+                // within Linux, df / * 1024 bytes is the result
+                sal_uInt64 nSize = _aVolumeInfo.getTotalSpace();
+                printf("Total space: %" SAL_PRIuUINT64 "\n", nSize);
+            }
+            if (_nMask == osl_VolumeInfo_Mask_UsedSpace)
+            {
+                sal_uInt64 nSize = _aVolumeInfo.getUsedSpace();
+                printf(" Used space: %" SAL_PRIuUINT64 "\n", nSize);
+            }
+            if (_nMask == osl_VolumeInfo_Mask_FreeSpace)
+            {
+                sal_uInt64 nSize = _aVolumeInfo.getFreeSpace();
+                printf(" Free space: %" SAL_PRIuUINT64 "\n", nSize);
+            }
+            if (_nMask == osl_VolumeInfo_Mask_MaxNameLength)
+            {
+                sal_uInt32 nLength = _aVolumeInfo.getMaxNameLength();
+                printf("max name length: %" SAL_PRIuUINT32 "\n", nLength);
+            }
+            if (_nMask == osl_VolumeInfo_Mask_MaxPathLength)
+            {
+                sal_uInt32 nLength = _aVolumeInfo.getMaxPathLength();
+                printf("max path length: %" SAL_PRIuUINT32 "\n", nLength);
+            }
+            if (_nMask == osl_VolumeInfo_Mask_FileSystemCaseHandling)
+            {
+                bool bIsCase = _aVolumeInfo.isCaseSensitiveFileSystem();
+                printf("filesystem case sensitive: %s\n", bIsCase ? "yes" : "no");
             }
+        }
+
+        void checkVolumeInfo(sal_Int32 _nMask)
+        {
+            VolumeInfo aVolumeInfo(_nMask);
+            // call getVolumeInfo here
+            nError1 = Directory::getVolumeInfo(aVolURL1, aVolumeInfo);
+            // LLA: IMHO it's not a bug, if VolumeInfo is not valid, it's a feature
+            // LLA: CPPUNIT_ASSERT_MESSAGE("mask is not valid", sal_True == aVolumeInfo.isValid(_nMask));
+            if (aVolumeInfo.isValid(_nMask))
+                checkValidMask(aVolumeInfo, _nMask);
+        }
 
         void getVolumeInfo_001_1()
         {
             sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName;
             checkVolumeInfo(mask);
         }
+
         void getVolumeInfo_001_2()
         {
             sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             checkVolumeInfo(mask);
         }
+
         void getVolumeInfo_001_3()
         {
             sal_Int32 mask = osl_VolumeInfo_Mask_TotalSpace;
             checkVolumeInfo(mask);
         }
+
         void getVolumeInfo_001_4()
         {
             sal_Int32 mask = osl_VolumeInfo_Mask_UsedSpace;
             checkVolumeInfo(mask);
         }
+
         void getVolumeInfo_001_5()
         {
             sal_Int32 mask = osl_VolumeInfo_Mask_FreeSpace;
             checkVolumeInfo(mask);
         }
+
         void getVolumeInfo_001_6()
         {
             sal_Int32 mask = osl_VolumeInfo_Mask_MaxNameLength;
             checkVolumeInfo(mask);
         }
+
         void getVolumeInfo_001_7()
         {
             sal_Int32 mask = osl_VolumeInfo_Mask_MaxPathLength;
             checkVolumeInfo(mask);
         }
+
         void getVolumeInfo_001_8()
         {
             sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemCaseHandling;
@@ -4615,73 +4622,72 @@ namespace osl_Directory
         void getVolumeInfo_002()
         {
             sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName;
-            VolumeInfo aVolumeInfo( mask );
+            VolumeInfo aVolumeInfo(mask);
             // call getVolumeInfo here
 
-            // LLA: rtl::OUString aRootSysURL;
+            // LLA: OUString aRootSysURL;
             // LLA: nError1 = osl::File::getFileURLFromSystemPath(aRootSys, aRootSysURL);
             // LLA:
-            // LLA: CPPUNIT_ASSERT_MESSAGE( "can't convert root path to file url",
-            // LLA:                         ( osl::FileBase::E_NONE == nError1 ) );
+            // LLA: CPPUNIT_ASSERT_MESSAGE("can't convert root path to file url",
+            // LLA:                         (osl::FileBase::E_NONE == nError1));
 
-            nError1 = Directory::getVolumeInfo( aRootSys, aVolumeInfo );
+            nError1 = Directory::getVolumeInfo(aRootSys, aVolumeInfo);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getVolumeInfo function: use system path as parameter.",
-                                    osl::FileBase::E_INVAL, nError1 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getVolumeInfo function: use system path as parameter.",
+                                    osl::FileBase::E_INVAL, nError1);
         }
 
         void getVolumeInfo_003()
         {
             sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName;
-            VolumeInfo aVolumeInfo( mask );
+            VolumeInfo aVolumeInfo(mask);
             // call getVolumeInfo here
-            nError1 = Directory::getVolumeInfo( aTmpName3, aVolumeInfo );
+            nError1 = Directory::getVolumeInfo(aTmpName3, aVolumeInfo);
 
 // LLA: in Windows, it reply no error, it did not pass in (W32).
 #if defined(UNX) && !defined(IOS)
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getVolumeInfo function: non-existence test. ",
-                                    osl::FileBase::E_NOENT, nError1 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getVolumeInfo function: non-existence test. ",
+                                    osl::FileBase::E_NOENT, nError1);
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( getVolumeInfo );
-        CPPUNIT_TEST( getVolumeInfo_001_1 );
-        CPPUNIT_TEST( getVolumeInfo_001_2 );
-        CPPUNIT_TEST( getVolumeInfo_001_3 );
-        CPPUNIT_TEST( getVolumeInfo_001_4 );
-        CPPUNIT_TEST( getVolumeInfo_001_5 );
-        CPPUNIT_TEST( getVolumeInfo_001_6 );
-        CPPUNIT_TEST( getVolumeInfo_001_7 );
-        CPPUNIT_TEST( getVolumeInfo_001_8 );
-        CPPUNIT_TEST( getVolumeInfo_002 );
-        CPPUNIT_TEST( getVolumeInfo_003 );
+        CPPUNIT_TEST_SUITE(getVolumeInfo);
+            CPPUNIT_TEST(getVolumeInfo_001_1);
+            CPPUNIT_TEST(getVolumeInfo_001_2);
+            CPPUNIT_TEST(getVolumeInfo_001_3);
+            CPPUNIT_TEST(getVolumeInfo_001_4);
+            CPPUNIT_TEST(getVolumeInfo_001_5);
+            CPPUNIT_TEST(getVolumeInfo_001_6);
+            CPPUNIT_TEST(getVolumeInfo_001_7);
+            CPPUNIT_TEST(getVolumeInfo_001_8);
+            CPPUNIT_TEST(getVolumeInfo_002);
+            CPPUNIT_TEST(getVolumeInfo_003);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline static RC create( const OUString& ustrDirectoryURL )
+    //  inline static RC create(const OUString& ustrDirectoryURL)
 
-    class  create : public CppUnit::TestFixture
+    class create : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2;
-
-        public:
+    private:
+        osl::FileBase::RC nError1, nError2;
 
-        // test code.
-        create() : nError1(FileBase::E_None),nError2(FileBase::E_None) {}
+    public:
+        create() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {}
         void create_001()
         {
             // create directory in $TEMP/tmpdir
-            nError1 = Directory::create( aTmpName3 );
+            nError1 = Directory::create(aTmpName3);
             // check for existence
-            nError2 = Directory::create( aTmpName3 );
+            nError2 = Directory::create(aTmpName3);
             // remove it
-            deleteTestDirectory( aTmpName3 );
+            deleteTestDirectory(aTmpName3);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for create function: create a directory and check its existence.",
-                                    osl::FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for create function: create a directory and check its existence.",
-                                    osl::FileBase::E_EXIST, nError2 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for create function: create a directory and check its existence.",
+                                    osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for create function: create a directory and check its existence.",
+                                    osl::FileBase::E_EXIST, nError2);
         }
 
         void create_002()
@@ -4690,8 +4696,8 @@ namespace osl_Directory
             if (geteuid() == 0) // don't test if building as root
                 return;
 
-            rtl::OUString aTmpDir;
-            nError1 = FileBase::createTempFile(nullptr, nullptr, &aTmpDir);
+            OUString aTmpDir;
+            nError1 = osl::FileBase::createTempFile(nullptr, nullptr, &aTmpDir);
             CPPUNIT_ASSERT_EQUAL_MESSAGE("temp File creation failed", osl::FileBase::E_None, nError1);
 
             nError1 = File::remove(aTmpDir);
@@ -4705,7 +4711,7 @@ namespace osl_Directory
             osl_setFileAttributes(aTmpDir.pData, 0); // no access allowed now
 
             // Shouldn't be possible now to create a dir underneath it
-            rtl::OUString aTmpSubLevel = aTmpDir + "/notallowedhere";
+            OUString aTmpSubLevel = aTmpDir + "/notallowedhere";
             nError1 = Directory::create(aTmpSubLevel);
 
             // allow removal
@@ -4724,112 +4730,113 @@ namespace osl_Directory
         void create_003()
         {
             // create directory in /tmpname
-            nError1 = Directory::create( aSysPath1 );
+            nError1 = Directory::create(aSysPath1);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for create function: create a directory using system path.",
-                                    osl::FileBase::E_INVAL, nError1 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for create function: create a directory using system path.",
+                                    osl::FileBase::E_INVAL, nError1);
         }
 
-        CPPUNIT_TEST_SUITE( create );
-        CPPUNIT_TEST( create_001 );
-        CPPUNIT_TEST( create_002 );
-        CPPUNIT_TEST( create_003 );
+        CPPUNIT_TEST_SUITE(create);
+            CPPUNIT_TEST(create_001);
+            CPPUNIT_TEST(create_002);
+            CPPUNIT_TEST(create_003);
         CPPUNIT_TEST_SUITE_END();
     };
 
     //  testing the method
-    //  inline static RC remove( const OUString& ustrDirectoryURL )
+    //  inline static RC remove(const OUString& ustrDirectoryURL)
 
-    class  remove : public CppUnit::TestFixture
+    class remove : public CppUnit::TestFixture
     {
-        FileBase::RC     nError1, nError2;
+    private:
+        osl::FileBase::RC nError1, nError2;
 
-        public:
+    public:
+        remove() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {}
 
-        remove() : nError1(FileBase::E_None),nError2(FileBase::E_None) {}
-        // test code.
         void remove_001()
         {
             // create directory in $TEMP/tmpdir
-            nError1 = Directory::create( aTmpName3 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = Directory::create(aTmpName3);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             // remove it
-            nError1 = Directory::remove( aTmpName3 );
+            nError1 = Directory::remove(aTmpName3);
             // check for existence
-            Directory rDirectory( aTmpName3 );
+            Directory rDirectory(aTmpName3);
             nError2 = rDirectory.open();
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for remove function: remove a directory and check its existence.",
-                                    osl::FileBase::E_None, nError1 );
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for remove function: remove a directory and check its existence.",
-                                    osl::FileBase::E_NOENT, nError2 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for remove function: remove a directory and check its existence.",
+                                    osl::FileBase::E_None, nError1);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for remove function: remove a directory and check its existence.",
+                                    osl::FileBase::E_NOENT, nError2);
         }
 
         void remove_002()
         {
             // create directory in $TEMP/tmpdir
-            nError1 = Directory::create( aTmpName3 );
-            CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+            nError1 = Directory::create(aTmpName3);
+            CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
             // try to remove it by system path
-            nError1 = Directory::remove( aSysPath3 );
+            nError1 = Directory::remove(aSysPath3);
              // check for existence
-            Directory rDirectory( aTmpName3 );
+            Directory rDirectory(aTmpName3);
             nError2 = rDirectory.open();
-            if ( osl::FileBase::E_NOENT != nError2 )
-                Directory::remove( aTmpName3 );
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for remove function: remove a directory by its system path, and check its existence.",
-                                    osl::FileBase::E_INVAL, nError1 );
+            if (osl::FileBase::E_NOENT != nError2)
+                Directory::remove(aTmpName3);
+
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for remove function: remove a directory by its system path, and check its existence.",
+                                    osl::FileBase::E_INVAL, nError1);
         }
 
         void remove_003()
         {
             // try to remove a non-existed directory
-            nError1 = Directory::remove( aTmpName6 );
+            nError1 = Directory::remove(aTmpName6);
 
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for remove function: try to remove a non-existed directory.",
-                                    osl::FileBase::E_NOENT, nError1 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("test for remove function: try to remove a non-existed directory.",
+                                    osl::FileBase::E_NOENT, nError1);
         }
 
         void remove_004()
         {
-            createTestFile( aTmpName6 );
-            bool bExist = ifFileExist( aTmpName6 );
+            createTestFile(aTmpName6);
+            bool bExist = ifFileExist(aTmpName6);
             // try to remove file.
-            nError1 = Directory::remove( aTmpName6 );
-            deleteTestFile( aTmpName6 );
+            nError1 = Directory::remove(aTmpName6);
+            deleteTestFile(aTmpName6);
 
-            CPPUNIT_ASSERT_MESSAGE( "test for remove function: try to remove a file but not directory.",
-                                    bExist );
-            CPPUNIT_ASSERT_MESSAGE( "test for remove function: try to remove a file but not directory.",
-                                    ( osl::FileBase::E_NOTDIR == nError1 ) || ( osl::FileBase::E_NOENT == nError1 ) );
+            CPPUNIT_ASSERT_MESSAGE("test for remove function: try to remove a file but not directory.",
+                                    bExist);
+            CPPUNIT_ASSERT_MESSAGE("test for remove function: try to remove a file but not directory.",
+                                    (osl::FileBase::E_NOTDIR == nError1) || (osl::FileBase::E_NOENT == nError1));
         }
 
         void remove_005()
         {
-            createTestDirectory( aTmpName3 );
-            createTestFile( aTmpName4 );
-            nError1 = Directory::remove( aTmpName3 );
-            deleteTestFile( aTmpName4 );
-            deleteTestDirectory( aTmpName3 );
+            createTestDirectory(aTmpName3);
+            createTestFile(aTmpName4);
+            nError1 = Directory::remove(aTmpName3);
+            deleteTestFile(aTmpName4);
+            deleteTestDirectory(aTmpName3);
             OString sError = "test for remove function: try to remove a directory that is not empty.";
-            sError += errorToStr( nError1 ).getStr();
+            sError += errorToStr(nError1).getStr();
 #if defined(__sun)
             // on UNX, the implementation uses rmdir(), which EEXIST is thrown on Solaris when the directory is not empty, refer to: 'man -s 2 rmdir', while on linux, ENOTEMPTY is thrown.
             // EEXIST The directory contains entries other than those for "." and "..".
             printf("#Solaris test\n");
-            CPPUNIT_ASSERT_MESSAGE( sError.getStr(), ( osl::FileBase::E_EXIST == nError1 ) );
+            CPPUNIT_ASSERT_MESSAGE(sError.getStr(), (osl::FileBase::E_EXIST == nError1));
 #else
-            CPPUNIT_ASSERT_EQUAL_MESSAGE( sError.getStr(), osl::FileBase::E_NOTEMPTY, nError1 );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE(sError.getStr(), osl::FileBase::E_NOTEMPTY, nError1);
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( remove );
-        CPPUNIT_TEST( remove_001 );
-        CPPUNIT_TEST( remove_002 );
-        CPPUNIT_TEST( remove_003 );
-        CPPUNIT_TEST( remove_004 );
-        CPPUNIT_TEST( remove_005 );
+        CPPUNIT_TEST_SUITE(remove);
+            CPPUNIT_TEST(remove_001);
+            CPPUNIT_TEST(remove_002);
+            CPPUNIT_TEST(remove_003);
+            CPPUNIT_TEST(remove_004);
+            CPPUNIT_TEST(remove_005);
         CPPUNIT_TEST_SUITE_END();
     };
 
@@ -4849,49 +4856,49 @@ namespace osl_Directory
         if (test_path.isEmpty())
         {
             OUString tmp;
-            FileBase::RC rc = FileBase::getTempDirURL(tmp);
+            osl::FileBase::RC rc = osl::FileBase::getTempDirURL(tmp);
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
             (
              "Getting the location of TMP dir failed",
-             FileBase::E_None, rc
-            );
+             osl::FileBase::E_None, rc
+          );
 
             OUString system_path;
-            rc = FileBase::getSystemPathFromFileURL(tmp, system_path);
+            rc = osl::FileBase::getSystemPathFromFileURL(tmp, system_path);
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
             (
              "Cannot convert the TMP dir to system path",
-             FileBase::E_None, rc
-            );
+             osl::FileBase::E_None, rc
+          );
 
-            OString tmp_x(rtl::OUStringToOString(system_path, RTL_TEXTENCODING_UTF8 ));
+            OString tmp_x(OUStringToOString(system_path, RTL_TEXTENCODING_UTF8));
             if (tmp_x.lastIndexOf('/') != (tmp_x.getLength() - 1))
-                tmp_x += rtl::OString('/');
+                tmp_x += OString('/');
 
 #if !defined(_WIN32) && !defined(ANDROID) && !defined(AIX)
             // FIXME would be nice to create unique dir even on Windows
-            tmp_x += rtl::OString("XXXXXX");
+            tmp_x += OString("XXXXXX");
             char *out = mkdtemp(const_cast<char*>(tmp_x.getStr()));
 
             CPPUNIT_ASSERT_MESSAGE
             (
              "mkdtemp call failed",
              out != nullptr
-            );
+          );
 
-            tmp_x += rtl::OString('/');
+            tmp_x += OString('/');
 #endif
-            tmp_x += rtl::OString(TEST_PATH_POSTFIX);
+            tmp_x += OString(TEST_PATH_POSTFIX);
 
-            rc = FileBase::getFileURLFromSystemPath(rtl::OStringToOUString(tmp_x, RTL_TEXTENCODING_UTF8), test_path);
+            rc = osl::FileBase::getFileURLFromSystemPath(OStringToOUString(tmp_x, RTL_TEXTENCODING_UTF8), test_path);
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
             (
              "Cannot convert the system path back to an URL",
-             FileBase::E_None, rc
-            );
+             osl::FileBase::E_None, rc
+          );
         }
         return test_path;
     }
@@ -4919,40 +4926,30 @@ namespace osl_Directory
     class DirCreatedObserver : public DirectoryCreationObserver
     {
     public:
-        DirCreatedObserver() : i(0)
-        {
-        }
+        DirCreatedObserver() : i(0) {}
+        virtual void DirectoryCreated(const OUString&) override { i++; };
 
-        virtual void DirectoryCreated(const rtl::OUString& /*aDirectoryUrl*/) override
-        {
-            i++;
-        };
-
-        int number_of_dirs_created() const
-        {
-            return i;
-        }
+        int number_of_dirs_created() const { return i; }
 
     private:
-            int i;
+        int i;
     };
 
     class createPath : public CppUnit::TestFixture
     {
     public:
-
         createPath()
         {}
 
         void with_relative_path()
         {
-            FileBase::RC rc = Directory::createPath(TEST_PATH_POSTFIX);
+            osl::FileBase::RC rc = Directory::createPath(TEST_PATH_POSTFIX);
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
             (
                 "osl_createDirectoryPath contract broken",
-                FileBase::E_INVAL, rc
-            );
+                osl::FileBase::E_INVAL, rc
+          );
         }
 
         void without_callback()
@@ -4961,15 +4958,15 @@ namespace osl_Directory
 
             rm_test_path(tp_url);
 
-            FileBase::RC rc = Directory::createPath(tp_url);
+            osl::FileBase::RC rc = Directory::createPath(tp_url);
 
             rm_test_path(tp_url);
 
             CPPUNIT_ASSERT_EQUAL_MESSAGE
             (
                 "osl_createDirectoryPath failed",
-                FileBase::E_None, rc
-            );
+                osl::FileBase::E_None, rc
+          );
         }
 
         void with_callback()
@@ -4979,7 +4976,7 @@ namespace osl_Directory
             rm_test_path(tp_url);
 
             DirCreatedObserver* observer = new DirCreatedObserver;
-            FileBase::RC rc = Directory::createPath(tp_url, observer);
+            osl::FileBase::RC rc = Directory::createPath(tp_url, observer);
             int nDirs = observer->number_of_dirs_created();
             delete observer;
 
@@ -4988,13 +4985,13 @@ namespace osl_Directory
             CPPUNIT_ASSERT_EQUAL_MESSAGE
             (
                 "osl_createDirectoryPath failed",
-                FileBase::E_None, rc
-            );
+                osl::FileBase::E_None, rc
+          );
             CPPUNIT_ASSERT_MESSAGE
             (
                 "osl_createDirectoryPath failed",
                 nDirs > 0
-            );
+          );
 
         }
 
@@ -5029,44 +5026,44 @@ namespace osl_Directory
 
             OUString path = OUString::createFromAscii(buff);
             OUString tp_url;
-            FileBase::getFileURLFromSystemPath(path, tp_url);
+            osl::FileBase::getFileURLFromSystemPath(path, tp_url);
 
-            FileBase::RC rc = Directory::createPath(tp_url);
+            osl::FileBase::RC rc = Directory::createPath(tp_url);
 
             CPPUNIT_ASSERT_MESSAGE
             (
                 "osl_createDirectoryPath doesn't fail on unused logical drive letters",
-                rc != FileBase::E_None
-            );
+                rc != osl::FileBase::E_None
+          );
         }
 #endif /* WNT */
 
     CPPUNIT_TEST_SUITE(createPath);
-    CPPUNIT_TEST(with_relative_path);
-    CPPUNIT_TEST(without_callback);
-    CPPUNIT_TEST(with_callback);
+        CPPUNIT_TEST(with_relative_path);
+        CPPUNIT_TEST(without_callback);
+        CPPUNIT_TEST(with_callback);
 #ifdef _WIN32
-    CPPUNIT_TEST(at_invalid_logical_drive);
+        CPPUNIT_TEST(at_invalid_logical_drive);
 #endif
     CPPUNIT_TEST_SUITE_END();
 
     };
 
-    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::ctors );
-    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::open );
-    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::isOpen );
-    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::close );
-    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::reset );
-    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::getNextItem );
-    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::getVolumeInfo );
-    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::create );
-    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::remove );
-    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::createPath );
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Directory::ctors);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Directory::open);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Directory::isOpen);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Directory::close);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Directory::reset);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Directory::getNextItem);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Directory::getVolumeInfo);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Directory::create);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Directory::remove);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Directory::createPath);
 }
 
 /** get Current PID.
 */
-inline OUString getCurrentPID(  )
+inline OUString getCurrentPID()
 {
     //~ Get current PID and turn it into OUString;
     int nPID = 0;
@@ -5075,44 +5072,44 @@ inline OUString getCurrentPID(  )
 #else
     nPID = getpid();
 #endif
-    return ( OUString::number( nPID ) );
+    return (OUString::number(nPID));
 }
 
 //~ do some clean up work after all test completed.
 class GlobalObject
 {
-    public:
+public:
     ~GlobalObject()
     {
         try
         {
             //~ special clean up task in Windows and Unix separately;
-#if ( defined UNX )
+#if (defined UNX)
             //~ some clean up task  for UNIX OS
             ;
 #else
             //~ some clean up task  for Windows OS
             //~ check if some files are in the way, remove them if necessary.
-            if ( ifFileExist( aTmpName6 )  == sal_True )
-                deleteTestFile( aTmpName6 );
-            if ( ifFileExist( aTmpName4 )  == sal_True )
-                deleteTestFile( aTmpName4 );
-            if ( checkDirectory( aTmpName4, osl_Check_Mode_Exist )  == sal_True )
-                deleteTestDirectory( aTmpName4 );
-            if ( ifFileExist( aTmpName3 )  == sal_True )
-                deleteTestFile( aTmpName3 );
-            if ( checkDirectory( aTmpName3, osl_Check_Mode_Exist )  == sal_True )
-                deleteTestDirectory( aTmpName3 );
-
-            OUString aUStr( aUserDirectoryURL );
-            concatURL( aUStr, aHidURL1 );
-            if ( ifFileExist( aUStr )  == sal_True )
-                deleteTestFile( aUStr );
-
-            OUString aUStr1( aRootURL );
-            concatURL( aUStr1, aTmpName2 );
-            if ( ifFileExist( aUStr1 )  == sal_True )
-                deleteTestFile( aUStr1 );
+            if (ifFileExist(aTmpName6) == sal_True)
+                deleteTestFile(aTmpName6);
+            if (ifFileExist(aTmpName4) == sal_True)
+                deleteTestFile(aTmpName4);
+            if (checkDirectory(aTmpName4, osl_Check_Mode_Exist) == sal_True)
+                deleteTestDirectory(aTmpName4);
+            if (ifFileExist(aTmpName3) == sal_True)
+                deleteTestFile(aTmpName3);
+            if (checkDirectory(aTmpName3, osl_Check_Mode_Exist) == sal_True)
+                deleteTestDirectory(aTmpName3);
+
+            OUString aUStr(aUserDirectoryURL);
+            concatURL(aUStr, aHidURL1);
+            if (ifFileExist(aUStr) == sal_True)
+                deleteTestFile(aUStr);
+
+            OUString aUStr1(aRootURL);
+            concatURL(aUStr1, aTmpName2);
+            if (ifFileExist(aUStr1) == sal_True)
+                deleteTestFile(aUStr1);
 #endif
         }
         catch (const CppUnit::Exception &e)