[Cppunit-cvs] cppunit2/src/cpputtest assertenumtest.cpp,1.2,1.3 assertstringtest.cpp,1.3,1.4 testbasicassertion.cpp,1.6,1.7

[Baptiste L. <bl...@us...>]

Update of /cvsroot/cppunit/cppunit2/src/cpputtest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29264/src/cpputtest

Modified Files:
	assertenumtest.cpp assertstringtest.cpp testbasicassertion.cpp 
Log Message:
* preprocessor portability fix: enclosed all CPPUT_ASSERT_ASSERTION... within double brace to ensure that the tested assertion is used as the first argument of the macro

Index: assertenumtest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/assertenumtest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** assertenumtest.cpp	22 Oct 2004 06:20:06 -0000	1.2
--- assertenumtest.cpp	23 Feb 2005 23:09:29 -0000	1.3
***************
*** 40,62 ****
  AssertEnumTest::testAssertSequenceEqual()
  {
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( vEmpty_ ),
!                                                              CppTL::Enum::container( v123_ ) ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), 
!                                                              CppTL::Enum::container( v321_ ) ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), 
!                                                              CppTL::Enum::container( v122_ ) ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), 
!                                                              CppTL::Enum::container( v4321_ ) ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), 
!                                                              CppTL::Enum::container( v1234_ ) ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v1234_ ), 
!                                                              CppTL::Enum::container( v123_ ) ) );
  
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( vEmpty_ ), 
!                                                              CppTL::Enum::container( vEmpty_ ) ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v122_ ), 
!                                                              CppTL::Enum::container( v122_ ) ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v1234_ ), 
!                                                              CppTL::Enum::container( v1234_ ) ) );
  }
  
--- 40,62 ----
  AssertEnumTest::testAssertSequenceEqual()
  {
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( vEmpty_ ),
!                                                              CppTL::Enum::container( v123_ ) ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), 
!                                                              CppTL::Enum::container( v321_ ) ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), 
!                                                              CppTL::Enum::container( v122_ ) ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), 
!                                                              CppTL::Enum::container( v4321_ ) ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), 
!                                                              CppTL::Enum::container( v1234_ ) ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v1234_ ), 
!                                                              CppTL::Enum::container( v123_ ) ) ));
  
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( vEmpty_ ), 
!                                                              CppTL::Enum::container( vEmpty_ ) ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v122_ ), 
!                                                              CppTL::Enum::container( v122_ ) ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v1234_ ), 
!                                                              CppTL::Enum::container( v1234_ ) ) ));
  }
  
***************
*** 65,80 ****
  AssertEnumTest::testAssertSetEqual()
  {
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( vEmpty_ ),
!                                                         CppTL::Enum::container( v123_ ) ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ),
!                                                         CppTL::Enum::container( vEmpty_ ) ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ),
!                                                         CppTL::Enum::container( v1234_ ) ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ),
!                                                         CppTL::Enum::container( v122_ ) ) );
  
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ),
!                                                         CppTL::Enum::container( v321_ ) ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v4321_ ),
!                                                         CppTL::Enum::container( v1234_ ) ) );
  }
--- 65,80 ----
  AssertEnumTest::testAssertSetEqual()
  {
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( vEmpty_ ),
!                                                         CppTL::Enum::container( v123_ ) ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ),
!                                                         CppTL::Enum::container( vEmpty_ ) ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ),
!                                                         CppTL::Enum::container( v1234_ ) ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ),
!                                                         CppTL::Enum::container( v122_ ) ) ));
  
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ),
!                                                         CppTL::Enum::container( v321_ ) ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v4321_ ),
!                                                         CppTL::Enum::container( v1234_ ) ) ));
  }

