diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 08:11:12 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 08:11:12 +1000 |
| commit | 9a274915a16eea5e3ce51a27b1a8741ac5e785b8 (patch) | |
| tree | 952d7239d645985b08edf0c7e9fbcc6e3f43a2f5 /io/test/stm | |
| parent | 8dd791560b08525eec3853029fc9f4e1c49f74de (diff) | |
tdf#43157: convert cppuhelper and io from OSL_ASSERT to assert
Change-Id: I56d49e1ce9f1c070fedcabb8f1637d17dee1083b
Diffstat (limited to 'io/test/stm')
| -rw-r--r-- | io/test/stm/datatest.cxx | 24 | ||||
| -rw-r--r-- | io/test/stm/marktest.cxx | 8 |
2 files changed, 16 insertions, 16 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 ); |