WaE: workaround auto_ptr deprecation

5 files changed, 197 insertions, 195 deletions

diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index f69749f16b01..53a880bc4417 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -52,6 +52,8 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 
+#include <boost/scoped_ptr.hpp>
+
 using namespace osl;
 
 using ::rtl::OUString;
@@ -710,7 +712,7 @@ namespace osl_FileBase
       void getAbsoluteFileURL_003();
       void getAbsoluteFileURL_004();
 
-        CPPUNIT_TEST_SUITE( getAbsoluteFileURL );
+        SAL_CPPUNIT_TEST_SUITE( getAbsoluteFileURL );
         CPPUNIT_TEST( getAbsoluteFileURL_001_1 );
       CPPUNIT_TEST( getAbsoluteFileURL_001_2 );
       CPPUNIT_TEST( getAbsoluteFileURL_001_3 );
@@ -722,7 +724,7 @@ namespace osl_FileBase
       CPPUNIT_TEST( getAbsoluteFileURL_002 );
       CPPUNIT_TEST( getAbsoluteFileURL_003 );
       CPPUNIT_TEST( getAbsoluteFileURL_004 );
-      CPPUNIT_TEST_SUITE_END( );
+      SAL_CPPUNIT_TEST_SUITE_END( );
 
         }; //class getAbsoluteFileURL
 
@@ -889,7 +891,7 @@ namespace osl_FileBase
             void getFileURLFromSystemPath_004( );
         void getFileURLFromSystemPath_005( );
 
-        CPPUNIT_TEST_SUITE( SystemPath_FileURL );
+        SAL_CPPUNIT_TEST_SUITE( SystemPath_FileURL );
         CPPUNIT_TEST( getSystemPathFromFileURL_001_1 );
         CPPUNIT_TEST( getSystemPathFromFileURL_001_2 );
         CPPUNIT_TEST( getSystemPathFromFileURL_001_21 );
@@ -918,7 +920,7 @@ namespace osl_FileBase
         CPPUNIT_TEST( getFileURLFromSystemPath_003 );
         CPPUNIT_TEST( getFileURLFromSystemPath_004 );
         CPPUNIT_TEST( getFileURLFromSystemPath_005 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class SystemPath_FileURL
 
 
@@ -1318,13 +1320,13 @@ namespace osl_FileBase
                                     ( sal_True == bOk ) );
         }
 
-        CPPUNIT_TEST_SUITE( searchFileURL );
+        SAL_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( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class searchFileURL
 
 
@@ -1365,10 +1367,10 @@ namespace osl_FileBase
                                     checkDirectory( aUStr,osl_Check_Mode_WriteAccess ) );
         }
 
-        CPPUNIT_TEST_SUITE( getTempDirURL );
+        SAL_CPPUNIT_TEST_SUITE( getTempDirURL );
         CPPUNIT_TEST( getTempDirURL_001 );
         CPPUNIT_TEST( getTempDirURL_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getTempDirURL
 
 
@@ -1466,12 +1468,12 @@ namespace osl_FileBase
 
         }
 
-        CPPUNIT_TEST_SUITE( createTempFile );
+        SAL_CPPUNIT_TEST_SUITE( createTempFile );
         CPPUNIT_TEST( createTempFile_001 );
         CPPUNIT_TEST( createTempFile_002 );
         CPPUNIT_TEST( createTempFile_003 );
         CPPUNIT_TEST( createTempFile_004 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class createTempFile
 
     // -----------------------------------------------------------------------------
@@ -1578,11 +1580,11 @@ namespace osl_VolumeInfo
                                     sal_True == compareFileName( aUStr, aNullURL ) );
         }
 
-        CPPUNIT_TEST_SUITE( ctors );
+        SAL_CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_001 );
         CPPUNIT_TEST( ctors_002 );
         CPPUNIT_TEST( ctors_003 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class ctors
 
 
@@ -1657,11 +1659,11 @@ namespace osl_VolumeInfo
                                      ( sal_True == bOk1 ) && ( sal_True == bOk2 ) );
         }
 
-        CPPUNIT_TEST_SUITE( isValid );
+        SAL_CPPUNIT_TEST_SUITE( isValid );
         CPPUNIT_TEST( isValid_001 );
         CPPUNIT_TEST( isValid_002 );
         CPPUNIT_TEST( isValid_003 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class isValid
 
      //---------------------------------------------------------------------
@@ -1708,10 +1710,10 @@ namespace osl_VolumeInfo
         }
 #endif
 
-        CPPUNIT_TEST_SUITE( getRemoteFlag );
+        SAL_CPPUNIT_TEST_SUITE( getRemoteFlag );
         CPPUNIT_TEST( getRemoteFlag_001 );
         CPPUNIT_TEST( getRemoteFlag_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getRemoteFlag
 
     //---------------------------------------------------------------------
@@ -1747,10 +1749,10 @@ namespace osl_VolumeInfo
             CPPUNIT_ASSERT_MESSAGE( "test for getRemoveableFlag function: get a volume device which is removable, not sure, here we use floppy disk, but it did not pass.",
                                      sal_True == bOk );
         }
-        CPPUNIT_TEST_SUITE( getRemoveableFlag );
+        SAL_CPPUNIT_TEST_SUITE( getRemoveableFlag );
         CPPUNIT_TEST( getRemoveableFlag_001 );
         CPPUNIT_TEST( getRemoveableFlag_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getRemoveableFlag
 
 
@@ -1787,10 +1789,10 @@ namespace osl_VolumeInfo
             CPPUNIT_ASSERT_MESSAGE( "test for getCompactDiscFlag function: get a cdrom volume device flag, it did not pass.",
                                       ( sal_True == bOk ) );
         }
