cppunit-cvs

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

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

Modified Files:
	testbasicassertion.cpp testexceptionguard.cpp testfunctor.cpp 
	testtestcase.cpp testtestsuite.cpp 
Log Message:
* Replaced function in namespace TestInfo by exposing the TestInfoData class and renaming it TestInfo. TestInfo in now an exposed per thread singleton.
* startNewTest() is now called from TestCase::runTest() instead of being the test runner responsability. There still a few call to this method in cpput bootstrap test (which use assertion without run a test case).


Index: testbasicassertion.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testbasicassertion.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** testbasicassertion.cpp	27 Feb 2005 16:50:35 -0000	1.9
--- testbasicassertion.cpp	10 Aug 2005 21:34:29 -0000	1.10
***************
*** 6,10 ****
  static bool testAssertThrow()
  {
!    CppUT::TestInfo::startNewTest();
     try
     {
--- 6,10 ----
  static bool testAssertThrow()
  {
!    CppUT::TestInfo::threadInstance().startNewTest();
     try
     {
***************
*** 17,21 ****
     }
  
!    CppUT::TestInfo::startNewTest();
     try
     {
--- 17,21 ----
     }
  
!    CppUT::TestInfo::threadInstance().startNewTest();
     try
     {
***************
*** 34,38 ****
  static bool testAssertNoThrow()
  {
!    CppUT::TestInfo::startNewTest();
     try
     {
--- 34,38 ----
  static bool testAssertNoThrow()
  {
!    CppUT::TestInfo::threadInstance().startNewTest();
     try
     {
***************
*** 46,50 ****
     }
  
!    CppUT::TestInfo::startNewTest();
     try
     {
--- 46,50 ----
     }
  
!    CppUT::TestInfo::threadInstance().startNewTest();
     try
     {
***************
*** 77,81 ****
        return false;
  
!    CppUT::TestInfo::startNewTest();
     try
     {
--- 77,81 ----
        return false;
  
!    CppUT::TestInfo::threadInstance().startNewTest();
     try
     {

Index: testtestsuite.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testtestsuite.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** testtestsuite.cpp	27 Feb 2005 16:50:36 -0000	1.8
--- testtestsuite.cpp	10 Aug 2005 21:34:29 -0000	1.9
***************
*** 33,37 ****
     try
     {     
!       CppUT::TestInfo::startNewTest();
        MockTestVisitor visitor;
        CppUT::TestSuitePtr suite1 = CppUT::makeTestSuite( "Suite 1" );
--- 33,37 ----
     try
     {     
!       CppUT::TestInfo::threadInstance().startNewTest();
        MockTestVisitor visitor;
        CppUT::TestSuitePtr suite1 = CppUT::makeTestSuite( "Suite 1" );

Index: testtestcase.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testtestcase.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** testtestcase.cpp	20 Jul 2005 21:06:51 -0000	1.16
--- testtestcase.cpp	10 Aug 2005 21:34:29 -0000	1.17
***************
*** 235,239 ****
     try
     {     
!       CppUT::TestInfo::startNewTest();
        testCaseSimpleRun();
        testCaseSetUpRunTearDown();
--- 235,239 ----
     try
     {     
!       CppUT::TestInfo::threadInstance().startNewTest();
        testCaseSimpleRun();
        testCaseSetUpRunTearDown();

Index: testexceptionguard.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testexceptionguard.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** testexceptionguard.cpp	28 Feb 2005 20:43:02 -0000	1.1
--- testexceptionguard.cpp	10 Aug 2005 21:34:29 -0000	1.2
***************
*** 112,116 ****
     try
     {
-       CppUT::TestInfo::startNewTest();
        testExceptionGuardRunFunctor();
        testExceptionGuardCatchStandardException();
--- 112,115 ----

Index: testfunctor.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testfunctor.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** testfunctor.cpp	27 Feb 2005 16:50:36 -0000	1.10
--- testfunctor.cpp	10 Aug 2005 21:34:29 -0000	1.11
***************
*** 230,234 ****
     try
     {
!       CppUT::TestInfo::startNewTest();
        testFunctor();
        testFunctor1();
--- 230,234 ----
     try
     {
!       CppUT::TestInfo::threadInstance().startNewTest();
        testFunctor();
        testFunctor1();