Modified: openoffice/trunk/main/cppu/qa/test_recursion.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/qa/test_recursion.cxx?rev=1700093&r1=1700092&r2=1700093&view=diff
==============================================================================
--- openoffice/trunk/main/cppu/qa/test_recursion.cxx (original)
+++ openoffice/trunk/main/cppu/qa/test_recursion.cxx Sun Aug 30 08:26:13 2015
@@ -24,30 +24,21 @@
 #include "precompiled_cppu.hxx"
 #include "sal/config.h"
 
-#include "testshl/simpleheader.hxx"
 #include "sal/types.h"
 
 #include "Rec.hpp"
+#include "gtest/gtest.h"
 
 namespace
 {
 
-class Test: public CppUnit::TestFixture {
+class Test: public ::testing::Test {
 
 public:
-    void testRecursion();
-
-    CPPUNIT_TEST_SUITE(Test);
-    CPPUNIT_TEST(testRecursion);
-    CPPUNIT_TEST_SUITE_END();
 };
 
-void Test::testRecursion() {
-    CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), Rec().x.getLength());
+TEST_F(Test, testRecursion) {
+    ASSERT_EQ(static_cast< sal_Int32 >(0), Rec().x.getLength());
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "tests");
-
 }
-
-NOADDITIONAL;

Modified: openoffice/trunk/main/cppu/qa/test_reference.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/qa/test_reference.cxx?rev=1700093&r1=1700092&r2=1700093&view=diff
==============================================================================
--- openoffice/trunk/main/cppu/qa/test_reference.cxx (original)
+++ openoffice/trunk/main/cppu/qa/test_reference.cxx Sun Aug 30 08:26:13 2015
@@ -28,9 +28,9 @@
 
 #include "Interface1.hpp"
 
-#include "testshl/simpleheader.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
+#include "gtest/gtest.h"
 
 namespace
 {
@@ -91,18 +91,13 @@ private:
     oslInterlockedCount m_refCount;
 };
 
-class Test: public ::CppUnit::TestFixture
+class Test: public ::testing::Test
 {
 
 public:
-    void testUnoSetThrow();
-
-    CPPUNIT_TEST_SUITE(Test);
-    CPPUNIT_TEST(testUnoSetThrow);
-    CPPUNIT_TEST_SUITE_END();
 };
 
-void Test::testUnoSetThrow()
+TEST_F(Test, testUnoSetThrow)
 {
     Reference< Interface1 > xNull;
     Reference< Interface1 > xFoo( new Foo );
@@ -110,43 +105,39 @@ void Test::testUnoSetThrow()
     // ctor taking Reference< interface_type >
     bool bCaughtException = false;
     try { Reference< Interface1 > x( xNull, UNO_SET_THROW ); (void)x; } catch( 
const RuntimeException& ) { bCaughtException = true; }
-    CPPUNIT_ASSERT_EQUAL( true, bCaughtException );
+    ASSERT_EQ( true, bCaughtException );
 
     bCaughtException = false;
     try { Reference< Interface1 > x( xFoo, UNO_SET_THROW ); (void)x; } catch( 
const RuntimeException& ) { bCaughtException = true; }
-    CPPUNIT_ASSERT_EQUAL( false, bCaughtException );
+    ASSERT_EQ( false, bCaughtException );
 
     // ctor taking interface_type*
     bCaughtException = false;
     try { Reference< Interface1 > x( xNull.get(), UNO_SET_THROW ); (void)x; } 
catch( const RuntimeException& ) { bCaughtException = true; }
-    CPPUNIT_ASSERT_EQUAL( true, bCaughtException );
+    ASSERT_EQ( true, bCaughtException );
 
     bCaughtException = false;
     try { Reference< Interface1 > x( xFoo.get(), UNO_SET_THROW ); (void)x; } 
catch( const RuntimeException& ) { bCaughtException = true; }
-    CPPUNIT_ASSERT_EQUAL( false, bCaughtException );
+    ASSERT_EQ( false, bCaughtException );
 
     Reference< Interface1 > x;
     // "set" taking Reference< interface_type >
     bCaughtException = false;
     try { x.set( xNull, UNO_SET_THROW ); } catch( const RuntimeException& ) { 
bCaughtException = true; }
-    CPPUNIT_ASSERT_EQUAL( true, bCaughtException );
+    ASSERT_EQ( true, bCaughtException );
 
     bCaughtException = false;
     try { x.set( xFoo, UNO_SET_THROW ); } catch( const RuntimeException& ) { 
bCaughtException = true; }
-    CPPUNIT_ASSERT_EQUAL( false, bCaughtException );
+    ASSERT_EQ( false, bCaughtException );
 
     // "set" taking interface_type*
     bCaughtException = false;
     try { x.set( xNull.get(), UNO_SET_THROW ); } catch( const 
RuntimeException& ) { bCaughtException = true; }
-    CPPUNIT_ASSERT_EQUAL( true, bCaughtException );
+    ASSERT_EQ( true, bCaughtException );
 
     bCaughtException = false;
     try { x.set( xFoo.get(), UNO_SET_THROW ); } catch( const RuntimeException& 
) { bCaughtException = true; }
-    CPPUNIT_ASSERT_EQUAL( false, bCaughtException );
+    ASSERT_EQ( false, bCaughtException );
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
-
 }   // namespace
