OSL_ENSHURE replaced by OSL_ENSURE

4 files changed, 44 insertions, 44 deletions

diff --git a/cppu/test/surrogate.hxx b/cppu/test/surrogate.hxx
index bb60f491055e..a723c2d402e0 100644
--- a/cppu/test/surrogate.hxx
+++ b/cppu/test/surrogate.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: surrogate.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:25:54 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 13:28:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,7 +127,7 @@ inline sal_Bool makeSurrogate( com::sun::star::uno::Reference< T > & rOut,
     typelib_TypeDescription * pTD = 0;
     const com::sun::star::uno::Type & rType = ::getCppuType( &rOriginal );
     TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() );
-    OSL_ENSHURE( pTD, "### cannot get typedescription!" );
+    OSL_ENSURE( pTD, "### cannot get typedescription!" );
     if (pTD)
     {
         uno_Environment * pCppEnv1 = 0;
@@ -153,13 +153,13 @@ inline sal_Bool makeSurrogate( com::sun::star::uno::Reference< T > & rOut,
 /*
     ::com::sun::star::uno::Mapping aCpp2Uno( CPPU_CURRENT_LANGUAGE_BINDING_NAME, UNO_LB_UNO );
     ::com::sun::star::uno::Mapping aUno2Cpp( UNO_LB_UNO, CPPU_CURRENT_LANGUAGE_BINDING_NAME );
-    OSL_ENSHURE( aCpp2Uno.is() && aUno2Cpp.is(), "### cannot get mappings!" );
+    OSL_ENSURE( aCpp2Uno.is() && aUno2Cpp.is(), "### cannot get mappings!" );
     if (aCpp2Uno.is() && aUno2Cpp.is())
     {
         typelib_TypeDescription * pTD = 0;
         const com::sun::star::uno::Type & rType = ::getCppuType( &rOriginal );
         TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() );
-        OSL_ENSHURE( pTD, "### cannot get typedescription!" );
+        OSL_ENSURE( pTD, "### cannot get typedescription!" );
         if (pTD)
         {
             uno_Interface * pUno = (uno_Interface *)aCpp2Uno.mapInterface(
@@ -168,7 +168,7 @@ inline sal_Bool makeSurrogate( com::sun::star::uno::Reference< T > & rOut,
             {
                 UnoMediator * pPseudo = new UnoMediator( pUno );
                 (*pPseudo->acquire)( pPseudo );
-                OSL_ENSHURE( uno_equals( &pUno, &pPseudo, pTD, 0 ), "### interfaces don't belong to same object, but they do!?" );
+                OSL_ENSURE( uno_equals( &pUno, &pPseudo, pTD, 0 ), "### interfaces don't belong to same object, but they do!?" );
                 (*pUno->release)( pUno );
 
                 T * pCpp = (T *)aUno2Cpp.mapInterface(
diff --git a/cppu/test/test_di.cxx b/cppu/test/test_di.cxx
index 82198b1613e4..d8f804989d67 100644
--- a/cppu/test/test_di.cxx
+++ b/cppu/test/test_di.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: test_di.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dbo $ $Date: 2001-02-28 15:34:46 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 13:28:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,21 +88,21 @@ using namespace rtl;
 //==================================================================================================
 sal_Bool equals( const test::TestElement & rData1, const test::TestElement & rData2 )
 {
-    OSL_ENSHURE( rData1.Bool == rData2.Bool, "### bool does not match!" );
-    OSL_ENSHURE( rData1.Char == rData2.Char, "### char does not match!" );
-    OSL_ENSHURE( rData1.Byte == rData2.Byte, "### byte does not match!" );
-    OSL_ENSHURE( rData1.Short == rData2.Short, "### short does not match!" );
-    OSL_ENSHURE( rData1.UShort == rData2.UShort, "### unsigned short does not match!" );
-    OSL_ENSHURE( rData1.Long == rData2.Long, "### long does not match!" );
-    OSL_ENSHURE( rData1.ULong == rData2.ULong, "### unsigned long does not match!" );
-    OSL_ENSHURE( rData1.Hyper == rData2.Hyper, "### hyper does not match!" );
-    OSL_ENSHURE( rData1.UHyper == rData2.UHyper, "### unsigned hyper does not match!" );
-    OSL_ENSHURE( rData1.Float == rData2.Float, "### float does not match!" );
-    OSL_ENSHURE( rData1.Double == rData2.Double, "### double does not match!" );
-    OSL_ENSHURE( rData1.Enum == rData2.Enum, "### enum does not match!" );
-    OSL_ENSHURE( rData1.String == rData2.String, "### string does not match!" );
-    OSL_ENSHURE( rData1.Interface == rData2.Interface, "### interface does not match!" );
-    OSL_ENSHURE( rData1.Any == rData2.Any, "### any does not match!" );
+    OSL_ENSURE( rData1.Bool == rData2.Bool, "### bool does not match!" );
+    OSL_ENSURE( rData1.Char == rData2.Char, "### char does not match!" );
+    OSL_ENSURE( rData1.Byte == rData2.Byte, "### byte does not match!" );
+    OSL_ENSURE( rData1.Short == rData2.Short, "### short does not match!" );
+    OSL_ENSURE( rData1.UShort == rData2.UShort, "### unsigned short does not match!" );
+    OSL_ENSURE( rData1.Long == rData2.Long, "### long does not match!" );
+    OSL_ENSURE( rData1.ULong == rData2.ULong, "### unsigned long does not match!" );
+    OSL_ENSURE( rData1.Hyper == rData2.Hyper, "### hyper does not match!" );
+    OSL_ENSURE( rData1.UHyper == rData2.UHyper, "### unsigned hyper does not match!" );
+    OSL_ENSURE( rData1.Float == rData2.Float, "### float does not match!" );
+    OSL_ENSURE( rData1.Double == rData2.Double, "### double does not match!" );
+    OSL_ENSURE( rData1.Enum == rData2.Enum, "### enum does not match!" );
+    OSL_ENSURE( rData1.String == rData2.String, "### string does not match!" );
+    OSL_ENSURE( rData1.Interface == rData2.Interface, "### interface does not match!" );
+    OSL_ENSURE( rData1.Any == rData2.Any, "### any does not match!" );
 
     return (rData1.Bool == rData2.Bool &&
             rData1.Char == rData2.Char &&
@@ -136,7 +136,7 @@ sal_Bool equals( const test::TestData & rData1, const test::TestData & rData2 )
         {
             if (! equals( pElements1[nLen], pElements2[nLen] ))
             {
-                OSL_ENSHURE( sal_False, "### sequence element did not match!" );
+                OSL_ENSURE( sal_False, "### sequence element did not match!" );
                 return sal_False;
             }
         }
@@ -385,7 +385,7 @@ test::TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_In
 //==================================================================================================
 sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
 {
-    OSL_ENSHURE( xLBT.is(), "### no test interface!" );
+    OSL_ENSURE( xLBT.is(), "### no test interface!" );
     if (xLBT.is())
     {
         // this data is never ever granted access to by calls other than equals(), assign()!
@@ -400,8 +400,8 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
                 OUString::createFromAscii("dumdidum"), xI,
                 Any( &xI, ::getCppuType( (const Reference<XInterface > *)0 ) ) );
 
-        OSL_ENSHURE( aData.Any == xI, "### unexpected any!" );
-        OSL_ENSHURE( !(aData.Any != xI), "### unexpected any!" );
+        OSL_ENSURE( aData.Any == xI, "### unexpected any!" );
+        OSL_ENSURE( !(aData.Any != xI), "### unexpected any!" );
 
         aData.Sequence = Sequence<test::TestElement >( (const test::TestElement *)&aData, 1 );
         // aData complete
@@ -541,7 +541,7 @@ sal_Bool raiseException( const Reference< XLanguageBindingTest > & xLBT )
             catch (IllegalArgumentException aExc)
             {
                 ++nCount;
-                OSL_ENSHURE( aExc.ArgumentPosition == 5 &&
+                OSL_ENSURE( aExc.ArgumentPosition == 5 &&
                              aExc.Context == xLBT->getInterface() &&
                              aExc.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...") ),
                              "### unexpected exception content!" );
@@ -553,7 +553,7 @@ sal_Bool raiseException( const Reference< XLanguageBindingTest > & xLBT )
         catch (const RuntimeException & rExc)
         {
             ++nCount;
-            OSL_ENSHURE( rExc.Context == xLBT->getInterface() &&
+            OSL_ENSURE( rExc.Context == xLBT->getInterface() &&
                          rExc.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...") ),
                          "### unexpected exception content!" );
 
@@ -564,7 +564,7 @@ sal_Bool raiseException( const Reference< XLanguageBindingTest > & xLBT )
     catch (Exception & rExc)
     {
         ++nCount;
-        OSL_ENSHURE( rExc.Context == xLBT->getInterface() &&
+        OSL_ENSURE( rExc.Context == xLBT->getInterface() &&
                      rExc.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...") ),
                      "### unexpected exception content!" );
         return (nCount == 3 &&
@@ -592,7 +592,7 @@ void test_di(void)
 
     Mapping aMapping( pCppEnv1, pCppEnv2, OUString::createFromAscii("prot") );
     aMapping.mapInterface( (void **)&xLBT, xOriginal.get(), ::getCppuType( &xOriginal ) );
-    OSL_ENSHURE( aMapping.is(), "### cannot get mapping!" );
+    OSL_ENSURE( aMapping.is(), "### cannot get mapping!" );
 
     (*pCppEnv2->release)( pCppEnv2 );
     (*pCppEnv1->release)( pCppEnv1 );
diff --git a/cppu/test/testcppu.cxx b/cppu/test/testcppu.cxx
index 3c8b7173937b..b6e154ae99e6 100644
--- a/cppu/test/testcppu.cxx
+++ b/cppu/test/testcppu.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testcppu.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-09 14:25:52 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 13:28:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,13 +115,13 @@ void testCppu()
 {
     {
     // test the size of types
-    OSL_ENSHURE( sizeof( Uik ) == getSize( getCppuType( (Uik *)0) ),
+    OSL_ENSURE( sizeof( Uik ) == getSize( getCppuType( (Uik *)0) ),
                 "bad sizeof uik" );
-    OSL_ENSHURE( sizeof( Test1 ) == getSize( getCppuType( (Test1*)0).getTypeLibType() ),
+    OSL_ENSURE( sizeof( Test1 ) == getSize( getCppuType( (Test1*)0).getTypeLibType() ),
                 "bad sizeof test1" );
-//      OSL_ENSHURE( sizeof( TdTest1 ) == getSize( get_test_TdTest1_Type().getTypeLibType() ),
+//      OSL_ENSURE( sizeof( TdTest1 ) == getSize( get_test_TdTest1_Type().getTypeLibType() ),
 //                  "bad sizeof TypedefTest1" );
-    OSL_ENSHURE( sizeof( Test2 ) == getSize( getCppuType( (Test2*)0).getTypeLibType() ),
+    OSL_ENSURE( sizeof( Test2 ) == getSize( getCppuType( (Test2*)0).getTypeLibType() ),
                 "bad sizeof test2" );
 
 /* find the error
@@ -143,7 +143,7 @@ nPos = (sal_Int32)&((Test3 *)0)->td;
 nPos = (sal_Int32)&((Test3 *)0)->bBool;
 nPos = (sal_Int32)&((Test3 *)0)->aAny;
 */
-    OSL_ENSHURE( sizeof( Test3 ) == getSize( getCppuType( (Test3*)0).getTypeLibType() ),
+    OSL_ENSURE( sizeof( Test3 ) == getSize( getCppuType( (Test3*)0).getTypeLibType() ),
                 "bad sizeof test3" );
     }
 
@@ -712,7 +712,7 @@ void SAL_CALL typedescription_Callback_1
     rtl_uString * pTypeName
 )
 {
-    OSL_ENSHURE( pContext == (void *)1, "### unexpected context!" );
+    OSL_ENSURE( pContext == (void *)1, "### unexpected context!" );
     if( *ppRet )
     {
         typelib_typedescription_release( *ppRet );
@@ -744,7 +744,7 @@ void SAL_CALL typedescription_Callback
     rtl_uString * pTypeName
 )
 {
-    OSL_ENSHURE( pContext == (void *)0, "### unexpected context!" );
+    OSL_ENSURE( pContext == (void *)0, "### unexpected context!" );
     if( *ppRet )
     {
         typelib_typedescription_release( *ppRet );
@@ -886,7 +886,7 @@ int SAL_CALL main(int argc, char **argv)
       // shutdown
 #ifdef SAL_W32
     Reference< XComponent > xComp( xMgr, UNO_QUERY );
-    OSL_ENSHURE( xComp.is(), "### serivce manager has to implement XComponent!" );
+    OSL_ENSURE( xComp.is(), "### serivce manager has to implement XComponent!" );
     xComp->dispose();
     xMgr.clear();
 #endif
diff --git a/cppu/test/testthreadpool.cxx b/cppu/test/testthreadpool.cxx
index 2f2f84499599..6910091dd111 100644
--- a/cppu/test/testthreadpool.cxx
+++ b/cppu/test/testthreadpool.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testthreadpool.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:25:53 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 13:28:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,7 +66,7 @@
 
 #include <vos/thread.hxx>
 
-#define TEST_ENSURE OSL_ENSHURE
+#define TEST_ENSURE OSL_ENSURE
 
 using namespace ::vos;