Index: assertstringtest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/assertstringtest.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** assertstringtest.cpp	20 Nov 2004 15:07:00 -0000	1.3
--- assertstringtest.cpp	23 Feb 2005 23:09:29 -0000	1.4
***************
*** 50,59 ****
  AssertStringTest::testStringStartsWith()
  {
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_START( "abcdef", "bc" ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_START( "abcdef", "AB" ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_START( "abcdef", "ef" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_START( "abcdef", "ab" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_START( "abcdef", "abcdef" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_START( "abcdef", "" ) );
  }
  
--- 50,59 ----
  AssertStringTest::testStringStartsWith()
  {
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_START( "abcdef", "bc" ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_START( "abcdef", "AB" ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_START( "abcdef", "ef" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_START( "abcdef", "ab" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_START( "abcdef", "abcdef" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_START( "abcdef", "" ) ));
  }
  
***************
*** 62,71 ****
  AssertStringTest::testStringEndsWith()
  {
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_END( "abcdef", "de" ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_END( "abcdef", "EF" ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_END( "abcdef", "ab" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_END( "abcdef", "def" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_END( "abcdef", "abcdef" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_END( "abcdef", "" ) );
  }
  
--- 62,71 ----
  AssertStringTest::testStringEndsWith()
  {
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_END( "abcdef", "de" ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_END( "abcdef", "EF" ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_END( "abcdef", "ab" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_END( "abcdef", "def" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_END( "abcdef", "abcdef" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_END( "abcdef", "" ) ));
  }
  
***************
*** 74,86 ****
  AssertStringTest::testStringContains()
  {
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "fe" ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "BC" ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "abcdefg" ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "0abcdef" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "ab" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "ef" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "cd" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "abcdef" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "" ) );
  }
  
--- 74,86 ----
  AssertStringTest::testStringContains()
  {
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "fe" ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "BC" ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "abcdefg" ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "0abcdef" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "ab" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "ef" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "cd" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "abcdef" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "" ) ));
  }
  
***************
*** 95,109 ****
     // two 'char *' string are different pointers.
  
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( "abcdef", "ABCDEF" ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( "ABCDEF", "abcdef" ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( "abcdef", "abcde" ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( "abcdef", "def" ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( "abcdef", "" ) );
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( "", "abcdef" ) );
  
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_EQUAL( "abcdef", duplicate ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_EQUAL( "abcdef", abcdef ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_EQUAL( abcdef, "abcdef" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_EQUAL( "", std::string() ) );
  }
  
--- 95,109 ----
     // two 'char *' string are different pointers.
  
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( "abcdef", "ABCDEF" ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( "ABCDEF", "abcdef" ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( "abcdef", "abcde" ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( "abcdef", "def" ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( "abcdef", "" ) ));
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( "", "abcdef" ) ));
  
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_EQUAL( "abcdef", duplicate ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_EQUAL( "abcdef", abcdef ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_EQUAL( abcdef, "abcdef" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_EQUAL( "", std::string() ) ));
  }
  
***************
*** 115,129 ****
     std::string abcdef( "abcdef" );
  
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( abcdefWrap, "def" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_EQUAL( abcdef, abcdefWrap ) );
  
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_START( abcdefWrap, "ef" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_START( abcdefWrap, "ab" ) );
  
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_END( abcdefWrap, "ab" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_END( abcdefWrap, "def" ) );
  
!    CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_CONTAIN( abcdefWrap, "0abcdef" ) );
!    CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_CONTAIN( abcdefWrap, "ab" ) );
  }
  
--- 115,129 ----
     std::string abcdef( "abcdef" );
  
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( abcdefWrap, "def" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_EQUAL( abcdef, abcdefWrap ) ));
  
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_START( abcdefWrap, "ef" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_START( abcdefWrap, "ab" ) ));
  
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_END( abcdefWrap, "ab" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_END( abcdefWrap, "def" ) ));
  
!    CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_CONTAIN( abcdefWrap, "0abcdef" ) ));
!    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( abcdefWrap, "ab" ) ));
  }
  

Index: testbasicassertion.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testbasicassertion.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** testbasicassertion.cpp	23 Feb 2005 21:42:59 -0000	1.6
--- testbasicassertion.cpp	23 Feb 2005 23:09:29 -0000	1.7
***************
*** 81,114 ****
     {
        // CPPUT_ASSERT
!       CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT( true ) );
!       CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT( false ) );
  