-        CPPUNIT_TEST_SUITE( getCompactDiscFlag );
+        SAL_CPPUNIT_TEST_SUITE( getCompactDiscFlag );
         CPPUNIT_TEST( getCompactDiscFlag_001 );
         CPPUNIT_TEST( getCompactDiscFlag_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getCompactDiscFlag
 
 
@@ -1827,10 +1829,10 @@ namespace osl_VolumeInfo
             CPPUNIT_ASSERT_MESSAGE( "test for getFloppyDiskFlag function: get a floppy volume device flag, it did not pass.",
                                       ( sal_True == bOk ) );
         }
-        CPPUNIT_TEST_SUITE( getFloppyDiskFlag );
+        SAL_CPPUNIT_TEST_SUITE( getFloppyDiskFlag );
         CPPUNIT_TEST( getFloppyDiskFlag_001 );
         CPPUNIT_TEST( getFloppyDiskFlag_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getFloppyDiskFlag
 
 
@@ -1867,10 +1869,10 @@ namespace osl_VolumeInfo
             CPPUNIT_ASSERT_MESSAGE( "test for getFixedDiskFlag function: get a fixed disk volume device flag, it did not pass.",
                                      ( sal_True == bOk ) );
         }
-        CPPUNIT_TEST_SUITE( getFixedDiskFlag );
+        SAL_CPPUNIT_TEST_SUITE( getFixedDiskFlag );
         CPPUNIT_TEST( getFixedDiskFlag_001 );
         CPPUNIT_TEST( getFixedDiskFlag_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getFixedDiskFlag
 
     //---------------------------------------------------------------------
@@ -1906,10 +1908,10 @@ namespace osl_VolumeInfo
             CPPUNIT_ASSERT_MESSAGE( "test for getRAMDiskFlag function: FIX ME, don't know how to get a RAM disk flag, perhaps Windows 98 boot disk can create a RAM disk, it did not pass in (UNX)(W32).",
                                      ( sal_True == bOk ) );
         }
-        CPPUNIT_TEST_SUITE( getRAMDiskFlag );
+        SAL_CPPUNIT_TEST_SUITE( getRAMDiskFlag );
         CPPUNIT_TEST( getRAMDiskFlag_001 );
         CPPUNIT_TEST( getRAMDiskFlag_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getRAMDiskFlag
 
 
@@ -1987,11 +1989,11 @@ namespace osl_VolumeInfo
         }
 #endif
 
-        CPPUNIT_TEST_SUITE( getTotalSpace );
+        SAL_CPPUNIT_TEST_SUITE( getTotalSpace );
         CPPUNIT_TEST( getTotalSpace_001 );
         CPPUNIT_TEST( getTotalSpace_002 );
         CPPUNIT_TEST( getTotalSpace_003 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getTotalSpace
 
     //---------------------------------------------------------------------
@@ -2068,11 +2070,11 @@ namespace osl_VolumeInfo
 #endif
 
 
-        CPPUNIT_TEST_SUITE( getFreeSpace );
+        SAL_CPPUNIT_TEST_SUITE( getFreeSpace );
         CPPUNIT_TEST( getFreeSpace_001 );
          CPPUNIT_TEST( getFreeSpace_002 );
         CPPUNIT_TEST( getFreeSpace_003 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getFreeSpace
 
     //---------------------------------------------------------------------
@@ -2150,11 +2152,11 @@ namespace osl_VolumeInfo
 #endif
 
 
-        CPPUNIT_TEST_SUITE( getUsedSpace );
+        SAL_CPPUNIT_TEST_SUITE( getUsedSpace );
          CPPUNIT_TEST( getUsedSpace_001 );
          CPPUNIT_TEST( getUsedSpace_002 );
         CPPUNIT_TEST( getUsedSpace_003 );
-         CPPUNIT_TEST_SUITE_END( );
+         SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getUsedSpace
 
 
@@ -2210,10 +2212,10 @@ namespace osl_VolumeInfo
         }
 #endif
 
-        CPPUNIT_TEST_SUITE( getMaxNameLength );
+        SAL_CPPUNIT_TEST_SUITE( getMaxNameLength );
          CPPUNIT_TEST( getMaxNameLength_001 );
         CPPUNIT_TEST( getMaxNameLength_002 );
-         CPPUNIT_TEST_SUITE_END( );
+         SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getMaxNameLength
 
 
@@ -2263,10 +2265,10 @@ namespace osl_VolumeInfo
 #endif
 
 
-        CPPUNIT_TEST_SUITE( getMaxPathLength );
+        SAL_CPPUNIT_TEST_SUITE( getMaxPathLength );
          CPPUNIT_TEST( getMaxPathLength_001 );
         CPPUNIT_TEST( getMaxPathLength_002 );
-         CPPUNIT_TEST_SUITE_END( );
+         SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getMaxPathLength
 
 
@@ -2324,10 +2326,10 @@ namespace osl_VolumeInfo
 #endif
 
 
-        CPPUNIT_TEST_SUITE( getFileSystemName );
+        SAL_CPPUNIT_TEST_SUITE( getFileSystemName );
          CPPUNIT_TEST( getFileSystemName_001 );
         CPPUNIT_TEST( getFileSystemName_002 );
-         CPPUNIT_TEST_SUITE_END( );
+         SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getFileSystemName
 
     //---------------------------------------------------------------------
@@ -2354,9 +2356,9 @@ namespace osl_VolumeInfo
                                      ( sal_False == bOk ) );
         }
 