-
-NOADDITIONAL;

Modified: openoffice/trunk/main/cppu/qa/test_unotype.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/qa/test_unotype.cxx?rev=1700093&r1=1700092&r2=1700093&view=diff
==============================================================================
--- openoffice/trunk/main/cppu/qa/test_unotype.cxx (original)
+++ openoffice/trunk/main/cppu/qa/test_unotype.cxx Sun Aug 30 08:26:13 2015
@@ -40,10 +40,10 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppu/unotype.hxx"
-#include "testshl/simpleheader.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
+#include "gtest/gtest.h"
 
 namespace com { namespace sun { namespace star { namespace uno {
     class Any;
@@ -65,474 +65,463 @@ struct DerivedInterface1: css::uno::XInt
 
 struct DerivedInterface2: css::uno::XComponentContext {};
 
-class Test: public ::CppUnit::TestFixture {
+class Test: public ::testing::Test {
 public:
-    void testUnoType();
-
-    void testGetTypeFavourUnsigned();
-
-    void testGetTypeFavourChar();
-
-    CPPUNIT_TEST_SUITE(Test);
-    CPPUNIT_TEST(testUnoType);
-    CPPUNIT_TEST(testGetTypeFavourUnsigned);
-    CPPUNIT_TEST(testGetTypeFavourChar);
-    CPPUNIT_TEST_SUITE_END();
 };
 
-void Test::testUnoType() {
+TEST_F(Test, testUnoType) {
     css::uno::Type t;
     t = ::cppu::UnoType< ::cppu::UnoVoidType >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_VOID, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_VOID, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void")), t.getTypeName());
     t = ::cppu::UnoType< bool >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_BOOLEAN, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_BOOLEAN, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")),
         t.getTypeName());
-    CPPUNIT_ASSERT(::cppu::UnoType< ::sal_Bool >::get() == t);
+    ASSERT_TRUE(::cppu::UnoType< ::sal_Bool >::get() == t);
     t = ::cppu::UnoType< ::sal_Int8 >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_BYTE, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_BYTE, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("byte")), t.getTypeName());
     t = ::cppu::UnoType< ::sal_Int16 >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SHORT, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_SHORT, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("short")), 
t.getTypeName());
     t = ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_UNSIGNED_SHORT, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_UNSIGNED_SHORT, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")),
         t.getTypeName());
     t = ::cppu::UnoType< ::sal_Int32 >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_LONG, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_LONG, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("long")), t.getTypeName());
     t = ::cppu::UnoType< ::sal_uInt32 >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_UNSIGNED_LONG, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_UNSIGNED_LONG, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")),
         t.getTypeName());
     t = ::cppu::UnoType< ::sal_Int64 >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_HYPER, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_HYPER, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hyper")), 
t.getTypeName());
     t = ::cppu::UnoType< ::sal_uInt64 >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_UNSIGNED_HYPER, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_UNSIGNED_HYPER, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned hyper")),
         t.getTypeName());
     t = ::cppu::UnoType< float >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_FLOAT, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_FLOAT, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("float")), 
