summaryrefslogtreecommitdiff
path: root/stoc/test
diff options
context:
space:
mode:
Diffstat (limited to 'stoc/test')
-rw-r--r--stoc/test/tdmanager/testtdmanager.cxx2
-rw-r--r--stoc/test/testconv.cxx6
-rw-r--r--stoc/test/testcorefl.cxx4
-rw-r--r--stoc/test/testiadapter.cxx12
-rw-r--r--stoc/test/testproxyfac.cxx30
-rw-r--r--stoc/test/testregistry.cxx94
-rw-r--r--stoc/test/testsmgr2.cxx4
7 files changed, 74 insertions, 78 deletions
diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx
index e09c8297ceae..e466904b4314 100644
--- a/stoc/test/tdmanager/testtdmanager.cxx
+++ b/stoc/test/tdmanager/testtdmanager.cxx
@@ -130,7 +130,7 @@ sal_Int32 Service::run(css::uno::Sequence< OUString > const & arguments)
// test: add cmd line rdbs to manager
- assert( arguments.getLength() > 0 );
+ OSL_ASSERT( arguments.getLength() > 0 );
css::uno::Reference<css::container::XSet> xSet(
manager, css::uno::UNO_QUERY_THROW );
for ( sal_Int32 argPos = 0; argPos < arguments.getLength(); ++argPos ) {
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index bbca4088d856..1e9aae16ed42 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -642,13 +642,13 @@ static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr )
aRet = xConverter->convertTo( aRet, cppu::UnoType<XServiceInfo>::get());
aRet <<= SAL_CONST_INT64(0x7fffffffffffffff);
aRet = xConverter->convertTo( aRet, cppu::UnoType<sal_uInt64>::get());
- assert( *(const sal_uInt64 *)aRet.getValue() == SAL_CONST_UINT64(0x7fffffffffffffff) );
+ OSL_ASSERT( *(const sal_uInt64 *)aRet.getValue() == SAL_CONST_UINT64(0x7fffffffffffffff) );
aRet <<= SAL_CONST_UINT64(0xffffffffffffffff);
aRet = xConverter->convertTo( aRet, cppu::UnoType<sal_uInt64>::get());
- assert( *(const sal_uInt64 *)aRet.getValue() == SAL_CONST_UINT64(0xffffffffffffffff) );
+ OSL_ASSERT( *(const sal_uInt64 *)aRet.getValue() == SAL_CONST_UINT64(0xffffffffffffffff) );
aRet <<= SAL_CONST_INT64(-1);
aRet = xConverter->convertTo( aRet, cppu::UnoType<sal_Int8>::get());
- assert( *(const sal_Int8 *)aRet.getValue() == (-1) );
+ OSL_ASSERT( *(const sal_Int8 *)aRet.getValue() == (-1) );
printf( "test_Conversion(): end.\n" );
}
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index df6542407d38..3b2a02cccd8a 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -348,11 +348,11 @@ SAL_IMPLEMENT_MAIN()
OUString( "stoctest.rdb" ) ) );
Reference< XComponentContext > xContext;
Reference< beans::XPropertySet > xProps( xMgr, UNO_QUERY );
- assert( xProps.is() );
+ OSL_ASSERT( xProps.is() );
xProps->getPropertyValue(
OUString( "DefaultContext" ) ) >>=
xContext;
- assert( xContext.is() );
+ OSL_ASSERT( xContext.is() );
Reference< XIdlReflection > xRefl;
xContext->getValueByName(
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index df947c5b5124..a335939b9659 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -309,8 +309,8 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
Any aRet;
- assert( rOutParam.getLength() == 0 );
- assert( rOutParamIndex.getLength() == 0 );
+ OSL_ASSERT( rOutParam.getLength() == 0 );
+ OSL_ASSERT( rOutParamIndex.getLength() == 0 );
try
{
@@ -334,7 +334,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
if ( rFunctionName == "setValues" )
{
- assert( rParams.getLength() == 17 );
+ OSL_ASSERT( rParams.getLength() == 17 );
aBool = *(sal_Bool *)rParams[0].getValue();
aChar = *(sal_Unicode *)rParams[1].getValue();
rParams[2] >>= nByte;
@@ -781,7 +781,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double,
aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 );
- assert( equals( aData, aRet ) && equals( aData, aRet2 ) );
+ OSL_ASSERT( equals( aData, aRet ) && equals( aData, aRet2 ) );
// set last retrieved values
test::TestData aSV2ret = xLBT->setValues2(
@@ -789,7 +789,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double,
aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 );
- assert( equals( aData, aSV2ret ) && equals( aData, aRet2 ) );
+ OSL_ASSERT( equals( aData, aSV2ret ) && equals( aData, aRet2 ) );
}
{
test::TestData aRet, aRet2;
@@ -798,7 +798,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double,
aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 );
- assert( equals( aData, aRet ) && equals( aData, aRet2 ) && equals( aData, aGVret ) );
+ OSL_ASSERT( equals( aData, aRet ) && equals( aData, aRet2 ) && equals( aData, aGVret ) );
// set last retrieved values
xLBT->setBool( aRet.Bool );
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index 7579dce79631..ebc878696316 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -172,7 +172,7 @@ static void test_proxyfac_(
(void)test;
Reference< lang::XServiceInfo > xMaster_XServiceInfo(
xMaster, UNO_QUERY_THROW );
- assert( xMaster_XServiceInfo->getImplementationName().equals( test ) );
+ OSL_ASSERT( xMaster_XServiceInfo->getImplementationName().equals( test ) );
Reference< reflection::XProxyFactory > xTarget( xMaster, UNO_QUERY_THROW );
Reference< XCurrentContext > xTarget_XCurrentContext(
@@ -180,34 +180,34 @@ static void test_proxyfac_(
Reference< XCurrentContext > xMaster_XCurrentContext(
xMaster, UNO_QUERY_THROW );
- assert(
+ OSL_ASSERT(
xTarget_XCurrentContext->getValueByName( test ) == makeAny( test ) );
- assert(
+ OSL_ASSERT(
xMaster_XCurrentContext->getValueByName( test ) == makeAny( test ) );
Reference< XAggregation > xFakeAgg( xTarget->createProxy( xTarget ) );
if (xFakeAgg.is())
{
- assert( xTarget == xFakeAgg );
- assert( xMaster == xFakeAgg );
+ OSL_ASSERT( xTarget == xFakeAgg );
+ OSL_ASSERT( xMaster == xFakeAgg );
}
Reference< lang::XServiceInfo > xTarget_XServiceInfo(
xTarget, UNO_QUERY_THROW );
- assert( xTarget_XServiceInfo->getImplementationName().equals( test ) );
+ OSL_ASSERT( xTarget_XServiceInfo->getImplementationName().equals( test ) );
Reference< lang::XServiceInfo > xTarget_XServiceInfo2(
xTarget, UNO_QUERY_THROW );
- assert( xTarget_XServiceInfo2.get() == xTarget_XServiceInfo.get() );
+ OSL_ASSERT( xTarget_XServiceInfo2.get() == xTarget_XServiceInfo.get() );
- assert( xTarget == xTarget_XCurrentContext );
- assert( xTarget_XCurrentContext == xMaster );
- assert(
+ OSL_ASSERT( xTarget == xTarget_XCurrentContext );
+ OSL_ASSERT( xTarget_XCurrentContext == xMaster );
+ OSL_ASSERT(
xTarget_XCurrentContext.get() == xMaster_XCurrentContext.get() );
- assert( xTarget_XCurrentContext == xMaster );
- assert( xTarget == xMaster );
- assert( xTarget_XServiceInfo.get() == xMaster_XServiceInfo.get() );
- assert( xTarget_XServiceInfo == xMaster );
- assert( xMaster_XServiceInfo == xMaster );
+ OSL_ASSERT( xTarget_XCurrentContext == xMaster );
+ OSL_ASSERT( xTarget == xMaster );
+ OSL_ASSERT( xTarget_XServiceInfo.get() == xMaster_XServiceInfo.get() );
+ OSL_ASSERT( xTarget_XServiceInfo == xMaster );
+ OSL_ASSERT( xMaster_XServiceInfo == xMaster );
try
{
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index dfeeff42189e..b2dd4dd7051e 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -55,36 +55,33 @@ using namespace osl;
namespace stoc_impreg
{
void SAL_CALL mergeKeys(
- Reference< registry::XRegistryKey > const & xDest,
- Reference< registry::XRegistryKey > const & xSource );
+Reference< registry::XRegistryKey > const & xDest,
+Reference< registry::XRegistryKey > const & xSource );
}
-
static void mergeKeys(
- Reference< registry::XSimpleRegistry > const & xDest,
- OUString const & rBaseNode,
- OUString const & rURL )
+Reference< registry::XSimpleRegistry > const & xDest,
+OUString const & rBaseNode,
+OUString const & rURL )
{
- Reference< registry::XRegistryKey > xDestRoot( xDest->getRootKey() );
- Reference< registry::XRegistryKey > xDestKey;
-
- if (rBaseNode.getLength())
- {
- xDestKey = xDestRoot->createKey( rBaseNode );
- xDestRoot->closeKey();
- }
- else
- {
- xDestKey = xDestRoot;
- }
-
- Reference< registry::XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() );
- xSimReg->open( rURL, sal_True, sal_False );
- assert( xSimReg->isValid() );
- Reference< registry::XRegistryKey > xSourceKey( xSimReg->getRootKey() );
- ::stoc_impreg::mergeKeys( xDestKey, xSourceKey );
- xSourceKey->closeKey();
- xSimReg->close();
- xDestKey->closeKey();
+Reference< registry::XRegistryKey > xDestRoot( xDest->getRootKey() );
+Reference< registry::XRegistryKey > xDestKey;
+if (rBaseNode.getLength())
+{
+xDestKey = xDestRoot->createKey( rBaseNode );
+xDestRoot->closeKey();
+}
+else
+{
+xDestKey = xDestRoot;
+}
+Reference< registry::XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() );
+xSimReg->open( rURL, sal_True, sal_False );
+OSL_ASSERT( xSimReg->isValid() );
+Reference< registry::XRegistryKey > xSourceKey( xSimReg->getRootKey() );
+::stoc_impreg::mergeKeys( xDestKey, xSourceKey );
+xSourceKey->closeKey();
+xSimReg->close();
+xDestKey->closeKey();
}
@@ -92,34 +89,33 @@ OString userRegEnv("STAR_USER_REGISTRY=");
OUString getExePath()
{
- OUString exe;
- OSL_VERIFY( osl_getExecutableFile( &exe.pData ) == osl_Process_E_None);
+OUString exe;
+OSL_VERIFY( osl_getExecutableFile( &exe.pData ) == osl_Process_E_None);
#if defined(_WIN32)
- exe = exe.copy(0, exe.getLength() - 16);
+exe = exe.copy(0, exe.getLength() - 16);
#else
- exe = exe.copy(0, exe.getLength() - 12);
+exe = exe.copy(0, exe.getLength() - 12);
#endif
- return exe;
+return exe;
}
void setStarUserRegistry()
{
- Registry *myRegistry = new Registry();
-
- RegistryKey rootKey, rKey, rKey2;
+Registry *myRegistry = new Registry();
- OUString userReg = getExePath();
- userReg += "user.rdb";
+RegistryKey rootKey, rKey, rKey2;
- if(myRegistry->open(userReg, RegAccessMode::READWRITE))
- {
- OSL_VERIFY(!myRegistry->create(userReg));
- }
+OUString userReg = getExePath();
+userReg += "user.rdb";
+if(myRegistry->open(userReg, RegAccessMode::READWRITE))
+{
+OSL_VERIFY(!myRegistry->create(userReg));
+}
- OSL_VERIFY(!myRegistry->close());
- delete myRegistry;
+OSL_VERIFY(!myRegistry->close());
+delete myRegistry;
- userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US);
+userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US);
putenv((char *)userRegEnv.getStr());
}
@@ -650,7 +646,7 @@ void test_DefaultRegistry(
SAL_IMPLEMENT_MAIN()
{
// setStarUserRegistry();
- setLinkInDefaultRegistry(OUString("/Test/DefaultLink"),
+ setLinkInDefaultRegistry(OUString("/Test/DefaultLink"),
OUString("/Test/FifthKey/MyFirstLink"));
OUString reg1( "testreg1.rdb" );
@@ -658,10 +654,10 @@ SAL_IMPLEMENT_MAIN()
OUString areg1( "atestreg1.rdb" );
OUString areg2( "atestreg2.rdb" );
- test_SimpleRegistry( reg1, reg2 );
- test_DefaultRegistry( reg1, reg2 );
- test_SimpleRegistry( areg1, areg2, true ); // use different merge
- test_DefaultRegistry( areg1, areg2, true );
+ test_SimpleRegistry( reg1, reg2 );
+ test_DefaultRegistry( reg1, reg2 );
+ test_SimpleRegistry( areg1, areg2, true ); // use different merge
+ test_DefaultRegistry( areg1, areg2, true );
Reference< XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() );
xSimReg->open( reg1, sal_False, sal_True );
diff --git a/stoc/test/testsmgr2.cxx b/stoc/test/testsmgr2.cxx
index dd65f6733724..2e40c0444dca 100644
--- a/stoc/test/testsmgr2.cxx
+++ b/stoc/test/testsmgr2.cxx
@@ -76,7 +76,7 @@ SAL_IMPLEMENT_MAIN()
n ++;
}
// there are two services in two registries !
- assert( 2 == n );
+ OSL_ASSERT( 2 == n );
if( 2 == n )
{
printf( "test passed\n" );
@@ -101,7 +101,7 @@ SAL_IMPLEMENT_MAIN()
{
OString o = OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US );
printf( "%s\n" , o.getStr() );
- assert(0);
+ OSL_ASSERT( 0 );
return 1;
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 06:00:30 +0000