-        CPPUNIT_TEST_SUITE( getDeviceHandle );
+        SAL_CPPUNIT_TEST_SUITE( getDeviceHandle );
          CPPUNIT_TEST( getDeviceHandle_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getDeviceHandle
 
 
@@ -2450,10 +2452,10 @@ namespace osl_FileStatus
                                      sal_True == compareFileName( aUStr, aNullURL)  );
         }
 
-        CPPUNIT_TEST_SUITE( ctors );
+        SAL_CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_001 );
         CPPUNIT_TEST( ctors_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class ctors
 
 
@@ -2651,12 +2653,12 @@ namespace osl_FileStatus
         }
 
 
-        CPPUNIT_TEST_SUITE( isValid );
+        SAL_CPPUNIT_TEST_SUITE( isValid );
         CPPUNIT_TEST( isValid_001 );
         CPPUNIT_TEST( isValid_002 );
         CPPUNIT_TEST( isValid_003 );
         CPPUNIT_TEST( isValid_004 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class ctors
 
 
@@ -2684,7 +2686,7 @@ namespace osl_FileStatus
             createTestFile( aTmpName3, aTmpName2 );
             createTestDirectory( aTmpName3, aTmpName1 );
 
-            ::std::auto_ptr<Directory> pDir( new Directory( aTmpName3 ) );
+            boost::scoped_ptr<Directory> pDir( new Directory( aTmpName3 ) );
             nError1 = pDir->open( );
             CPPUNIT_ASSERT_MESSAGE("open aTmpName3 failed!", ::osl::FileBase::E_None == nError1 );
             //getNextItem can not assure which item retrieved
@@ -2828,14 +2830,14 @@ namespace osl_FileStatus
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( getFileType );
+        SAL_CPPUNIT_TEST_SUITE( getFileType );
         CPPUNIT_TEST( getFileType_001 );
         CPPUNIT_TEST( getFileType_002 );
         CPPUNIT_TEST( getFileType_003 );
         // LLA: CPPUNIT_TEST( getFileType_005 );
         //CPPUNIT_TEST( getFileType_006 );
         CPPUNIT_TEST( getFileType_007 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getFileType
 
     //---------------------------------------------------------------------
@@ -2959,12 +2961,12 @@ namespace osl_FileStatus
         }
 #endif
 
-        CPPUNIT_TEST_SUITE( getAttributes );
+        SAL_CPPUNIT_TEST_SUITE( getAttributes );
         CPPUNIT_TEST( getAttributes_001 );
         CPPUNIT_TEST( getAttributes_002 );
         CPPUNIT_TEST( getAttributes_003 );
         CPPUNIT_TEST( getAttributes_004 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getAttributes
 
     //---------------------------------------------------------------------
@@ -3017,9 +3019,9 @@ namespace osl_FileStatus
                                     sal_True == bOK );
         }
 
-        CPPUNIT_TEST_SUITE( getAccessTime );
+        SAL_CPPUNIT_TEST_SUITE( getAccessTime );
         CPPUNIT_TEST( getAccessTime_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getAccessTime
 
     //---------------------------------------------------------------------
@@ -3070,9 +3072,9 @@ namespace osl_FileStatus
                                     sal_True == bOK );
         }
 
-        CPPUNIT_TEST_SUITE( getModifyTime );
+        SAL_CPPUNIT_TEST_SUITE( getModifyTime );
         CPPUNIT_TEST( getModifyTime_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getModifyTime
 
 
@@ -3133,10 +3135,10 @@ namespace osl_FileStatus
             CPPUNIT_ASSERT_MESSAGE( "test for getFileSize function: file with size of TEST_FILE_SIZE, did not pass in (W32). ",
                                     TEST_FILE_SIZE == uFileSize );
         }
-        CPPUNIT_TEST_SUITE( getFileSize );
+        SAL_CPPUNIT_TEST_SUITE( getFileSize );
         CPPUNIT_TEST( getFileSize_001 );
         CPPUNIT_TEST( getFileSize_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getFileSize
 
     //---------------------------------------------------------------------
@@ -3178,9 +3180,9 @@ namespace osl_FileStatus
                                     sal_True == compareFileName( aFileName, aTmpName2 ) );
         }
 
-        CPPUNIT_TEST_SUITE( getFileName );
+        SAL_CPPUNIT_TEST_SUITE( getFileName );
         CPPUNIT_TEST( getFileName_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getFileName
 
     //---------------------------------------------------------------------
@@ -3220,9 +3222,9 @@ namespace osl_FileStatus
                                     sal_True == compareFileName( aFileURL, aTmpName6 ) );
         }
 
-        CPPUNIT_TEST_SUITE( getFileURL );
+        SAL_CPPUNIT_TEST_SUITE( getFileURL );
         CPPUNIT_TEST( getFileURL_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getFileURL
 
     //---------------------------------------------------------------------
@@ -3290,9 +3292,9 @@ namespace osl_FileStatus
         }
 #endif
 
-        CPPUNIT_TEST_SUITE( getLinkTargetURL );
+        SAL_CPPUNIT_TEST_SUITE( getLinkTargetURL );
         CPPUNIT_TEST( getLinkTargetURL_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getLinkTargetURL
 
     // -----------------------------------------------------------------------------
@@ -3364,10 +3366,10 @@ namespace osl_File
                                      ( ::osl::FileBase::E_None == nError1 ) && ( ::osl::FileBase::E_None == nError2 )  );
         }
 