t.getTypeName());
     t = ::cppu::UnoType< double >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_DOUBLE, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_DOUBLE, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("double")),
         t.getTypeName());
     t = ::cppu::UnoType< ::cppu::UnoCharType >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_CHAR, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_CHAR, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("char")), t.getTypeName());
     t = ::cppu::UnoType< ::rtl::OUString >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_STRING, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_STRING, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("string")),
         t.getTypeName());
     t = ::cppu::UnoType< css::uno::Type >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_TYPE, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_TYPE, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("type")), t.getTypeName());
     t = ::cppu::UnoType< css::uno::Any >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_ANY, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_ANY, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any")), t.getTypeName());
     t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::sal_Int8 > >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]byte")),
         t.getTypeName());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::UnoType< css::uno::Sequence< ::sal_Int8 > >::get() == t);
     t = ::cppu::UnoType<
         ::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]unsigned short")),
         t.getTypeName());
     t = ::cppu::UnoType<
         ::cppu::UnoSequenceType< ::cppu::UnoCharType > >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]char")),
         t.getTypeName());
     t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
         ::sal_Int8 > > >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]byte")),
         t.getTypeName());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::UnoType<
         css::uno::Sequence< css::uno::Sequence< ::sal_Int8 > > >::get() == t);
     t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
         ::cppu::UnoUnsignedShortType > > >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]unsigned short")),
         t.getTypeName());
     t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
         ::cppu::UnoCharType > > >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]char")),
         t.getTypeName());
     t = ::cppu::UnoType< css::uno::TypeClass >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_ENUM, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_ENUM, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(
             RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.TypeClass")),
         t.getTypeName());
     t = ::cppu::UnoType< css::lang::EventObject >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_STRUCT, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_STRUCT, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(
             RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.EventObject")),
         t.getTypeName());
-    CPPUNIT_ASSERT(::cppu::UnoType< DerivedStruct1 >::get() == t);
+    ASSERT_TRUE(::cppu::UnoType< DerivedStruct1 >::get() == t);
     t = ::cppu::UnoType< css::beans::PropertyChangeEvent >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_STRUCT, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_STRUCT, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(
             RTL_CONSTASCII_USTRINGPARAM(
                 "com.sun.star.beans.PropertyChangeEvent")),
         t.getTypeName());
 #if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity 
stated
-    CPPUNIT_ASSERT(::cppu::UnoType< DerivedStruct2 >::get() == t);
+    ASSERT_TRUE(::cppu::UnoType< DerivedStruct2 >::get() == t);
 #endif
     t = ::cppu::UnoType< css::beans::Optional< ::sal_Int8 > >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_STRUCT, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_STRUCT, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(
             RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Optional<byte>")),
         t.getTypeName());
     t = ::cppu::UnoType< css::uno::Exception >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_EXCEPTION, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_EXCEPTION, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(
             RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception")),
         t.getTypeName());
-    CPPUNIT_ASSERT(::cppu::UnoType< DerivedException1 >::get() == t);
+    ASSERT_TRUE(::cppu::UnoType< DerivedException1 >::get() == t);
     t = ::cppu::UnoType< css::uno::RuntimeException >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_EXCEPTION, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_EXCEPTION, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(
             RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException")),
         t.getTypeName());
 #if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity 
stated
-    CPPUNIT_ASSERT(::cppu::UnoType< DerivedException2 >::get() == t);
+    ASSERT_TRUE(::cppu::UnoType< DerivedException2 >::get() == t);
 #endif
     t = ::cppu::UnoType< css::uno::XInterface >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_INTERFACE, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_INTERFACE, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(
             RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface")),
         t.getTypeName());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::UnoType< css::uno::Reference< css::uno::XInterface > >::get() 
==
         t);
-    CPPUNIT_ASSERT(::cppu::UnoType< DerivedInterface1 >::get() == t);
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(::cppu::UnoType< DerivedInterface1 >::get() == t);
+    ASSERT_TRUE(
         ::cppu::UnoType< css::uno::Reference< DerivedInterface1 > >::get() ==
         t);
     t = ::cppu::UnoType< css::uno::XComponentContext >::get();