!       CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT( true, "should pass" ) );
!       CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT( false, 
!          "should throw AbortingAssertionException"  ) );
  
!       CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_EXPR( true ) );
!       CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_EXPR( false ) );
  
        // CPPUT_ASSERT_FALSE
!       CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_FALSE( false ) );
!       CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_FALSE( true ) );
  
!       CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_FALSE( false, "should pass" ) );
!       CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_FALSE( true, 
!          "should throw AbortingAssertionException"  ) );
  
!       CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_EXPR_FALSE( false ) );
!       CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_EXPR_FALSE( true ) );
  
        // CPPUT_ASSERT_EQUAL
!       CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_EQUAL( 1234567, 1234567 ) );
!       CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_EQUAL( 1234567, 456 ) );
  
!       CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_EQUAL( 1234567, 1234567, "should pass" ) );
!       CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_EQUAL( 1234567, 456, "should fail"  ) );
  
!       CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_EQUAL( std::string("abc"), "abc" ) );
!       CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_EQUAL( "def", std::string("abc") ) );
  
        // @todo: should we support this? Stringize a type without linkage
--- 81,114 ----
     {
        // CPPUT_ASSERT
!       CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT( true ) ));
!       CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT( false ) ));
  
!       CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT( true, "should pass" ) ));
!       CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT( false, 
!          "should throw AbortingAssertionException"  ) ));
  
!       CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_EXPR( true ) ));
!       CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_EXPR( false ) ));
  
        // CPPUT_ASSERT_FALSE
!       CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_FALSE( false ) ));
!       CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_FALSE( true ) ));
  
!       CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_FALSE( false, "should pass" ) ));
!       CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_FALSE( true, 
!          "should throw AbortingAssertionException"  ) ));
  
!       CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_EXPR_FALSE( false ) ));
!       CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_EXPR_FALSE( true ) ));
  
        // CPPUT_ASSERT_EQUAL
!       CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_EQUAL( 1234567, 1234567 ) ));
!       CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_EQUAL( 1234567, 456 ) ));
  
!       CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_EQUAL( 1234567, 1234567, "should pass" ) ));
!       CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_EQUAL( 1234567, 456, "should fail"  ) ));
  
!       CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_EQUAL( std::string("abc"), "abc" ) ));
!       CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_EQUAL( "def", std::string("abc") ) ));
  
        // @todo: should we support this? Stringize a type without linkage
***************
*** 117,128 ****
  
        // CPPUT_ASSERT_NOT_EQUAL
!       CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_NOT_EQUAL( 1234567, 456 ) );
!       CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_NOT_EQUAL( 1234567, 1234567 ) );
  
!       CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_NOT_EQUAL( 1234567, 456, "should pass" ) );
!       CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_NOT_EQUAL( 1234567, 1234567, "should fail"  ) );
  
!       CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_NOT_EQUAL( std::string("abc"), "def" ) );
!       CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_NOT_EQUAL( "abc", std::string("abc") ) );
     }
     catch ( CppUT::AbortingAssertionException &e )
--- 117,128 ----
  
        // CPPUT_ASSERT_NOT_EQUAL
!       CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_NOT_EQUAL( 1234567, 456 ) ));
!       CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_NOT_EQUAL( 1234567, 1234567 ) ));
  
!       CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_NOT_EQUAL( 1234567, 456, "should pass" ) ));
!       CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_NOT_EQUAL( 1234567, 1234567, "should fail"  ) ));
  
!       CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_NOT_EQUAL( std::string("abc"), "def" ) ));
!       CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_NOT_EQUAL( "abc", std::string("abc") ) ));
     }
     catch ( CppUT::AbortingAssertionException &e )