summaryrefslogtreecommitdiff
path: root/extensions/test/stm
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/test/stm')
-rw-r--r--extensions/test/stm/datatest.cxx28
-rw-r--r--extensions/test/stm/marktest.cxx12
-rw-r--r--extensions/test/stm/pipetest.cxx6
3 files changed, 17 insertions, 29 deletions
diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx
index 5edc414e7f2c..be302d877432 100644
--- a/extensions/test/stm/datatest.cxx
+++ b/extensions/test/stm/datatest.cxx
@@ -52,10 +52,6 @@
#include <vos/mutex.hxx>
#include <vos/thread.hxx>
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
#include <string.h>
#include "testfactreg.hxx"
@@ -206,13 +202,13 @@ INT32 ODataStreamTest::test( const UString& TestName,
x->queryInterface( XActiveDataSource::getSmartUik() , rSource );
}
- assert( rPipeInput.is() );
- assert( rPipeOutput.is() );
+ OSL_ASSERT( rPipeInput.is() );
+ OSL_ASSERT( rPipeOutput.is() );
rSink->setInputStream( rPipeInput );
rSource->setOutputStream( rPipeOutput );
- assert( rSink->getInputStream().is() );
- assert( rSource->getOutputStream().is() );
+ OSL_ASSERT( rSink->getInputStream().is() );
+ OSL_ASSERT( rSource->getOutputStream().is() );
if( 1 == hTestHandle ) {
testSimple( rInput , rOutput );
@@ -767,10 +763,10 @@ INT32 OObjectStreamTest::test( const UString& TestName,
XOutputStreamRef markableOutput( x , USR_QUERY );
XActiveDataSourceRef markableSource( x , USR_QUERY );
- assert( markableInput.is() );
- assert( markableOutput.is() );
- assert( markableSink.is() );
- assert( markableSource.is() );
+ OSL_ASSERT( markableInput.is() );
+ OSL_ASSERT( markableOutput.is() );
+ OSL_ASSERT( markableSink.is() );
+ OSL_ASSERT( markableSource.is() );
markableSink->setInputStream( rPipeInput );
markableSource->setOutputStream( rPipeOutput );
@@ -786,14 +782,14 @@ INT32 OObjectStreamTest::test( const UString& TestName,
x->queryInterface( XActiveDataSource::getSmartUik() , rSource );
}
- assert( rPipeInput.is() );
- assert( rPipeOutput.is() );
+ OSL_ASSERT( rPipeInput.is() );
+ OSL_ASSERT( rPipeOutput.is() );
rSink->setInputStream( markableInput );
rSource->setOutputStream( markableOutput );
- assert( rSink->getInputStream().is() );
- assert( rSource->getOutputStream().is() );
+ OSL_ASSERT( rSink->getInputStream().is() );
+ OSL_ASSERT( rSource->getOutputStream().is() );
if( 1 + DATASTREAM_TEST_MAX_HANDLE == hTestHandle ) {
testObject( rOutput , rInput);
diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx
index 8bba9bbebc86..2cc19c2ae265 100644
--- a/extensions/test/stm/marktest.cxx
+++ b/extensions/test/stm/marktest.cxx
@@ -48,10 +48,6 @@
#include <vos/mutex.hxx>
#include <vos/thread.hxx>
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
#include <string.h>
#include "testfactreg.hxx"
@@ -166,8 +162,8 @@ INT32 OMarkableOutputStreamTest::test( const UString& TestName,
XOutputStreamRef rOutput( TestObject , USR_QUERY );
- assert( rPipeInput.is() );
- assert( rOutput.is() );
+ OSL_ASSERT( rPipeInput.is() );
+ OSL_ASSERT( rOutput.is() );
if( 1 == hTestHandle ) {
// checks usual streaming
testSimple( rOutput , rPipeInput );
@@ -533,8 +529,8 @@ INT32 OMarkableInputStreamTest::test( const UString& TestName,
XInputStreamRef rInput( TestObject , USR_QUERY );
- assert( rPipeOutput.is() );
- assert( rInput.is() );
+ OSL_ASSERT( rPipeOutput.is() );
+ OSL_ASSERT( rInput.is() );
if( 1 == hTestHandle ) {
// checks usual streaming
testSimple( rPipeOutput , rInput );
diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx
index 4f4337ceff45..233979230708 100644
--- a/extensions/test/stm/pipetest.cxx
+++ b/extensions/test/stm/pipetest.cxx
@@ -45,10 +45,6 @@
#include <vos/mutex.hxx>
#include <vos/thread.hxx>
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
#include <string.h>
#include "testfactreg.hxx"
@@ -404,7 +400,7 @@ void OPipeTest::testMultithreading( const XInterfaceRef &r )
XInputStreamRef input( x , USR_QUERY );
XOutputStreamRef output( x , USR_QUERY );
- assert( output.is() );
+ OSL_ASSERT( output.is() );
while( TRUE ) {
// basic read/write
Sequence<BYTE> seqWrite( 500 );