-    CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_INTERFACE, t.getTypeClass());
-    CPPUNIT_ASSERT_EQUAL(
+    ASSERT_EQ(css::uno::TypeClass_INTERFACE, t.getTypeClass());
+    ASSERT_EQ(
         ::rtl::OUString(
             RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XComponentContext")),
         t.getTypeName());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::UnoType<
         css::uno::Reference< css::uno::XComponentContext > >::get() == t);
 #if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity 
stated
-    CPPUNIT_ASSERT(::cppu::UnoType< DerivedInterface2 >::get() == t);
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(::cppu::UnoType< DerivedInterface2 >::get() == t);
+    ASSERT_TRUE(
         ::cppu::UnoType< css::uno::Reference< DerivedInterface2 > >::get() ==
         t);
 #endif
 }
 
-void Test::testGetTypeFavourUnsigned() {
-    CPPUNIT_ASSERT(typeid(::sal_Unicode) == typeid(::sal_uInt16));
-    CPPUNIT_ASSERT(
+TEST_F(Test, testGetTypeFavourUnsigned) {
+    ASSERT_TRUE(typeid(::sal_Unicode) == typeid(::sal_uInt16));
+    ASSERT_TRUE(
         ::getCppuType(static_cast< ::sal_Unicode * >(0)) ==
         ::getCppuType(static_cast< ::sal_uInt16 * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< ::cppu::UnoVoidType * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoVoidType >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< bool * >(0)) ==
         ::cppu::UnoType< bool >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< bool * >(0)) ==
         ::getCppuType(static_cast< bool * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_Bool * >(0)) ==
         ::cppu::UnoType< bool >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_Bool * >(0)) ==
         ::getCppuType(static_cast< ::sal_Bool * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int8 * >(0)) ==
         ::cppu::UnoType< ::sal_Int8 >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int8 * >(0)) ==
         ::getCppuType(static_cast< ::sal_Int8 * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int16 * >(0)) ==
         ::cppu::UnoType< ::sal_Int16 >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int16 * >(0)) ==
         ::getCppuType(static_cast< ::sal_Int16 * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< ::cppu::UnoUnsignedShortType * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_uInt16 * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_uInt16 * >(0)) ==
         ::getCppuType(static_cast< ::sal_uInt16 * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int32 * >(0)) ==
         ::cppu::UnoType< ::sal_Int32 >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int32 * >(0)) ==
         ::getCppuType(static_cast< ::sal_Int32 * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_uInt32 * >(0)) ==
         ::cppu::UnoType< ::sal_uInt32 >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_uInt32 * >(0)) ==
         ::getCppuType(static_cast< ::sal_uInt32 * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int64 * >(0)) ==
         ::cppu::UnoType< ::sal_Int64 >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_Int64 * >(0)) ==
         ::getCppuType(static_cast< ::sal_Int64 * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_uInt64 * >(0)) ==
         ::cppu::UnoType< ::sal_uInt64 >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_uInt64 * >(0)) ==
         ::getCppuType(static_cast< ::sal_uInt64 * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< float * >(0)) ==
         ::cppu::UnoType< float >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< float * >(0)) ==
         ::getCppuType(static_cast< float * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< double * >(0)) ==
         ::cppu::UnoType< double >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< double * >(0)) ==
         ::getCppuType(static_cast< double * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< ::cppu::UnoCharType * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoCharType >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_Unicode * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::sal_Unicode * >(0)) ==
         ::getCppuType(static_cast< ::sal_Unicode * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::rtl::OUString * >(0)) ==
         ::cppu::UnoType< ::rtl::OUString >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< ::rtl::OUString * >(0)) ==
         ::getCppuType(static_cast< ::rtl::OUString * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< css::uno::Type * >(0)) ==
         ::cppu::UnoType< css::uno::Type >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< css::uno::Type * >(0)) ==
         ::getCppuType(static_cast< css::uno::Type * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< css::uno::Any * >(0)) ==
         ::cppu::UnoType< css::uno::Any >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< css::uno::Any * >(0)) ==
         ::getCppuType(static_cast< css::uno::Any * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast<
             ::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > * >(0)) ==
         ::cppu::UnoType<
         ::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Sequence< ::sal_uInt16 > * >(0)) ==
         ::cppu::UnoType<
         ::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Sequence< ::sal_uInt16 > * >(0)) ==
         ::getCppuType(static_cast< css::uno::Sequence< ::sal_uInt16 > * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
             ::cppu::UnoUnsignedShortType > > * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
         ::cppu::UnoUnsignedShortType > > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Sequence< css::uno::Sequence<
             ::sal_uInt16 > > * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
         ::cppu::UnoUnsignedShortType > > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Sequence< css::uno::Sequence<
             ::sal_uInt16 > > * >(0)) ==
         ::getCppuType(
             static_cast< css::uno::Sequence< css::uno::Sequence<
             ::sal_uInt16 > > * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Sequence< ::sal_Unicode > * >(0)) ==
         ::cppu::UnoType<
         ::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Sequence< ::sal_Unicode > * >(0)) ==
         ::getCppuType(static_cast< css::uno::Sequence< ::sal_Unicode > * 
>(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Sequence< css::uno::Sequence<
             ::sal_Unicode > > * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
         ::cppu::UnoUnsignedShortType > > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Sequence< css::uno::Sequence<
             ::sal_Unicode > > * >(0)) ==
         ::getCppuType(
             static_cast< css::uno::Sequence< css::uno::Sequence<
             ::sal_Unicode > > * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::TypeClass * >(0)) ==
         ::cppu::UnoType< css::uno::TypeClass >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::TypeClass * >(0)) ==
         ::getCppuType(static_cast< css::uno::TypeClass * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::lang::EventObject * >(0)) ==
         ::cppu::UnoType< css::lang::EventObject >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::lang::EventObject * >(0)) ==
         ::getCppuType(static_cast< css::lang::EventObject * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< DerivedStruct1 * >(0)) ==
         ::cppu::UnoType< css::lang::EventObject >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< DerivedStruct1 * >(0)) ==
         ::getCppuType(static_cast< DerivedStruct1 * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::beans::PropertyChangeEvent * >(0)) ==
         ::cppu::UnoType< css::beans::PropertyChangeEvent >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::beans::PropertyChangeEvent * >(0)) ==
         ::getCppuType(static_cast< css::beans::PropertyChangeEvent * >(0)));
 #if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity 