-        CPPUNIT_TEST_SUITE( ctors );
+        SAL_CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_001 );
         CPPUNIT_TEST( ctors_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class ctors
 
     //---------------------------------------------------------------------
@@ -3481,14 +3483,14 @@ namespace osl_File
                                     ( 10 == nCount_read ) );
         }
 
-        CPPUNIT_TEST_SUITE( open );
+        SAL_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( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class open
 
     //---------------------------------------------------------------------
@@ -3545,10 +3547,10 @@ namespace osl_File
                                     ( ::osl::FileBase::E_None != nError3 ) );
         }
 
-        CPPUNIT_TEST_SUITE( close );
+        SAL_CPPUNIT_TEST_SUITE( close );
         CPPUNIT_TEST( close_001 );
         CPPUNIT_TEST( close_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class close
 
 
@@ -3648,11 +3650,11 @@ namespace osl_File
                                      buffer_read[0] == pBuffer_Char[0] );
         }
 
-        CPPUNIT_TEST_SUITE( setPos );
+        SAL_CPPUNIT_TEST_SUITE( setPos );
         CPPUNIT_TEST( setPos_001 );
         CPPUNIT_TEST( setPos_002 );
         CPPUNIT_TEST( setPos_003 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class setPos
 
     //---------------------------------------------------------------------
@@ -3714,9 +3716,9 @@ namespace osl_File
                                      26 == nFilePointer );
         }
 
-        CPPUNIT_TEST_SUITE( getPos );
+        SAL_CPPUNIT_TEST_SUITE( getPos );
         CPPUNIT_TEST( getPos_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getPos
 
 
@@ -3807,10 +3809,10 @@ namespace osl_File
             CPPUNIT_ASSERT_MESSAGE( "test for isEndOfFile function: use isEndOfFile to move pointer step by step",
                                       sizeof( pBuffer_Char ) + 1 == nFilePointer  );
         }
-        CPPUNIT_TEST_SUITE( isEndOfFile );
+        SAL_CPPUNIT_TEST_SUITE( isEndOfFile );
         CPPUNIT_TEST( isEndOfFile_001 );
         CPPUNIT_TEST( isEndOfFile_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class isEndOfFile
 
 
@@ -3906,10 +3908,10 @@ namespace osl_File
                                      10 == nFilePointer );
         }
 
-        CPPUNIT_TEST_SUITE( setSize );
+        SAL_CPPUNIT_TEST_SUITE( setSize );
         CPPUNIT_TEST( setSize_001 );
         CPPUNIT_TEST( setSize_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class setSize
 
 
@@ -3995,10 +3997,10 @@ namespace osl_File
                                      ( 52 == nFilePointer ) && ( 26 == nCount_read ) && ( 0 == strncmp( buffer_read, &pBuffer_Char[26], 26 ) ) );
         }
 
-        CPPUNIT_TEST_SUITE( read );
+        SAL_CPPUNIT_TEST_SUITE( read );
         CPPUNIT_TEST( read_001 );
         CPPUNIT_TEST( read_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class read
 
     //---------------------------------------------------------------------
@@ -4055,9 +4057,9 @@ namespace osl_File
                                     ( 10 == nCount_write ) );
         }
 
-        CPPUNIT_TEST_SUITE( write );
+        SAL_CPPUNIT_TEST_SUITE( write );
         CPPUNIT_TEST( write_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class write
 
     //---------------------------------------------------------------------
@@ -4138,10 +4140,10 @@ namespace osl_File
                                      *pEOF &&
                                     ( 0 == strncmp( ( const char * )aSequence.getArray( ), &pBuffer_Char[26], 26 ) ) );
         }
-        CPPUNIT_TEST_SUITE( readLine );
+        SAL_CPPUNIT_TEST_SUITE( readLine );
         CPPUNIT_TEST( readLine_001 );
         CPPUNIT_TEST( readLine_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class readLine
 
     //---------------------------------------------------------------------
@@ -4268,14 +4270,14 @@ namespace osl_File
 #endif
       }
 
-        CPPUNIT_TEST_SUITE( copy );
+        SAL_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( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class copy
 
     //---------------------------------------------------------------------
@@ -4425,7 +4427,7 @@ namespace osl_File
                                  ::osl::FileBase::E_None != nError1 );
       }
 
-        CPPUNIT_TEST_SUITE( move );
+        SAL_CPPUNIT_TEST_SUITE( move );
         CPPUNIT_TEST( move_001 );
         CPPUNIT_TEST( move_002 );
         CPPUNIT_TEST( move_003 );
@@ -4435,7 +4437,7 @@ namespace osl_File
         CPPUNIT_TEST( move_007 );
       //      CPPUNIT_TEST( move_008 );
       //CPPUNIT_TEST( move_009 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class move
 
 
@@ -4515,12 +4517,12 @@ namespace osl_File
                                     ( ::osl::FileBase::E_ISDIR == nError1 ) || ( ::osl::FileBase::E_ACCES == nError1 ));
         }
 
