summaryrefslogtreecommitdiff
path: root/io/test
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 08:11:12 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 08:11:12 +1000
commit9a274915a16eea5e3ce51a27b1a8741ac5e785b8 (patch)
tree952d7239d645985b08edf0c7e9fbcc6e3f43a2f5 /io/test
parent8dd791560b08525eec3853029fc9f4e1c49f74de (diff)
tdf#43157: convert cppuhelper and io from OSL_ASSERT to assert
Change-Id: I56d49e1ce9f1c070fedcabb8f1637d17dee1083b
Diffstat (limited to 'io/test')
-rw-r--r--io/test/stm/datatest.cxx24
-rw-r--r--io/test/stm/marktest.cxx8
-rw-r--r--io/test/testconnection.cxx6
3 files changed, 19 insertions, 19 deletions
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 283344c271ee..44c587895114 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -181,13 +181,13 @@ sal_Int32 ODataStreamTest::test(
rSource.set( x, UNO_QUERY );
}
- OSL_ASSERT( rPipeInput.is() );
- OSL_ASSERT( rPipeOutput.is() );
+ assert( rPipeInput.is() );
+ assert( rPipeOutput.is() );
rSink->setInputStream( rPipeInput );
rSource->setOutputStream( rPipeOutput );
- OSL_ASSERT( rSink->getInputStream().is() );
- OSL_ASSERT( rSource->getOutputStream().is() );
+ assert( rSink->getInputStream().is() );
+ assert( rSource->getOutputStream().is() );
if( 1 == hTestHandle ) {
testSimple( rInput , rOutput );
@@ -727,10 +727,10 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName,
Reference <XOutputStream > markableOutput( x , UNO_QUERY );
Reference <XActiveDataSource > markableSource( x , UNO_QUERY );
- OSL_ASSERT( markableInput.is() );
- OSL_ASSERT( markableOutput.is() );
- OSL_ASSERT( markableSink.is() );
- OSL_ASSERT( markableSource.is() );
+ assert( markableInput.is() );
+ assert( markableOutput.is() );
+ assert( markableSink.is() );
+ assert( markableSource.is() );
markableSink->setInputStream( rPipeInput );
markableSource->setOutputStream( rPipeOutput );
@@ -748,14 +748,14 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName,
rSource.set( x, UNO_QUERY );
}
- OSL_ASSERT( rPipeInput.is() );
- OSL_ASSERT( rPipeOutput.is() );
+ assert( rPipeInput.is() );
+ assert( rPipeOutput.is() );
rSink->setInputStream( markableInput );
rSource->setOutputStream( markableOutput );
- OSL_ASSERT( rSink->getInputStream().is() );
- OSL_ASSERT( rSource->getOutputStream().is() );
+ assert( rSink->getInputStream().is() );
+ assert( rSource->getOutputStream().is() );
if( 1 + DATASTREAM_TEST_MAX_HANDLE == hTestHandle ) {
testObject( rOutput , rInput);
diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx
index 8892e7338330..b8c229dab312 100644
--- a/io/test/stm/marktest.cxx
+++ b/io/test/stm/marktest.cxx
@@ -135,8 +135,8 @@ sal_Int32 OMarkableOutputStreamTest::test(
Reference< XOutputStream > rOutput( TestObject , UNO_QUERY );
- OSL_ASSERT( rPipeInput.is() );
- OSL_ASSERT( rOutput.is() );
+ assert( rPipeInput.is() );
+ assert( rOutput.is() );
if( 1 == hTestHandle ) {
// checks usual streaming
testSimple( rOutput , rPipeInput );
@@ -489,8 +489,8 @@ sal_Int32 OMarkableInputStreamTest::test(
Reference < XInputStream > rInput( TestObject , UNO_QUERY );
- OSL_ASSERT( rPipeOutput.is() );
- OSL_ASSERT( rInput.is() );
+ assert( rPipeOutput.is() );
+ assert( rInput.is() );
if( 1 == hTestHandle ) {
// checks usual streaming
testSimple( rPipeOutput , rInput );
diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx
index 69a2bdeccfb8..67310cf854a7 100644
--- a/io/test/testconnection.cxx
+++ b/io/test/testconnection.cxx
@@ -72,11 +72,11 @@ void doRead( const Reference < XConnection > &r )
{
Sequence < sal_Int8 > seq(10);
- OSL_ASSERT( 10 == r->read( seq , 10 ) );
+ assert( 10 == r->read( seq , 10 ) );
for( sal_Int32 i = 0 ; i < 10 ; i ++ )
{
- OSL_ASSERT( seq.getConstArray()[i] == i );
+ assert( seq.getConstArray()[i] == i );
}
}
@@ -130,7 +130,7 @@ void testConnection( const OUString &sConnectionDescription ,
TimeValue value = {1,0};
osl_waitThread( &value );
r = rConnector->connect( sConnectionDescription );
- OSL_ASSERT( r.is() );
+ assert( r.is() );
doWrite( r );
doRead( r );
bGotit = sal_True;