stated
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< DerivedStruct2 * >(0)) ==
         ::cppu::UnoType< css::beans::PropertyChangeEvent >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< DerivedStruct2 * >(0)) ==
         ::getCppuType(static_cast< DerivedStruct2 * >(0)));
 #endif
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::beans::Optional< ::sal_Int8 > * >(0)) ==
         ::cppu::UnoType< css::beans::Optional< ::sal_Int8 > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::beans::Optional< ::sal_Int8 > * >(0)) ==
         ::getCppuType(static_cast< css::beans::Optional< ::sal_Int8 > * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Exception * >(0)) ==
         ::cppu::UnoType< css::uno::Exception >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Exception * >(0)) ==
         ::getCppuType(static_cast< css::uno::Exception * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< DerivedException1 * >(0)) ==
         ::cppu::UnoType< css::uno::Exception >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< DerivedException1 * >(0)) ==
         ::getCppuType(static_cast< DerivedException1 * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::RuntimeException * >(0)) ==
         ::cppu::UnoType< css::uno::RuntimeException >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::RuntimeException * >(0)) ==
         ::getCppuType(static_cast< css::uno::RuntimeException * >(0)));
 #if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity 
stated
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< DerivedException2 * >(0)) ==
         ::cppu::UnoType< css::uno::RuntimeException >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< DerivedException2 * >(0)) ==
         ::getCppuType(static_cast< DerivedException2 * >(0)));
 #endif
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::XInterface * >(0)) ==
         ::cppu::UnoType< css::uno::XInterface >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Reference< css::uno::XInterface > * >(0)) ==
         ::cppu::UnoType< css::uno::XInterface >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Reference< css::uno::XInterface > * >(0)) ==
         ::getCppuType(
             static_cast< css::uno::Reference< css::uno::XInterface > * >(0)));
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< DerivedInterface1 * >(0)) ==
         ::cppu::UnoType< css::uno::XInterface >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Reference< DerivedInterface1 > * >(0)) ==
         ::cppu::UnoType< css::uno::XInterface >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::XComponentContext * >(0)) ==
         ::cppu::UnoType< css::uno::XComponentContext >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast<
             css::uno::Reference< css::uno::XComponentContext > * >(0)) ==
         ::cppu::UnoType< css::uno::XComponentContext >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast<
             css::uno::Reference< css::uno::XComponentContext > * >(0)) ==
