diff options
| author | Gábor Stefanik <netrolller.3d@gmail.com> | 2012-05-03 22:26:44 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-05-07 11:31:55 +0300 |
| commit | 789813aa8dcc19f8d576ca651ad8365d4ee6d703 (patch) | |
| tree | be4b23dc49c0656a838f964fa0d382b0229730d7 /stoc/test/excomp | |
| parent | ffc53f86501b6f29eeb5d75b6b2dfcf9ae982c18 (diff) | |
fdo#48391: Remove TEST_ENSHURE
Change-Id: Id9fc99aab1515a710374b3364f6136587f95f582
Diffstat (limited to 'stoc/test/excomp')
| -rw-r--r-- | stoc/test/excomp/excomp.cxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/stoc/test/excomp/excomp.cxx b/stoc/test/excomp/excomp.cxx index d896b6890dbd..fb831c14ce74 100644 --- a/stoc/test/excomp/excomp.cxx +++ b/stoc/test/excomp/excomp.cxx @@ -53,12 +53,6 @@ using namespace cppu; using ::rtl::OUString; using ::rtl::OUStringToOString; -#if OSL_DEBUG_LEVEL > 0 -#define TEST_ENSHURE(c, m) OSL_ENSURE(c, m) -#else -#define TEST_ENSHURE(c, m) OSL_VERIFY(c) -#endif - OUString getExePath() { OUString exe; @@ -89,7 +83,7 @@ SAL_IMPLEMENT_MAIN() excompRdb += OUString(RTL_CONSTASCII_USTRINGPARAM("excomp.rdb")); Reference< XMultiServiceFactory > xSMgr = ::cppu::createRegistryServiceFactory( excompRdb ); - TEST_ENSHURE( xSMgr.is(), "excomp error 0" ); + OSL_ENSURE( xSMgr.is(), "excomp error 0" ); typelib_TypeDescription* pTypeDesc = NULL; OUString sType(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.XTextDocument")); @@ -98,7 +92,7 @@ SAL_IMPLEMENT_MAIN() Reference< XInterface > xIFace = xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration"))); Reference< XImplementationRegistration > xImpReg( xIFace, UNO_QUERY); - TEST_ENSHURE( xImpReg.is(), "excomp error 1" ); + OSL_ENSURE( xImpReg.is(), "excomp error 1" ); try { xImpReg->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), @@ -110,15 +104,15 @@ SAL_IMPLEMENT_MAIN() } catch(const CannotRegisterImplementationException& e) { - TEST_ENSHURE( e.Message.getLength(), OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US).getStr() ); + OSL_ENSURE( e.Message.getLength(), OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US).getStr() ); } Reference< XTest > xTest1( xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("example.ExampleComponent1"))), UNO_QUERY); - TEST_ENSHURE( xTest1.is(), "excomp error 2" ); + OSL_ENSURE( xTest1.is(), "excomp error 2" ); Reference< XTest > xTest2( xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("example.ExampleComponent2"))), UNO_QUERY); - TEST_ENSHURE( xTest2.is(), "excomp error 3" ); + OSL_ENSURE( xTest2.is(), "excomp error 3" ); OUString m1 = xTest1->getMessage(); OUString m2 = xTest2->getMessage(); |