[Cppunit-cvs] cppunit2/src/cpput testinfo.cpp,1.8,1.9

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

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

Modified Files:
	testinfo.cpp 
Log Message:
* newAssertion() now takes the assertion type and location as parameter
* added checking assertion macros

Index: testinfo.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/testinfo.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** testinfo.cpp	27 Feb 2005 10:17:05 -0000	1.8
--- testinfo.cpp	1 Mar 2005 19:36:51 -0000	1.9
***************
*** 155,161 ****
     }
  
!    void newAssertion()
     {
        data().newAssertion();
     }
  
--- 155,166 ----
     }
  
!    void newAssertion( AssertionType type,
!                       const char *fileName,
!                       unsigned int lineNumber,
!                       const char *functionName )
     {
        data().newAssertion();
+       data().assertionType_ = type;
+       data().assertionLocation_ = CompactLocation( fileName, functionName, lineNumber );
     }
  
***************
*** 170,180 ****
     }
  
-    void setAssertionLocation( const char *fileName,
-                               unsigned int lineNumber,
-                               const char *functionName )
-    {
-       data().assertionLocation_ = CompactLocation( fileName, functionName, lineNumber );
-    }
- 
     OpenTest::Properties &currentAssertion()
     {
--- 175,178 ----