@@ -540,269 +529,266 @@ void Test::testGetTypeFavourUnsigned() {
             static_cast<
             css::uno::Reference< css::uno::XComponentContext > * >(0)));
 #if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity 
stated
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(static_cast< DerivedInterface2 * >(0)) ==
         ::cppu::UnoType< css::uno::XComponentContext >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourUnsigned(
             static_cast< css::uno::Reference< DerivedInterface2 > * >(0)) ==
         ::cppu::UnoType< css::uno::XComponentContext >::get());
 #endif
 }
 
-void Test::testGetTypeFavourChar() {
-    CPPUNIT_ASSERT(typeid(::sal_Unicode) == typeid(::sal_uInt16));
-    CPPUNIT_ASSERT(
+TEST_F(Test, testGetTypeFavourChar) {
+    ASSERT_TRUE(typeid(::sal_Unicode) == typeid(::sal_uInt16));
+    ASSERT_TRUE(
         ::getCppuType< ::sal_Unicode >() == ::getCppuType< ::sal_uInt16 >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::cppu::UnoVoidType * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoVoidType >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< bool * >(0)) ==
         ::cppu::UnoType< bool >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< bool * >(0)) ==
         ::getCppuType< bool >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_Bool * >(0)) ==
         ::cppu::UnoType< bool >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_Bool * >(0)) ==
         ::getCppuType< ::sal_Bool >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_Int8 * >(0)) ==
         ::cppu::UnoType< ::sal_Int8 >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_Int8 * >(0)) ==
         ::getCppuType< ::sal_Int8 >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_Int16 * >(0)) ==
         ::cppu::UnoType< ::sal_Int16 >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_Int16 * >(0)) ==
         ::getCppuType< ::sal_Int16 >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< ::cppu::UnoUnsignedShortType * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_uInt16 * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoCharType >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_Int32 * >(0)) ==
         ::cppu::UnoType< ::sal_Int32 >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_Int32 * >(0)) ==
         ::getCppuType< ::sal_Int32 >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_uInt32 * >(0)) ==
         ::cppu::UnoType< ::sal_uInt32 >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_uInt32 * >(0)) ==
         ::getCppuType< ::sal_uInt32 >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_Int64 * >(0)) ==
         ::cppu::UnoType< ::sal_Int64 >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_Int64 * >(0)) ==
         ::getCppuType< ::sal_Int64 >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_uInt64 * >(0)) ==
         ::cppu::UnoType< ::sal_uInt64 >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_uInt64 * >(0)) ==
         ::getCppuType< ::sal_uInt64 >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< float * >(0)) ==
         ::cppu::UnoType< float >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< float * >(0)) ==
         ::getCppuType< float >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< double * >(0)) ==
         ::cppu::UnoType< double >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< double * >(0)) ==
         ::getCppuType< double >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::cppu::UnoCharType * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoCharType >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_Unicode * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoCharType >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::sal_Unicode * >(0)) ==
         ::getCppuType< ::sal_Unicode >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::rtl::OUString * >(0)) ==
         ::cppu::UnoType< ::rtl::OUString >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< ::rtl::OUString * >(0)) ==
         ::getCppuType< ::rtl::OUString >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< css::uno::Type * >(0)) ==
         ::cppu::UnoType< css::uno::Type >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< css::uno::Type * >(0)) ==
         ::getCppuType< css::uno::Type >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< css::uno::Any * >(0)) ==
         ::cppu::UnoType< css::uno::Any >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< css::uno::Any * >(0)) ==
         ::getCppuType< css::uno::Any >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast<
             ::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > * >(0)) ==
         ::cppu::UnoType<
         ::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::uno::Sequence< ::sal_uInt16 > * >(0)) ==
         ::cppu::UnoType<
         ::cppu::UnoSequenceType< ::cppu::UnoCharType > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
             ::cppu::UnoUnsignedShortType > > * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
         ::cppu::UnoUnsignedShortType > > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::uno::Sequence< css::uno::Sequence<
             ::sal_uInt16 > > * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
         ::cppu::UnoCharType > > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::uno::Sequence< ::sal_Unicode > * >(0)) ==
         ::cppu::UnoType<
         ::cppu::UnoSequenceType< ::cppu::UnoCharType > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::uno::Sequence< css::uno::Sequence<
             ::sal_Unicode > > * >(0)) ==
         ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
         ::cppu::UnoCharType > > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< css::uno::TypeClass * >(0)) ==
         ::cppu::UnoType< css::uno::TypeClass >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< css::uno::TypeClass * >(0)) ==
         ::getCppuType< css::uno::TypeClass >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::lang::EventObject * >(0)) ==
         ::cppu::UnoType< css::lang::EventObject >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::lang::EventObject * >(0)) ==
         ::getCppuType< css::lang::EventObject >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< DerivedStruct1 * >(0)) ==
         ::cppu::UnoType< css::lang::EventObject >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< DerivedStruct1 * >(0)) ==
         ::getCppuType< DerivedStruct1 >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::beans::PropertyChangeEvent * >(0)) ==
         ::cppu::UnoType< css::beans::PropertyChangeEvent >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::beans::PropertyChangeEvent * >(0)) ==
         ::getCppuType< css::beans::PropertyChangeEvent >());
 #if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity 