-        CPPUNIT_TEST_SUITE( remove );
+        SAL_CPPUNIT_TEST_SUITE( remove );
         CPPUNIT_TEST( remove_001 );
         CPPUNIT_TEST( remove_002 );
         CPPUNIT_TEST( remove_003 );
         CPPUNIT_TEST( remove_004 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class remove
 
 
@@ -4608,10 +4610,10 @@ namespace osl_File
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( setAttributes );
+        SAL_CPPUNIT_TEST_SUITE( setAttributes );
         CPPUNIT_TEST( setAttributes_001 );
         CPPUNIT_TEST( setAttributes_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class setAttributes
 
 
@@ -4697,9 +4699,9 @@ namespace osl_File
             free( pTV_modify );
         }
 
-        CPPUNIT_TEST_SUITE( setTime );
+        SAL_CPPUNIT_TEST_SUITE( setTime );
         CPPUNIT_TEST( setTime_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class setTime
 
     //---------------------------------------------------------------------
@@ -4758,9 +4760,9 @@ namespace osl_File
 
 
 
-        CPPUNIT_TEST_SUITE( sync );
+        SAL_CPPUNIT_TEST_SUITE( sync );
         CPPUNIT_TEST( sync_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class setTime
 
     // -----------------------------------------------------------------------------
@@ -4825,9 +4827,9 @@ namespace osl_DirectoryItem
                                       ::osl::FileBase::E_None == nError1  );
         }
 
-        CPPUNIT_TEST_SUITE( ctors );
+        SAL_CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class ctors
 
     //---------------------------------------------------------------------
@@ -4886,10 +4888,10 @@ namespace osl_DirectoryItem
                                     ( sal_True == compareFileName( rFileStatus.getFileName( ), aTmpName2 ) ) );
         }
 
-        CPPUNIT_TEST_SUITE( copy_assin_Ctors );
+        SAL_CPPUNIT_TEST_SUITE( copy_assin_Ctors );
         CPPUNIT_TEST( copy_assin_Ctors_001 );
         CPPUNIT_TEST( copy_assin_Ctors_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class copy_assin_Ctors
 
     //---------------------------------------------------------------------
@@ -4934,10 +4936,10 @@ namespace osl_DirectoryItem
                                     ( sal_True == rItem.is( ) ) );
         }
 
-        CPPUNIT_TEST_SUITE( is );
+        SAL_CPPUNIT_TEST_SUITE( is );
         CPPUNIT_TEST( is_001 );
         CPPUNIT_TEST( is_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class is
 
     //---------------------------------------------------------------------
@@ -4999,11 +5001,11 @@ namespace osl_DirectoryItem
                                     FileBase::E_NOENT == nError1 );
         }
 
-        CPPUNIT_TEST_SUITE( get );
+        SAL_CPPUNIT_TEST_SUITE( get );
         CPPUNIT_TEST( get_001 );
         CPPUNIT_TEST( get_002 );
         CPPUNIT_TEST( get_003 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class get
 
     //---------------------------------------------------------------------
@@ -5078,11 +5080,11 @@ namespace osl_DirectoryItem
         }
 
 
-        CPPUNIT_TEST_SUITE( getFileStatus );
+        SAL_CPPUNIT_TEST_SUITE( getFileStatus );
         CPPUNIT_TEST( getFileStatus_001 );
         CPPUNIT_TEST( getFileStatus_002 );
         CPPUNIT_TEST( getFileStatus_003 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getFileStatus
 
 
@@ -5162,10 +5164,10 @@ namespace osl_Directory
                                     ( ::osl::FileBase::E_None == nError2 ) );
         }
 
-        CPPUNIT_TEST_SUITE( ctors );
+        SAL_CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_001 );
         CPPUNIT_TEST( ctors_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class ctors
 
     //---------------------------------------------------------------------
@@ -5258,12 +5260,12 @@ namespace osl_Directory
                                      ( ::osl::FileBase::E_NOTDIR == nError1 ) || ( ::osl::FileBase::E_ACCES ) );
         }
 
-        CPPUNIT_TEST_SUITE( open );
+        SAL_CPPUNIT_TEST_SUITE( open );
         CPPUNIT_TEST( open_001 );
         CPPUNIT_TEST( open_002 );
         CPPUNIT_TEST( open_003 );
         CPPUNIT_TEST( open_004 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class open
 
     //---------------------------------------------------------------------
@@ -5317,10 +5319,10 @@ namespace osl_Directory
                                     !( sal_True == bOk ) );
         }
 
-        CPPUNIT_TEST_SUITE( isOpen );
+        SAL_CPPUNIT_TEST_SUITE( isOpen );
         CPPUNIT_TEST( isOpen_001 );
         CPPUNIT_TEST( isOpen_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class isOpen
 
     //---------------------------------------------------------------------
@@ -5373,10 +5375,10 @@ namespace osl_Directory
         }
 
 
-        CPPUNIT_TEST_SUITE( close );
+        SAL_CPPUNIT_TEST_SUITE( close );
         CPPUNIT_TEST( close_001 );
         CPPUNIT_TEST( close_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class close
 
     //---------------------------------------------------------------------
@@ -5486,12 +5488,12 @@ namespace osl_Directory
                                     ( ::osl::FileBase::E_INVAL == nError1 ) );
         }
 
