adapt subsequent check only source too

2 files changed, 48 insertions, 48 deletions

diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index ff42b64f4911..74bd646c9f9e 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -376,10 +376,10 @@ namespace osl_Mutex
             CPPUNIT_ASSERT_MESSAGE( "test Mutex ctor function: increase and decrease a number 3 times without interrupt.", bRes == sal_True );
         }
 
-        CPPUNIT_TEST_SUITE( ctor );
+        SAL_CPPUNIT_TEST_SUITE( ctor );
         CPPUNIT_TEST( ctor_001 );
         CPPUNIT_TEST( ctor_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class ctor
 
 
@@ -433,10 +433,10 @@ namespace osl_Mutex
 
         }
 
-        CPPUNIT_TEST_SUITE( acquire );
+        SAL_CPPUNIT_TEST_SUITE( acquire );
         CPPUNIT_TEST( acquire_001 );
         CPPUNIT_TEST( acquire_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class acquire
 
 
@@ -473,9 +473,9 @@ namespace osl_Mutex
                 bRes1 == sal_False && bRes2 == sal_True);
         }
 
-        CPPUNIT_TEST_SUITE(tryToAcquire);
+        SAL_CPPUNIT_TEST_SUITE(tryToAcquire);
         CPPUNIT_TEST(tryToAcquire_001);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class tryToAcquire
 
     /** Test of the osl::Mutex::release method
@@ -515,10 +515,10 @@ namespace osl_Mutex
         {
         }
 
-        CPPUNIT_TEST_SUITE( release );
+        SAL_CPPUNIT_TEST_SUITE( release );
         CPPUNIT_TEST( release_001 );
         CPPUNIT_TEST( release_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class release
 
 
@@ -567,10 +567,10 @@ namespace osl_Mutex
                 bRes == sal_True );
         }
 
-        CPPUNIT_TEST_SUITE(getGlobalMutex);
+        SAL_CPPUNIT_TEST_SUITE(getGlobalMutex);
         CPPUNIT_TEST(getGlobalMutex_001);
         CPPUNIT_TEST(getGlobalMutex_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class getGlobalMutex
 
 // -----------------------------------------------------------------------------
@@ -655,10 +655,10 @@ namespace osl_Guard
                 bRes == sal_True);
         }
 
-        CPPUNIT_TEST_SUITE(ctor);
+        SAL_CPPUNIT_TEST_SUITE(ctor);
         CPPUNIT_TEST(ctor_001);
         CPPUNIT_TEST(ctor_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class ctor
 
 // -----------------------------------------------------------------------------
@@ -733,10 +733,10 @@ namespace osl_ClearableGuard
                 bRes == sal_True );
         }
 
-        CPPUNIT_TEST_SUITE(ctor);
+        SAL_CPPUNIT_TEST_SUITE(ctor);
         CPPUNIT_TEST(ctor_001);
         CPPUNIT_TEST(ctor_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class ctor
 
     class clear : public CppUnit::TestFixture
@@ -796,10 +796,10 @@ namespace osl_ClearableGuard
                 ( sal_True == bRes ) && ( sal_False == bRes1 ) );
         }
 
-        CPPUNIT_TEST_SUITE( clear );
+        SAL_CPPUNIT_TEST_SUITE( clear );
         CPPUNIT_TEST( clear_001 );
         CPPUNIT_TEST( clear_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class clear
 
 // -----------------------------------------------------------------------------
@@ -873,10 +873,10 @@ namespace osl_ResettableGuard
         }
 
 
-        CPPUNIT_TEST_SUITE(ctor);
+        SAL_CPPUNIT_TEST_SUITE(ctor);
         CPPUNIT_TEST(ctor_001);
         CPPUNIT_TEST(ctor_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class ctor
 
     class reset : public CppUnit::TestFixture
@@ -920,12 +920,12 @@ namespace osl_ResettableGuard
                 ( sal_False == bRes ) && ( sal_True == bRes1 ) );
         }
 
-        CPPUNIT_TEST_SUITE(reset);
+        SAL_CPPUNIT_TEST_SUITE(reset);
         CPPUNIT_TEST(reset_001);
 #ifdef LINUX
         CPPUNIT_TEST(reset_002);
 #endif
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class reset
 
 // -----------------------------------------------------------------------------
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 97705dcf3a60..8ebfe581f71b 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -260,14 +260,14 @@ namespace osl_Pipe
                                         sal_True == bRes && sal_False == bRes1 );
             }
 
-        CPPUNIT_TEST_SUITE( ctors );
+        SAL_CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_none );
         CPPUNIT_TEST( ctors_name_option );
         CPPUNIT_TEST( ctors_name_option_security );
         CPPUNIT_TEST( ctors_copy );
         CPPUNIT_TEST( ctors_no_acquire );
         CPPUNIT_TEST( ctors_acquire );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class ctors
 
 
@@ -306,12 +306,12 @@ namespace osl_Pipe
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), an invalid constructor.", sal_False == aPipe.is( ) );
             }
 
-        CPPUNIT_TEST_SUITE( is );
+        SAL_CPPUNIT_TEST_SUITE( is );
         CPPUNIT_TEST( is_001 );
         CPPUNIT_TEST( is_002 );
         CPPUNIT_TEST( is_003 );
         CPPUNIT_TEST( is_004 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class is
 
 
@@ -388,13 +388,13 @@ namespace osl_Pipe
                                         sal_False == bRes );
             }
 
-        CPPUNIT_TEST_SUITE( create );
+        SAL_CPPUNIT_TEST_SUITE( create );
         CPPUNIT_TEST( create_named_security_001 );
         CPPUNIT_TEST( create_named_security_002 );
         CPPUNIT_TEST( create_named_001 );
         CPPUNIT_TEST( create_named_002 );
         CPPUNIT_TEST( create_named_003 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class create
 
 
@@ -417,9 +417,9 @@ namespace osl_Pipe
                                         sal_False == bRes );
             }
 
-        CPPUNIT_TEST_SUITE( clear );
+        SAL_CPPUNIT_TEST_SUITE( clear );
         CPPUNIT_TEST( clear_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class clear
 
 
@@ -460,10 +460,10 @@ namespace osl_Pipe
                                         sal_True == bRes && sal_True == bRes1 );
             }
 
-        CPPUNIT_TEST_SUITE( assign );
+        SAL_CPPUNIT_TEST_SUITE( assign );
         CPPUNIT_TEST( assign_ref );
         CPPUNIT_TEST( assign_handle );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class assign
 
 
@@ -482,9 +482,9 @@ namespace osl_Pipe
       sal_False );
       }
 
-      CPPUNIT_TEST_SUITE( isValid );
+      SAL_CPPUNIT_TEST_SUITE( isValid );
       CPPUNIT_TEST( isValid_001 );
-      CPPUNIT_TEST_SUITE_END( );
+      SAL_CPPUNIT_TEST_SUITE_END( );
       };*/ // class isValid
 
 
