From 58c8708eec09080015a1d35cf9ca66c89d9e3599 Mon Sep 17 00:00:00 2001 From: sb Date: Thu, 14 Jan 2010 15:11:09 +0100 Subject: [PATCH] sb118: fixed tests for wntmsci12 --- sal/qa/osl/pipe/osl_Pipe.cxx | 8 ++++---- sal/qa/osl/profile/osl_old_testprofile.cxx | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index f82d6a4ce0e2..63db7222f1a3 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -631,8 +631,8 @@ namespace osl_Pipe printPipeError( aPipe ); aPipe.clear( ); - CPPUNIT_ASSERT_MESSAGE( "#test comment#: open a non-exist pipe. not passed in (W32)(LINUX)(UNX).", - osl_Pipe_E_invalidError == nError ); + CPPUNIT_ASSERT_MESSAGE( "#test comment#: open a non-exist pipe.", + nError != osl_Pipe_E_None ); } void getError_002( ) @@ -644,8 +644,8 @@ namespace osl_Pipe aPipe.clear( ); aPipe1.clear( ); - CPPUNIT_ASSERT_MESSAGE( "#test comment#: create an already exist pipe.not passed in (W32)(LINUX)(UNX).", - osl_Pipe_E_invalidError == nError ); + CPPUNIT_ASSERT_MESSAGE( "#test comment#: create an already exist pipe.", + nError != osl_Pipe_E_None ); } CPPUNIT_TEST_SUITE( getError ); diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx index 65495407241d..abbd59f76a65 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -70,7 +70,8 @@ void oldtests::test_profile(void) // successful write - if ((hProfile = osl_openProfile( ustrProfileName, 0 ))) + hProfile = osl_openProfile( ustrProfileName, 0 ); + if (hProfile != 0) { if (! osl_writeProfileBool( hProfile, "testsection", "testbool", 1 )) printf( "### cannot write into init file!\n" ); @@ -79,7 +80,8 @@ void oldtests::test_profile(void) } // unsuccessful write - if ((hProfile = osl_openProfile( ustrProfileName2, 0 ))) + hProfile = osl_openProfile( ustrProfileName2, 0 ); + if (hProfile != 0) { if (osl_writeProfileBool( hProfile, "testsection", "testbool", 1 )) printf( "### unexpected success writing into test2.ini!\n" );