[Cppunit-cvs] cppunit2/src/cpputtest main.cpp,1.8,1.9 registrytest.h,1.2,1.3 testfixturetest.cpp,1.3,1.4 testfixturetest.h,1.3,1.4 testfunctor.cpp,1.3,1.4 testtestcase.cpp,1.4,1.5

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

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

Modified Files:
	main.cpp registrytest.h testfixturetest.cpp testfixturetest.h 
	testfunctor.cpp testtestcase.cpp 
Log Message:
* moved CppUT::SmartPtr to CppTL::SharedPtr
* moved CppUT::AtomicCounter to CppTL::AtomicCounter and inlined implementation

Index: testfixturetest.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testfixturetest.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** testfixturetest.h	3 Aug 2004 22:20:03 -0000	1.3
--- testfixturetest.h	17 Nov 2004 08:59:34 -0000	1.4
***************
*** 23,27 ****
  
  private:
!    static void addTest( const CppUT::SmartPtr<TestFixtureTest> &fixture,
                          void (TestFixtureTest::*testMethod)(), 
                          const char *testName,
--- 23,27 ----
  
  private:
!    static void addTest( const CppTL::SharedPtr<TestFixtureTest> &fixture,
                          void (TestFixtureTest::*testMethod)(), 
                          const char *testName,

Index: registrytest.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/registrytest.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** registrytest.h	27 Jan 2004 23:37:22 -0000	1.2
--- registrytest.h	17 Nov 2004 08:59:34 -0000	1.3
***************
*** 2,6 ****
   #define CPPUT_REGISTRYTEST_H_INCLUDED
  
! # include <cpput/smartptr.h>
  # include <cpput/assert.h>
  # include <cpput/testfixture.h>
--- 2,6 ----
   #define CPPUT_REGISTRYTEST_H_INCLUDED
  
! # include <cpptl/sharedptr.h>
  # include <cpput/assert.h>
  # include <cpput/testfixture.h>
***************
*** 40,44 ****
     std::set<std::string> testNames_;
  
!    CppUT::SmartPtr<CppUT::Registry> registry_;
  };
  
--- 40,44 ----
     std::set<std::string> testNames_;
  
!    CppTL::SharedPtr<CppUT::Registry> registry_;
  };
  

Index: main.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/main.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** main.cpp	15 Nov 2004 08:39:20 -0000	1.8
--- main.cpp	17 Nov 2004 08:59:34 -0000	1.9
***************
*** 98,102 ****
     CppUT::TestRunner runner;
     CppUT::AbstractTestSuitePtr rootSuite = 
!       CppUT::staticPointerCast<CppUT::AbstractTestSuite>( allSuite );
     runner.setRootSuite( rootSuite );
  
--- 98,102 ----
     CppUT::TestRunner runner;
     CppUT::AbstractTestSuitePtr rootSuite = 
!       CppTL::staticPointerCast<CppUT::AbstractTestSuite>( allSuite );
     runner.setRootSuite( rootSuite );
  

Index: testfixturetest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testfixturetest.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** testfixturetest.cpp	3 Aug 2004 22:20:03 -0000	1.3
--- testfixturetest.cpp	17 Nov 2004 08:59:34 -0000	1.4
***************
*** 121,125 ****
  {
     CppUT::TestSuitePtr suite( CppUT::makeTestSuite( "TestFixtureTest" ) );
!    CppUT::SmartPtr<TestFixtureTest> fixture( new TestFixtureTest() );
  
     addTest( fixture, &TestFixtureTest::testEmptySuite, 
--- 121,125 ----
  {
     CppUT::TestSuitePtr suite( CppUT::makeTestSuite( "TestFixtureTest" ) );
!    CppTL::SharedPtr<TestFixtureTest> fixture( new TestFixtureTest() );
  
     addTest( fixture, &TestFixtureTest::testEmptySuite, 
***************
*** 141,145 ****
  
  void 
! TestFixtureTest::addTest( const CppUT::SmartPtr<TestFixtureTest> &fixture,
                            void (TestFixtureTest::*testMethod)(), 
                            const char *testName,
--- 141,145 ----
  
  void 
! TestFixtureTest::addTest( const CppTL::SharedPtr<TestFixtureTest> &fixture,
                            void (TestFixtureTest::*testMethod)(), 
                            const char *testName,

Index: testtestcase.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testtestcase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** testtestcase.cpp	4 Aug 2004 08:01:15 -0000	1.4
--- testtestcase.cpp	17 Nov 2004 08:59:34 -0000	1.5
***************
*** 44,48 ****
  };
  
! typedef CppUT::SmartPtr<TestTestCaseFixture> TestTestCaseFixturePtr;
  
  
--- 44,48 ----
  };
  
! typedef CppTL::SharedPtr<TestTestCaseFixture> TestTestCaseFixturePtr;
  
  

Index: testfunctor.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testfunctor.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** testfunctor.cpp	4 Aug 2004 08:01:15 -0000	1.3
--- testfunctor.cpp	17 Nov 2004 08:59:34 -0000	1.4
***************
*** 76,80 ****
     CPPUT_ASSERT( callbackCalled, "Functor() did not call functor object." );
  
!    CppUT::SmartPtr<HelperObject> helper( new HelperObject() );
     helper->flag_ = false;
     fn = CppUT::makeMemFn0( helper, &HelperObject::setFlagOn );
--- 76,80 ----
     CPPUT_ASSERT( callbackCalled, "Functor() did not call functor object." );
  
!    CppTL::SharedPtr<HelperObject> helper( new HelperObject() );
     helper->flag_ = false;
     fn = CppUT::makeMemFn0( helper, &HelperObject::setFlagOn );
***************
*** 98,102 ****
     CPPUT_ASSERT_FALSE( callbackCalled, "Functor1(false) did not call C function." );
  
!    CppUT::SmartPtr<HelperObject> helper( new HelperObject() );
     helper->flag_ = false;
     fn = CppUT::makeMemFn1( helper, &HelperObject::setFlag );
--- 98,102 ----
     CPPUT_ASSERT_FALSE( callbackCalled, "Functor1(false) did not call C function." );
  
!    CppTL::SharedPtr<HelperObject> helper( new HelperObject() );
     helper->flag_ = false;
     fn = CppUT::makeMemFn1( helper, &HelperObject::setFlag );