@@ -525,10 +525,10 @@ namespace osl_Pipe
                                         sal_True == bRes && sal_False == bRes1 );
             }
 
-        CPPUNIT_TEST_SUITE( isEqual );
+        SAL_CPPUNIT_TEST_SUITE( isEqual );
         CPPUNIT_TEST( isEqual_001 );
         CPPUNIT_TEST( isEqual_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class isEqual
 
 
@@ -563,10 +563,10 @@ namespace osl_Pipe
                                         OSL_PIPE_FAIL == nRet );
             }
 
-        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
 
 
@@ -586,9 +586,9 @@ namespace osl_Pipe
                 //CPPUNIT_ASSERT_STUB();
             }
 
-        CPPUNIT_TEST_SUITE( accept );
+        SAL_CPPUNIT_TEST_SUITE( accept );
         CPPUNIT_TEST( accept_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     };*/ // class accept
 
 
@@ -645,10 +645,10 @@ namespace osl_Pipe
                                         nError != osl_Pipe_E_None );
             }
 
-        CPPUNIT_TEST_SUITE( getError );
+        SAL_CPPUNIT_TEST_SUITE( getError );
         CPPUNIT_TEST( getError_001 );
         CPPUNIT_TEST( getError_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getError
 
 
@@ -682,10 +682,10 @@ namespace osl_Pipe
                                         sal_True == bRes );
             }
 
-        CPPUNIT_TEST_SUITE( getHandle );
+        SAL_CPPUNIT_TEST_SUITE( getHandle );
         CPPUNIT_TEST( getHandle_001 );
         CPPUNIT_TEST( getHandle_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getHandle
 
 
@@ -820,14 +820,14 @@ namespace osl_StreamPipe
                                         sal_True == bRes );
             }
 
-        CPPUNIT_TEST_SUITE( ctors );
+        SAL_CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_none );
         CPPUNIT_TEST( ctors_handle );
         CPPUNIT_TEST( ctors_copy );
         CPPUNIT_TEST( ctors_name_option );
         CPPUNIT_TEST( ctors_name_option_security );
         CPPUNIT_TEST( ctors_no_acquire );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class ctors
 
 
@@ -872,10 +872,10 @@ namespace osl_StreamPipe
        sal_True == bRes && sal_True == bRes1  );
        }
 
-       CPPUNIT_TEST_SUITE( assign );
+       SAL_CPPUNIT_TEST_SUITE( assign );
        CPPUNIT_TEST( assign_ref );
        CPPUNIT_TEST( assign_handle );
-       CPPUNIT_TEST_SUITE_END( );
+       SAL_CPPUNIT_TEST_SUITE_END( );
        };*/ // class assign
 
 
@@ -1041,10 +1041,10 @@ namespace osl_StreamPipe
                 //no condition judgement here, if the case could finish excuting within 1 or 2 seconds, it passes.
             }
 
-        CPPUNIT_TEST_SUITE( recv );
+        SAL_CPPUNIT_TEST_SUITE( recv );
         CPPUNIT_TEST( recv_001 );
         CPPUNIT_TEST( recv_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class recv
 
 // -----------------------------------------------------------------------------