-        CPPUNIT_TEST_SUITE( reset );
+        SAL_CPPUNIT_TEST_SUITE( reset );
         CPPUNIT_TEST( reset_001 );
         CPPUNIT_TEST( reset_002 );
         CPPUNIT_TEST( reset_003 );
         CPPUNIT_TEST( reset_004 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class reset
 
     //---------------------------------------------------------------------
@@ -5660,12 +5662,12 @@ namespace osl_Directory
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( getNextItem );
+        SAL_CPPUNIT_TEST_SUITE( getNextItem );
         CPPUNIT_TEST( getNextItem_001 );
         CPPUNIT_TEST( getNextItem_002 );
         CPPUNIT_TEST( getNextItem_003 );
         CPPUNIT_TEST( getNextItem_004 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getNextItem
 
     //---------------------------------------------------------------------
@@ -5831,7 +5833,7 @@ namespace osl_Directory
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( getVolumeInfo );
+        SAL_CPPUNIT_TEST_SUITE( getVolumeInfo );
         CPPUNIT_TEST( getVolumeInfo_001_1 );
         CPPUNIT_TEST( getVolumeInfo_001_2 );
         CPPUNIT_TEST( getVolumeInfo_001_3 );
@@ -5842,7 +5844,7 @@ namespace osl_Directory
         CPPUNIT_TEST( getVolumeInfo_001_8 );
         CPPUNIT_TEST( getVolumeInfo_002 );
         CPPUNIT_TEST( getVolumeInfo_003 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class getVolumeInfo
 
 
@@ -5917,11 +5919,11 @@ namespace osl_Directory
                                     ( osl::FileBase::E_INVAL == nError1 ) );
         }
 
-        CPPUNIT_TEST_SUITE( create );
+        SAL_CPPUNIT_TEST_SUITE( create );
         CPPUNIT_TEST( create_001 );
         CPPUNIT_TEST( create_002 );
         CPPUNIT_TEST( create_003 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class create
 
     //---------------------------------------------------------------------
@@ -6008,13 +6010,13 @@ namespace osl_Directory
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( remove );
+        SAL_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( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };// class remove
 
     //########################################
@@ -6229,14 +6231,14 @@ namespace osl_Directory
         }
 #endif /* WNT */
 
-    CPPUNIT_TEST_SUITE(createPath);
+    SAL_CPPUNIT_TEST_SUITE(createPath);
     CPPUNIT_TEST(with_relative_path);
     CPPUNIT_TEST(without_callback);
     CPPUNIT_TEST(with_callback);
 #ifdef WNT
     CPPUNIT_TEST(at_invalid_logical_drive);
 #endif
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 
     }; // class createPath
 
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index 5e0c47f1937a..c8fed7d66881 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -212,10 +212,10 @@ namespace osl_Module
                                     sal_True == bRes  );
         }
 
-        CPPUNIT_TEST_SUITE( ctors );
+        SAL_CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_none );
         CPPUNIT_TEST( ctors_name_mode );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class ctors
 
 
@@ -262,10 +262,10 @@ namespace osl_Module
 
         /* tester comments: another case is getFunctionSymbol_001*/
 
-        CPPUNIT_TEST_SUITE( getUrlFromAddress );
+        SAL_CPPUNIT_TEST_SUITE( getUrlFromAddress );
         CPPUNIT_TEST( getUrlFromAddress_001 );
         CPPUNIT_TEST( getUrlFromAddress_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getUrlFromAddress
 
 
@@ -336,10 +336,10 @@ namespace osl_Module
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( load );
+        SAL_CPPUNIT_TEST_SUITE( load );
         CPPUNIT_TEST( load_001 );
         CPPUNIT_TEST( load_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class load
 
 
@@ -362,9 +362,9 @@ namespace osl_Module
                                     sal_True == bRes  );
         }
 
-        CPPUNIT_TEST_SUITE( unload );
+        SAL_CPPUNIT_TEST_SUITE( unload );
         CPPUNIT_TEST( unload_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class unload
 
 
@@ -394,9 +394,9 @@ namespace osl_Module
             CPPUNIT_ASSERT_MESSAGE( "#test comment#: test if a module is a loaded module.",
                                      sal_False == bRes && sal_True == bRes1);
         }