stated
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< DerivedStruct2 * >(0)) ==
         ::cppu::UnoType< css::beans::PropertyChangeEvent >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< DerivedStruct2 * >(0)) ==
         ::getCppuType< DerivedStruct2 >());
 #endif
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::beans::Optional< ::sal_Int8 > * >(0)) ==
         ::cppu::UnoType< css::beans::Optional< ::sal_Int8 > >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::beans::Optional< ::sal_Int8 > * >(0)) ==
         ::getCppuType< css::beans::Optional< ::sal_Int8 > >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< css::uno::Exception * >(0)) ==
         ::cppu::UnoType< css::uno::Exception >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< css::uno::Exception * >(0)) ==
         ::getCppuType< css::uno::Exception >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< DerivedException1 * >(0)) ==
         ::cppu::UnoType< css::uno::Exception >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< DerivedException1 * >(0)) ==
         ::getCppuType< DerivedException1 >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::uno::RuntimeException * >(0)) ==
         ::cppu::UnoType< css::uno::RuntimeException >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::uno::RuntimeException * >(0)) ==
         ::getCppuType< css::uno::RuntimeException >());
 #if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity 
stated
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< DerivedException2 * >(0)) ==
         ::cppu::UnoType< css::uno::RuntimeException >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< DerivedException2 * >(0)) ==
         ::getCppuType< DerivedException2 >());
 #endif
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::uno::XInterface * >(0)) ==
         ::cppu::UnoType< css::uno::XInterface >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::uno::Reference< css::uno::XInterface > * >(0)) ==
         ::cppu::UnoType< css::uno::XInterface >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::uno::Reference< css::uno::XInterface > * >(0)) ==
         ::getCppuType< css::uno::Reference< css::uno::XInterface > >());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< DerivedInterface1 * >(0)) ==
         ::cppu::UnoType< css::uno::XInterface >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::uno::Reference< DerivedInterface1 > * >(0)) ==
         ::cppu::UnoType< css::uno::XInterface >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::uno::XComponentContext * >(0)) ==
         ::cppu::UnoType< css::uno::XComponentContext >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast<
             css::uno::Reference< css::uno::XComponentContext > * >(0)) ==
         ::cppu::UnoType< css::uno::XComponentContext >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast<
             css::uno::Reference< css::uno::XComponentContext > * >(0)) ==
         ::getCppuType< css::uno::Reference< css::uno::XComponentContext > >());
 #if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity 
stated
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(static_cast< DerivedInterface2 * >(0)) ==
         ::cppu::UnoType< css::uno::XComponentContext >::get());
-    CPPUNIT_ASSERT(
+    ASSERT_TRUE(
         ::cppu::getTypeFavourChar(
             static_cast< css::uno::Reference< DerivedInterface2 > * >(0)) ==
         ::cppu::UnoType< css::uno::XComponentContext >::get());
 #endif
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
 
 }
-
-NOADDITIONAL;


Reply via email to