cppunit-cvs

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

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

Modified Files:
	enumeratortest.cpp 
Log Message:
* added CPPUT_ASSERT_DOUBLES_EQUAL and CPPUT_CHECK_DOUBLES_EQUAL

Index: enumeratortest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/enumeratortest.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** enumeratortest.cpp	23 Feb 2005 23:10:22 -0000	1.7
--- enumeratortest.cpp	6 Sep 2005 07:17:36 -0000	1.8
***************
*** 55,69 ****
        double v2 = 23.0 / divider;
        double v3 = 34.0 / divider;
        CPPUT_ASSERT_EXPR( e.is_open() );
!       CPPUT_ASSERT_EQUAL( v1, e.current() );
!       CPPUT_ASSERT_EQUAL( v1, *e );
!       CPPUT_ASSERT_EQUAL( v1, e.next() );
        CPPUT_ASSERT_EXPR( e.is_open() );
!       CPPUT_ASSERT_EQUAL( v2, e.current() );
!       CPPUT_ASSERT_EQUAL( v2, *e++ );
        CPPUT_ASSERT_EXPR( e.is_open() );
!       CPPUT_ASSERT_EQUAL( v3, e.current() );
!       CPPUT_ASSERT_EQUAL( v3, *e );
!       CPPUT_ASSERT_EQUAL( v3, e.next() );
        checkHasNoMoreElements( e );
     }
--- 55,70 ----
        double v2 = 23.0 / divider;
        double v3 = 34.0 / divider;
+       const double tolerance = 0.000001;
        CPPUT_ASSERT_EXPR( e.is_open() );
!       CPPUT_ASSERT_DOUBLE_EQUAL( v1, e.current(), tolerance );
!       CPPUT_ASSERT_DOUBLE_EQUAL( v1, *e, tolerance );
!       CPPUT_ASSERT_DOUBLE_EQUAL( v1, e.next(), tolerance );
        CPPUT_ASSERT_EXPR( e.is_open() );
!       CPPUT_ASSERT_DOUBLE_EQUAL( v2, e.current(), tolerance );
!       CPPUT_ASSERT_DOUBLE_EQUAL( v2, *e++, tolerance );
        CPPUT_ASSERT_EXPR( e.is_open() );
!       CPPUT_ASSERT_DOUBLE_EQUAL( v3, e.current(), tolerance );
!       CPPUT_ASSERT_DOUBLE_EQUAL( v3, *e, tolerance );
!       CPPUT_ASSERT_DOUBLE_EQUAL( v3, e.next(), tolerance );
        checkHasNoMoreElements( e );
     }