-        CPPUNIT_TEST_SUITE( is );
+        SAL_CPPUNIT_TEST_SUITE( is );
         CPPUNIT_TEST( is_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class is
 
 
@@ -424,9 +424,9 @@ namespace osl_Module
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( getSymbol );
+        SAL_CPPUNIT_TEST_SUITE( getSymbol );
         CPPUNIT_TEST( getSymbol_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getSymbol
 
 
@@ -474,10 +474,10 @@ namespace osl_Module
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( optr_oslModule );
+        SAL_CPPUNIT_TEST_SUITE( optr_oslModule );
         CPPUNIT_TEST( optr_oslModule_001 );
         CPPUNIT_TEST( optr_oslModule_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class optr_oslModule
 
     /** testing the methods:
@@ -502,9 +502,9 @@ namespace osl_Module
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( getFunctionSymbol );
+        SAL_CPPUNIT_TEST_SUITE( getFunctionSymbol );
         CPPUNIT_TEST( getFunctionSymbol_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getFunctionSymbol
 
 // -----------------------------------------------------------------------------
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index 1dd086086c57..2933f6ef78be 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -567,10 +567,10 @@ namespace osl_Thread
 
             }
 
-        CPPUNIT_TEST_SUITE(create);
+        SAL_CPPUNIT_TEST_SUITE(create);
         CPPUNIT_TEST(create_001);
         CPPUNIT_TEST(create_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class create
 
 
@@ -633,11 +633,11 @@ namespace osl_Thread
                     );
             }
 
-        CPPUNIT_TEST_SUITE(createSuspended);
+        SAL_CPPUNIT_TEST_SUITE(createSuspended);
         CPPUNIT_TEST(createSuspended_001);
         // LLA: Deadlocked!!!
         CPPUNIT_TEST(createSuspended_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class createSuspended
 
     /** when the count value equal to or more than 3, suspend the thread.
@@ -743,11 +743,11 @@ namespace osl_Thread
                     );
             }
 
-        CPPUNIT_TEST_SUITE(suspend);
+        SAL_CPPUNIT_TEST_SUITE(suspend);
         CPPUNIT_TEST(suspend_001);
         // LLA: Deadlocked!!!
         // CPPUNIT_TEST(createSuspended_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class suspend
 
     /** Test of the osl::Thread::resume method
@@ -829,10 +829,10 @@ namespace osl_Thread
                     );
             }
 
-        CPPUNIT_TEST_SUITE(resume);
+        SAL_CPPUNIT_TEST_SUITE(resume);
         CPPUNIT_TEST(resume_001);
         CPPUNIT_TEST(resume_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class resume
 
     /** Test of the osl::Thread::terminate method
@@ -908,10 +908,10 @@ namespace osl_Thread
                     nLaterValue > nValue );
             }
 
-        CPPUNIT_TEST_SUITE(terminate);
+        SAL_CPPUNIT_TEST_SUITE(terminate);
         CPPUNIT_TEST(terminate_001);
         CPPUNIT_TEST(terminate_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class terminate
 
     /** Test of the osl::Thread::join method
@@ -1000,10 +1000,10 @@ namespace osl_Thread
                     );
             }
 
-        CPPUNIT_TEST_SUITE(join);
+        SAL_CPPUNIT_TEST_SUITE(join);
         CPPUNIT_TEST(join_001);
         CPPUNIT_TEST(join_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class join
 
     /** Test of the osl::Thread::isRunning method
@@ -1071,10 +1071,10 @@ namespace osl_Thread
 
             }
 
-        CPPUNIT_TEST_SUITE(isRunning);
+        SAL_CPPUNIT_TEST_SUITE(isRunning);
         CPPUNIT_TEST(isRunning_001);
         CPPUNIT_TEST(isRunning_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class isRunning
 
 
@@ -1522,7 +1522,7 @@ namespace osl_Thread
             }
 
 
-        CPPUNIT_TEST_SUITE(setPriority);
+        SAL_CPPUNIT_TEST_SUITE(setPriority);
 #ifndef SOLARIS
         CPPUNIT_TEST(setPriority_002);
         CPPUNIT_TEST(setPriority_003);
@@ -1534,7 +1534,7 @@ namespace osl_Thread
         CPPUNIT_TEST(setPriority_001_3);
         CPPUNIT_TEST(setPriority_001_4);
         CPPUNIT_TEST(setPriority_001_5);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class setPriority
 
     /** Test of the osl::Thread::getPriority method
@@ -1587,10 +1587,10 @@ namespace osl_Thread
 
             }
 
-        CPPUNIT_TEST_SUITE(getPriority);
+        SAL_CPPUNIT_TEST_SUITE(getPriority);
         CPPUNIT_TEST(getPriority_001);
         CPPUNIT_TEST(getPriority_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class getPriority
 
 
@@ -1617,10 +1617,10 @@ namespace osl_Thread
 
             }
 
-        CPPUNIT_TEST_SUITE(getIdentifier);
+        SAL_CPPUNIT_TEST_SUITE(getIdentifier);
         CPPUNIT_TEST(getIdentifier_001);
         CPPUNIT_TEST(getIdentifier_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class getIdentifier
 
     /** Test of the osl::Thread::getCurrentIdentifier method
@@ -1660,10 +1660,10 @@ namespace osl_Thread
             {
             }
 
-        CPPUNIT_TEST_SUITE(getCurrentIdentifier);
+        SAL_CPPUNIT_TEST_SUITE(getCurrentIdentifier);
         CPPUNIT_TEST(getCurrentIdentifier_001);
         //CPPUNIT_TEST(getCurrentIdentifier_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class getCurrentIdentifier
 
     /** Test of the osl::Thread::wait method
@@ -1727,9 +1727,9 @@ namespace osl_Thread
 
             }
 
-        CPPUNIT_TEST_SUITE(wait);
+        SAL_CPPUNIT_TEST_SUITE(wait);
         CPPUNIT_TEST(wait_001);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class wait
 
     /** osl::Thread::yield method: can not design good test scenario to test up to now
@@ -1751,9 +1751,9 @@ namespace osl_Thread
             }
 
 
-        CPPUNIT_TEST_SUITE(yield);
+        SAL_CPPUNIT_TEST_SUITE(yield);
         CPPUNIT_TEST(yield_001);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class yield
 
     /** Test of the osl::Thread::schedule method
@@ -1874,10 +1874,10 @@ namespace osl_Thread
                     );
             }
 
-        CPPUNIT_TEST_SUITE(schedule);
+        SAL_CPPUNIT_TEST_SUITE(schedule);
         CPPUNIT_TEST(schedule_001);
         CPPUNIT_TEST(schedule_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class schedule
 
 // -----------------------------------------------------------------------------
@@ -1994,9 +1994,9 @@ namespace osl_ThreadData
 
             }
 
-        CPPUNIT_TEST_SUITE(ctors);
+        SAL_CPPUNIT_TEST_SUITE(ctors);
         CPPUNIT_TEST(ctor_001);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class ctors
 
 
@@ -2107,11 +2107,11 @@ namespace osl_ThreadData
                     );
             }
 
-        CPPUNIT_TEST_SUITE(setData);
+        SAL_CPPUNIT_TEST_SUITE(setData);
         CPPUNIT_TEST(setData_001);
         CPPUNIT_TEST(setData_002);
         CPPUNIT_TEST(setData_003);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class setData
 
     class getData : public CppUnit::TestFixture
@@ -2191,10 +2191,10 @@ namespace osl_ThreadData
 
             }
 
-        CPPUNIT_TEST_SUITE(getData);
+        SAL_CPPUNIT_TEST_SUITE(getData);
         CPPUNIT_TEST(getData_001);
         CPPUNIT_TEST(getData_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class getData
 
 // -----------------------------------------------------------------------------
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 67d9282809d4..77fbb7031d43 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -304,12 +304,12 @@ public:
         osl_freeProcessHandle(process);
     }
 
-    CPPUNIT_TEST_SUITE(Test_osl_joinProcess);
+    SAL_CPPUNIT_TEST_SUITE(Test_osl_joinProcess);
     CPPUNIT_TEST(osl_joinProcessWithTimeout_timeout_failure);
     CPPUNIT_TEST(osl_joinProcessWithTimeout_without_timeout_failure);
     CPPUNIT_TEST(osl_joinProcessWithTimeout_infinite);
     CPPUNIT_TEST(osl_joinProcess);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 };
 
 //#########################################################
@@ -740,7 +740,7 @@ public:
         osl_freeProcessHandle(process);
     }
 
-    CPPUNIT_TEST_SUITE(Test_osl_executeProcess);
+    SAL_CPPUNIT_TEST_SUITE(Test_osl_executeProcess);
     //TODO: Repair these under windows.
 #ifndef WNT
     CPPUNIT_TEST(osl_execProc_parent_equals_child_environment);
@@ -750,7 +750,7 @@ public:
     // CPPUNIT_TEST(osl_execProc_test_batch);
     ///TODO: Repair test (or tested function ;-) - test fails.
     // CPPUNIT_TEST(osl_execProc_exe_name_in_argument_list);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 };
 
 //#####################################
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 21461cab41c7..fec3395ffef7 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -93,9 +93,9 @@ namespace osl_Security
                                     aSec.getHandle( ) != NULL );
         }
 
-        CPPUNIT_TEST_SUITE( ctors );
+        SAL_CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class ctors
 
 
@@ -130,7 +130,7 @@ namespace osl_Security
         }
 
 
-        CPPUNIT_TEST_SUITE( logonUser );
+        SAL_CPPUNIT_TEST_SUITE( logonUser );
         if  ( !aStringForward.equals( aNullUrl )  && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) ==  aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) )
         /// if user name and passwd are forwarded
         {
@@ -141,7 +141,7 @@ namespace osl_Security
         {
             CPPUNIT_TEST( logonUser_user_pwd_server );
         }
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class logonUser
 
 
@@ -170,9 +170,9 @@ namespace osl_Security
             CPPUNIT_ASSERT_MESSAGE( aMessage.getStr(), strUserID.equals(strID) && (bRes == sal_True));
         }
 
-        CPPUNIT_TEST_SUITE( getUserIdent );
+        SAL_CPPUNIT_TEST_SUITE( getUserIdent );
         CPPUNIT_TEST( getUserIdent_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getUserIdent
 
 
@@ -203,9 +203,9 @@ namespace osl_Security
                                     ( nPos >= 0 ) && ( sal_True == bRes ) );
         }
 
-        CPPUNIT_TEST_SUITE( getUserName );
+        SAL_CPPUNIT_TEST_SUITE( getUserName );
         CPPUNIT_TEST( getUserName_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getUserName
 
 
@@ -227,9 +227,9 @@ namespace osl_Security
                                      ( sal_True == bRes ));
         }
 
-        CPPUNIT_TEST_SUITE( getConfigDir );
+        SAL_CPPUNIT_TEST_SUITE( getConfigDir );
         CPPUNIT_TEST( getConfigDir_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getConfigDir
 
     /** testing the method:
@@ -249,9 +249,9 @@ namespace osl_Security
                                      bRes == isAdmin );
         }
 
-        CPPUNIT_TEST_SUITE( isAdministrator );
+        SAL_CPPUNIT_TEST_SUITE( isAdministrator );
         CPPUNIT_TEST( isAdministrator_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class isAdministrator
 
     /** testing the method:
@@ -271,9 +271,9 @@ namespace osl_Security
                                      bRes == sal_True );
         }
 
-        CPPUNIT_TEST_SUITE( getHandle );
+        SAL_CPPUNIT_TEST_SUITE( getHandle );
         CPPUNIT_TEST( getHandle_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getHandle
 
 
@@ -296,10 +296,10 @@ namespace osl_Security
                 CPPUNIT_ASSERT_MESSAGE( "empty function.", sal_True );
             }
 
-        CPPUNIT_TEST_SUITE( UserProfile );
+        SAL_CPPUNIT_TEST_SUITE( UserProfile );
         CPPUNIT_TEST( loadUserProfile );
         CPPUNIT_TEST( unloadUserProfile );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class UserProfile
 
     class loginUserOnFileServer : public CppUnit::TestFixture
@@ -319,9 +319,9 @@ namespace osl_Security
                 CPPUNIT_ASSERT_MESSAGE( "empty function.", erg == osl_Security_E_UserUnknown );
             }
 
-        CPPUNIT_TEST_SUITE( loginUserOnFileServer );
+        SAL_CPPUNIT_TEST_SUITE( loginUserOnFileServer );
         CPPUNIT_TEST( loginUserOnFileServer_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class loginUserOnFileServer
 
 // -----------------------------------------------------------------------------