summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2010-01-14 15:11:09 +0100
committersb <sb@openoffice.org>2010-01-14 15:11:09 +0100
commit58c8708eec09080015a1d35cf9ca66c89d9e3599 (patch)
tree5a0a27c7be45811259f1bc34aede06e530a39e09 /sal
parent514ec60a0e06d521f9c6646cb2bbd29318e300a8 (diff)
sb118: fixed tests for wntmsci12
Diffstat (limited to 'sal')
-rw-r--r--sal/qa/osl/pipe/osl_Pipe.cxx8
-rw-r--r--sal/qa/osl/profile/osl_old_testprofile.cxx6
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" );