cppunit-cvs — cvs commits

[Cppunit-cvs] cppunit2/include/cpptl forwards.h,1.7,1.8

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

Update of /cvsroot/cppunit/cppunit2/include/cpptl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12567

Modified Files:
	forwards.h 
Log Message:
- Added any.h to forwards.

Index: forwards.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/forwards.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** forwards.h	5 Jun 2006 12:02:56 -0000	1.7
--- forwards.h	13 Jul 2008 08:09:52 -0000	1.8
***************
*** 6,9 ****
--- 6,13 ----
  namespace CppTL {
  
+ // any.h
+ class Any;
+ class AnyBadCast;
+ 
  // atomiccounter.h
  class AtomicCounter;

[Cppunit-cvs] cppunit2/include/cpptl typetraits.h, 1.2, 1.3 value.h, 1.1, 1.2

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

Update of /cvsroot/cppunit/cppunit2/include/cpptl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11051/include/cpptl

Modified Files:
	typetraits.h value.h 
Log Message:
- Fixed bug in Registry::remove() when a suite had multiple child suites.
- Added Registry suite removal tests

Index: value.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/value.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** value.h	19 Aug 2007 20:13:24 -0000	1.1
--- value.h	8 Jul 2008 20:42:00 -0000	1.2
***************
*** 2,5 ****
--- 2,6 ----
  # define CPPTL_VALUE_H_INCLUDED
  # include "forwards.h"
+ # include "typetraits.h"
  
  
***************
*** 14,17 ****
--- 15,45 ----
    - conversion between type (int, uint, const char *, std::string...)
    - type comparison
+ 
+ Implemented:
+ - framework to expose any service for Value
+ - framework for comparison
+ 
+ To do:
+ - type identification, comparison and hashing
+ - type to string
+ - conversion
+ 
+ To think:
+ - pointer and cast support
+ - smart-pointer ? Notes: requires dynamic allocation of target object
+ 
+ About type identification:
+ - we already force the creation of a static to identify type.
+ - it can be used to replace type_info and all its bug & portability issues.
+ - but still need to be able to identify that two types are similar
+ Problems:
+ dll / static linking:
+ type info are not shared. Solution: use a single registry held in a dll.
+ thread-safe registration:
+ static variable stored in getValueType is a pointer on type in the registry.
+ ValueType is copied by value in the registry ensuring a single pointer is always returned.
+ Registry is synchronized to ensure type safety.
+ 
+ 
  */
  
***************
*** 19,22 ****
--- 47,52 ----
  
  class Value;
+ class ValueType;
+ class ValueTypeRegistry;
  
  // //////////////////////////////////////////////////////////////////
***************
*** 259,264 ****
  
     template<class T>
!    inline const ValueType &getValueTypeSelector( const ValueType &valueType, 
!                                                  const Type<T> &type )
     {
        return valueType;
--- 289,294 ----
  
     template<class T>
!    inline const ValueType &getValueTypeHelper( const ValueType &valueType, 
!                                                const Type<T> &type )
     {
        return valueType;
***************
*** 268,272 ****
     inline const ValueType &getValueTypeSelector( const Type<T> &type )
     {
!       return getValueTypeHelper( getValueType(), type );
     }
  
--- 298,302 ----
     inline const ValueType &getValueTypeSelector( const Type<T> &type )
     {
!       return getValueTypeHelper( getValueType(type), type );
     }
  
***************
*** 335,340 ****
  
  /// Allocate DataType dynamically.
! template<typename DataType,const bool>
! class StorageHelper
  {
  public:
--- 365,370 ----
  
  /// Allocate DataType dynamically.
! template<typename DataType>
! class LargeTypeStorageHelper
  {
  public:
***************
*** 368,372 ****
  /// Store DataType in string buffer if it fit in.
  template<typename DataType>
! class StorageHelper<DataType,true> 
  {
  public:
--- 398,402 ----
  /// Store DataType in string buffer if it fit in.
  template<typename DataType>
! class SmallTypeStorageHelper
  {
  public:
***************
*** 402,410 ****
  /// Select storage strategy depending on size of DataType.
  template<typename DataType>
! class Storage
  {
  public:
!    typedef StorageHelper<DataType, bool(sizeof(DataType) <= sizeof(ValueDataBuffer))>
!               result_type;
  };
  
--- 432,442 ----
  /// Select storage strategy depending on size of DataType.
  template<typename DataType>
! class StoragePolicySelector
  {
  public:
!    typedef CPPTL_TYPENAME IfType<LargeTypeStorageHelper<DataType>
!                                 ,SmallTypeStorageHelper<DataType>
!                                 ,(sizeof(DataType) > sizeof(ValueDataBuffer)) 
!                                 >::type type;
  };
  
***************
*** 415,425 ****
  public:
     typedef CommonLifeCycle<DataType> SelfType;
!    typedef CPPTL_TYPENAME Storage<DataType>::result_type Storage;
  
     static void registerFunctions( ValueType &type )
     {
!       type.initialize_ = &Storage::initialize;
!       type.clone_ = &Storage::clone;
!       type.destroy_ = &Storage::destroy;
     }
  };
--- 447,457 ----
  public:
     typedef CommonLifeCycle<DataType> SelfType;
!    typedef CPPTL_TYPENAME StoragePolicySelector<DataType>::type StoragePolicy;
  
     static void registerFunctions( ValueType &type )
     {
!       type.initialize_ = &StoragePolicy::initialize;
!       type.clone_ = &StoragePolicy::clone;
!       type.destroy_ = &StoragePolicy::destroy;
     }
  };
***************
*** 434,438 ****
  public:
     typedef Compare<DataType> SelfType;
!    typedef CPPTL_TYPENAME Storage<DataType>::result_type Storage;
  
     static void registerFunctions( ValueType &type )
--- 466,470 ----
  public:
     typedef Compare<DataType> SelfType;
!    typedef CPPTL_TYPENAME StoragePolicySelector<DataType>::type StoragePolicy;
  
     static void registerFunctions( ValueType &type )
***************
*** 445,450 ****
     static int compare( const Value &aData, const Value &bData, bool &canCompare )
     {
!       const DataType &a = Storage::data(aData);
!       const DataType &b = Storage::data(bData);
        if ( a < b )
           return -1;
--- 477,482 ----
     static int compare( const Value &aData, const Value &bData, bool &canCompare )
     {
!       const DataType &a = StoragePolicy::data(aData);
!       const DataType &b = StoragePolicy::data(bData);
        if ( a < b )
           return -1;
***************
*** 456,461 ****
     static bool less( const Value &aData, const Value &bData, bool &canCompare )
     {
!       const DataType &a = Storage::data(aData);
!       const DataType &b = Storage::data(bData);
        return a < b;
     }
--- 488,493 ----
     static bool less( const Value &aData, const Value &bData, bool &canCompare )
     {
!       const DataType &a = StoragePolicy::data(aData);
!       const DataType &b = StoragePolicy::data(bData);
        return a < b;
     }
***************
*** 463,468 ****
     static bool equal( const Value &aData, const Value &bData, bool &canCompare )
     {
!       const DataType &a = Storage::data(aData);
!       const DataType &b = Storage::data(bData);
        return a == b;
     }
--- 495,500 ----
     static bool equal( const Value &aData, const Value &bData, bool &canCompare )
     {
!       const DataType &a = StoragePolicy::data(aData);
!       const DataType &b = StoragePolicy::data(bData);
        return a == b;
     }
***************
*** 477,481 ****
  public:
     typedef Compare<DataType> SelfType;
!    typedef CPPTL_TYPENAME Storage<DataType>::result_type Storage;
  
     static void registerFunctions( ValueType &type )
--- 509,513 ----
  public:
     typedef Compare<DataType> SelfType;
!    typedef CPPTL_TYPENAME StoragePolicySelector<DataType>::type StoragePolicy;
  
     static void registerFunctions( ValueType &type )
***************
*** 488,493 ****
     static int compare( const Value &aData, const Value &bData, bool &canCompare )
     {
!       const DataType &a = Storage::data(aData);
!       const DataType &b = Storage::data(bData);
        if ( a < b )
           return -1;
--- 520,525 ----
     static int compare( const Value &aData, const Value &bData, bool &canCompare )
     {
!       const DataType &a = StoragePolicy::data(aData);
!       const DataType &b = StoragePolicy::data(bData);
        if ( a < b )
           return -1;
***************
*** 499,504 ****
     static bool less( const Value &aData, const Value &bData, bool &canCompare )
     {
!       const DataType &a = Storage::data(aData);
!       const DataType &b = Storage::data(bData);
        return a < b;
     }
--- 531,536 ----
     static bool less( const Value &aData, const Value &bData, bool &canCompare )
     {
!       const DataType &a = StoragePolicy::data(aData);
!       const DataType &b = StoragePolicy::data(bData);
        return a < b;
     }
***************
*** 506,511 ****
     static bool equal( const Value &aData, const Value &bData, bool &canCompare )
     {
!       const DataType &a = Storage::data(aData);
!       const DataType &b = Storage::data(bData);
        return (a < b)  &&  !(b < a);
     }
--- 538,543 ----
     static bool equal( const Value &aData, const Value &bData, bool &canCompare )
     {
!       const DataType &a = StoragePolicy::data(aData);
!       const DataType &b = StoragePolicy::data(bData);
        return (a < b)  &&  !(b < a);
     }

Index: typetraits.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/typetraits.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** typetraits.h	28 Feb 2005 20:36:34 -0000	1.2
--- typetraits.h	8 Jul 2008 20:42:00 -0000	1.3
***************
*** 4,27 ****
  # include <cpptl/forwards.h>
  
  namespace CppTL
  {
  
! template<class T>
! struct RemoveConst
! {
!    typedef T type;
! };
  
! #if !defined( CPPTL_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
  
- template<class T>
- struct RemoveConst<const T>
- {
-    typedef T type;
- };
  
- #endif
  
  
  } // namespace CppTL
  
--- 4,90 ----
  # include <cpptl/forwards.h>
  
+ // @todo move this to a header dedicated to basic generic programming technics
+ 
+ 
  namespace CppTL
  {
  
!    /** Remove const prefix of a type.
!     * \Warning Older compiler such as VC 6.0 do not allow implementation of
!     *          this feature. Const will not be removed on such platform.
!     */
!    template<class T>
!    struct RemoveConst
!    {
!       typedef T type;
!    };
  
!    #if !defined( CPPTL_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
! 
!    template<class T>
!    struct RemoveConst<const T>
!    {
!       typedef T type;
!    };
! 
!    #endif
  
  
  
  
+ 
+ 
+    //@todo BooleanType should be moved to a simple generic programming header.
+    template<const bool isTrue>
+    struct BooleanType
+    {
+    };
+ 
+    typedef BooleanType<false> FalseType;
+    typedef BooleanType<true> TrueType;
+ 
+ 
+ 
+ 
+ #if !defined(CPPTL_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+    /** Returns type A if true, type B otherwise.
+     * \c true case, returns A
+     * \code
+     * CppTL::IfType< LargeTypePolicy,SmallTypePolicy,sizeof(T) > 128 >
+     * \endcode
+     */
+    template<typename A, typename B, const bool condition>
+    struct IfType
+    {
+       typedef A type;
+    };
+ 
+    /// Returns type A if true, type B otherwise.
+    /// \c false case, returns B
+    template<typename A, typename B>
+    struct IfType<A,B,false>
+    {
+       typedef B type;
+    };
+ #else // work-around lack of template partial specialization using template member
+    /// Returns type A if true, type B otherwise
+    template<typename A, typename B, const bool condition>
+    struct IfType
+    {
+       template<const bool condition>
+       struct Selector
+       {
+          typedef A type;
+       };
+       template<>
+       struct Selector<false>
+       {
+          typedef B type;
+       };
+ 
+       typedef CPPTL_TYPENAME Selector<condition>::type type;
+    };
+ #endif
+ 
  } // namespace CppTL
  

[Cppunit-cvs] cppunit2/src/cpputtest registrytest.cpp, 1.5, 1.6 registrytest.h, 1.6, 1.7

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

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

Modified Files:
	registrytest.cpp registrytest.h 
Log Message:
- Fixed bug in Registry::remove() when a suite had multiple child suites.
- Added Registry suite removal tests

Index: registrytest.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/registrytest.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** registrytest.h	13 Nov 2005 10:12:01 -0000	1.6
--- registrytest.h	8 Jul 2008 20:42:00 -0000	1.7
***************
*** 16,20 ****
     CPPUT_TEST( testAddTestToDefault );
     CPPUT_TEST( testAddTestToNamed );
!    CPPUT_TEST( testAddChild );
     CPPUT_TEST( testStaticRegistration );
     CPPUT_TESTSUITE_END();
--- 16,21 ----
     CPPUT_TEST( testAddTestToDefault );
     CPPUT_TEST( testAddTestToNamed );
!    CPPUT_TEST( testAddAndRemoveChild );
!    CPPUT_TEST( testAutoRemoveByTestFactoryId );
     CPPUT_TEST( testStaticRegistration );
     CPPUT_TESTSUITE_END();
***************
*** 30,34 ****
     void testAddTestToNamed();
  
!    void testAddChild();
  
     void testStaticRegistration();
--- 31,37 ----
     void testAddTestToNamed();
  
!    void testAddAndRemoveChild();
! 
!    void testAutoRemoveByTestFactoryId();
  
     void testStaticRegistration();

Index: registrytest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/registrytest.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** registrytest.cpp	8 Nov 2005 23:25:31 -0000	1.5
--- registrytest.cpp	8 Jul 2008 20:42:00 -0000	1.6
***************
*** 96,100 ****
  
  void 
! RegistryTest::testAddChild()
  {
     registry_->add( "Name", makeTestFactory( "Test1" ) );
--- 96,100 ----
  
  void 
! RegistryTest::testAddAndRemoveChild()
  {
     registry_->add( "Name", makeTestFactory( "Test1" ) );
***************
*** 104,109 ****
     registry_->addChild( "Name", "Name2" );
     registry_->addChild( "Name", "Name3" );
-    CppUT::TestSuitePtr suite = registry_->createTests( "Name" );
  
     runTestSuite( suite );
     CPPUT_ASSERT_EQUAL( 1, testNames_.count( "Test1" ) );
--- 104,110 ----
     registry_->addChild( "Name", "Name2" );
     registry_->addChild( "Name", "Name3" );
  
+    // Checks that all tests are correctly executed
+    CppUT::TestSuitePtr suite = registry_->createTests( "Name" );
     runTestSuite( suite );
     CPPUT_ASSERT_EQUAL( 1, testNames_.count( "Test1" ) );
***************
*** 111,114 ****
--- 112,194 ----
     CPPUT_ASSERT_EQUAL( 1, testNames_.count( "Test3" ) );
     CPPUT_ASSERT_EQUAL( 1, testNames_.count( "Test4" ) );
+ 
+    // Checks that dynamic removal of child suite works
+    CPPUT_ASSERT_FALSE( registry_->removeChild( "Name", "ChildSuiteDoesNotExist" ) );
+    CPPUT_ASSERT( registry_->removeChild( "Name", "Name3" ) );
+    CPPUT_ASSERT( registry_->removeChild( "Name", "Name2" ) );
+    CPPUT_ASSERT_FALSE( registry_->removeChild( "Name", "ChildSuiteDoesNotExist" ) );
+ 
+    // Checks that child suite were actual removed
+    testNames_.clear();
+    CppUT::TestSuitePtr newSuite = registry_->createTests( "Name" );
+    runTestSuite( newSuite );
+    CPPUT_ASSERT_EQUAL( 1, testNames_.count( "Test1" ) );
+    CPPUT_ASSERT_EQUAL( 1, testNames_.count( "Test2" ) );
+    CPPUT_ASSERT_EQUAL( 0, testNames_.count( "Test3" ) );
+    CPPUT_ASSERT_EQUAL( 0, testNames_.count( "Test4" ) );
+ }
+ 
+ 
+ void 
+ RegistryTest::testAutoRemoveByTestFactoryId()
+ {
+    // @todo
+    // Register test in the static registry and checks that they are correctly removed
+    typedef CppUT::SuiteRegisterer<MockNamableFixture> SuiteAutoRegisterer;
+    {
+       SuiteAutoRegisterer r1( "TestRegister1" );
+       SuiteAutoRegisterer r2( "TestRegister2" );
+       SuiteAutoRegisterer r3( CppUT::Impl::RegisterToNamedSuiteTag(),
+                               "ParentTestRegister1", 
+                               "TestRegister2" );
+       SuiteAutoRegisterer r4( CppUT::Impl::RegisterToNamedSuiteTag(),
+                               "ParentTestRegister1", 
+                               "TestRegister3" );
+       SuiteAutoRegisterer r5( CppUT::Impl::RegisterToNamedSuiteTag(),
+                               "ParentTestRegister2", 
+                               "TestRegister4" );
+ 
+       CppUT::SuiteRelationshipRegisterer rs1( "ParentTestRegister1" );
+       CppUT::SuiteRelationshipRegisterer rs2( "ParentTestRegister1", "ParentTestRegister2" );
+       // We have the following tree:
+       // Default Suite
+       // |- TestRegister1
+       // |- TestRegister2
+       // |- ParentTestRegister1
+       // |  |- TestRegister2
+       // |  |- TestRegister3
+       // |  |- ParentTestRegister2
+       // |     |- TestRegister4
+       // |- other statically registered test for testStaticRegistration()
+ 
+       CppUT::TestSuitePtr defaultSuite = CppUT::Registry::instance().createDefaultTests();
+       CPPUT_CHECK_EXPR( containsTestNamed( defaultSuite, "TestRegister1" ) );
+       CPPUT_CHECK_EXPR( containsTestNamed( defaultSuite, "TestRegister2" ) );
+       CPPUT_CHECK_EXPR( containsTestNamed( defaultSuite, "ParentTestRegister1" ) );
+ 
+       CppUT::TestSuitePtr parentSuite1 = CppUT::Registry::instance().createTests("ParentTestRegister1");
+       CPPUT_CHECK_EXPR( containsTestNamed( parentSuite1, "TestRegister2" ) );
+       CPPUT_CHECK_EXPR( containsTestNamed( parentSuite1, "TestRegister3" ) );
+       CPPUT_CHECK_EXPR( containsTestNamed( parentSuite1, "ParentTestRegister2" ) );
+ 
+       CppUT::TestSuitePtr parentSuite2 = CppUT::Registry::instance().createTests("ParentTestRegister2");
+       CPPUT_CHECK_EXPR( containsTestNamed( parentSuite2, "TestRegister4" ) );
+ 
+    }
+    // Checks that the registered suite have been removed
+    CppUT::TestSuitePtr defaultSuite = CppUT::Registry::instance().createDefaultTests();
+    CPPUT_CHECK_EXPR_FALSE( containsTestNamed( defaultSuite, "TestRegister1" ) );
+    CPPUT_CHECK_EXPR_FALSE( containsTestNamed( defaultSuite, "TestRegister2" ) );
+    CPPUT_CHECK_EXPR_FALSE( containsTestNamed( defaultSuite, "ParentTestRegister1" ) );
+ 
+    // Notes: calling createTests will automatically create an unparented suite of the
+    // specified name if it does not exist.
+    CppUT::TestSuitePtr parentSuite1 = CppUT::Registry::instance().createTests("ParentTestRegister1");
+    CPPUT_CHECK_EXPR_FALSE( containsTestNamed( parentSuite1, "TestRegister2" ) );
+    CPPUT_CHECK_EXPR_FALSE( containsTestNamed( parentSuite1, "TestRegister3" ) );
+    CPPUT_CHECK_EXPR_FALSE( containsTestNamed( parentSuite1, "ParentTestRegister2" ) );
+ 
+    CppUT::TestSuitePtr parentSuite2 = CppUT::Registry::instance().createTests("ParentTestRegister2");
+    CPPUT_CHECK_EXPR_FALSE( containsTestNamed( parentSuite2, "TestRegister4" ) );
  }
  

[Cppunit-cvs] cppunit2/doc cpput_todo.dox,1.5,1.6

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

Update of /cvsroot/cppunit/cppunit2/doc
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11051/doc

Modified Files:
	cpput_todo.dox 
Log Message:
- Fixed bug in Registry::remove() when a suite had multiple child suites.
- Added Registry suite removal tests

Index: cpput_todo.dox
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/doc/cpput_todo.dox,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cpput_todo.dox	16 Aug 2007 15:51:04 -0000	1.5
--- cpput_todo.dox	8 Jul 2008 20:42:00 -0000	1.6
***************
*** 344,346 ****
--- 344,351 ----
  	Provides a feature to automatically parent orphan test suite in the Registry, to either
  	the default test suite or a specific test suite.
+ 
+ \section todo_implicit_string_conversion Add support for type with implicit conversion to const char *
+ 	String assertion currently to not support type that can be implicitly converter
+ 	to const char * such as CppTL::Formatter.
+ 	Nice to have, need to figure out if it is possible to implement it.
  */
\ No newline at end of file

[Cppunit-cvs] cppunit2/src/cpput registry.cpp,1.6,1.7

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

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

Modified Files:
	registry.cpp 
Log Message:
- Fixed bug in Registry::remove() when a suite had multiple child suites.
- Added Registry suite removal tests

Index: registry.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/registry.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** registry.cpp	15 Aug 2007 11:20:57 -0000	1.6
--- registry.cpp	8 Jul 2008 20:42:00 -0000	1.7
***************
*** 76,82 ****
  {
     ParentChildRelationShips::iterator it = relations_.find( parentSuiteName );
!    while ( it != relations_.end()  &&  it->first == parentSuiteName )
     {
!       if ( it->second == childSuiteName )
        {
           relations_.erase( it );
--- 76,83 ----
  {
     ParentChildRelationShips::iterator it = relations_.find( parentSuiteName );
!    for ( ; it != relations_.end()  &&  it->first == parentSuiteName; ++it )
     {
!       const CppTL::ConstString &currentChildName = it->second;
!       if ( currentChildName == childSuiteName )
        {
           relations_.erase( it );

[Cppunit-cvs] cppunit2 sconstruct,1.35,1.36

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

Update of /cvsroot/cppunit/cppunit2
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11051

Modified Files:
	sconstruct 
Log Message:
- Fixed bug in Registry::remove() when a suite had multiple child suites.
- Added Registry suite removal tests

Index: sconstruct
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/sconstruct,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** sconstruct	16 Aug 2007 15:51:04 -0000	1.35
--- sconstruct	8 Jul 2008 20:42:00 -0000	1.36
***************
*** 23,27 ****
                          'Platform (compiler/stl) used to build the project',
                          'msvc71',
!                         allowed_values='suncc vacpp mingw msvc6 msvc7 msvc71 msvc80 linux-gcc'.split(),
                          ignorecase=2) )
  
--- 23,27 ----
                          'Platform (compiler/stl) used to build the project',
                          'msvc71',
!                         allowed_values='suncc vacpp mingw msvc6 msvc7 msvc71 msvc80 msvc90 linux-gcc'.split(),
                          ignorecase=2) )
  
***************
*** 86,89 ****
--- 86,94 ----
          env.Tool( tool )
      env['CXXFLAGS']='-GR -EHsc /nologo'
+ elif platform == 'msvc90':
+     env['MSVS_VERSION']='9.0'
+     for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
+         env.Tool( tool )
+     env['CXXFLAGS']='-GR -EHsc /nologo'
  elif platform == 'mingw':
      env.Tool( 'mingw' )

[Cppunit-cvs] cppunit2/makefiles/vs71 cpput_test.vcproj,1.4,1.5

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

Update of /cvsroot/cppunit/cppunit2/makefiles/vs71
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18614

Modified Files:
	cpput_test.vcproj 
Log Message:
* Added missing source file to project.

Index: cpput_test.vcproj
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/makefiles/vs71/cpput_test.vcproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cpput_test.vcproj	5 Jun 2006 12:02:56 -0000	1.4
--- cpput_test.vcproj	26 Jun 2008 16:28:05 -0000	1.5
***************
*** 250,253 ****
--- 250,259 ----
  			RelativePath="..\..\src\cpputtest\testtestsuite.cpp">
  		</File>
+ 		<File
+ 			RelativePath="..\..\src\cpputtest\valuetest.cpp">
+ 		</File>
+ 		<File
+ 			RelativePath="..\..\src\cpputtest\valuetest.h">
+ 		</File>
  	</Files>
  	<Globals>

[Cppunit-cvs] cppunit2/src/cpput lighttestrunner.cpp,1.12,1.13

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

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

Modified Files:
	lighttestrunner.cpp 
Log Message:
* Number of failed assertions and number of assertions made (non-aborting & aborting) is now displayed as each test run. This give a good idea when a test fail and has a large number of checking assertions how many of them are failing...

Index: lighttestrunner.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/lighttestrunner.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** lighttestrunner.cpp	11 Nov 2005 20:54:15 -0000	1.12
--- lighttestrunner.cpp	26 Jun 2008 16:27:19 -0000	1.13
***************
*** 109,117 ****
     }
  
     if ( testStatus.ignoredFailureCount() > 0 )
     {
        std::string count = CppTL::toString( testStatus.ignoredFailureCount() ).c_str();
!       status += " (" + count + " ignored failures)";
     }
  
     fprintf( stdout, "%s\n", status.c_str() );
--- 109,131 ----
     }
  
+    int assertionCount = testStatus.assertionCount();
+    status += " (";
+    unsigned int failedAssertionCount = testStatus.failedAssertionCount();
+    if ( failedAssertionCount > 0 )
+    {
+       std::string count = CppTL::toString( failedAssertionCount ).c_str();
+       status += count + (failedAssertionCount > 1 ? " assertions failed/" 
+                                                     : " assertion failed/");
+    }
+ 
+    status += CppTL::toString( assertionCount ).c_str();
+    status += (assertionCount > 1 ? " assertions" : " assertion" );
+ 
     if ( testStatus.ignoredFailureCount() > 0 )
     {
        std::string count = CppTL::toString( testStatus.ignoredFailureCount() ).c_str();
!       status += ", " + count + " ignored failures";
     }
+    status += ")";
  
     fprintf( stdout, "%s\n", status.c_str() );

[Cppunit-cvs] cppunit2/src/cpputtest assertstringtest.cpp,1.7,1.8

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

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

Modified Files:
	assertstringtest.cpp 
Log Message:
* Added check version of string assertions

Index: assertstringtest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/assertstringtest.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** assertstringtest.cpp	14 Aug 2007 17:30:52 -0000	1.7
--- assertstringtest.cpp	26 Jun 2008 16:24:11 -0000	1.8
***************
*** 61,64 ****
--- 61,66 ----
     CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_START( "abcdef", "abcdef" ) ));
     CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_START( "abcdef", "" ) ));
+ 
+    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_CHECKSTR_START( "abcdef", "ab" ) ));
  }
  
***************
*** 73,76 ****
--- 75,80 ----
     CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_END( "abcdef", "abcdef" ) ));
     CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_END( "abcdef", "" ) ));
+ 
+    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_CHECKSTR_END( "abcdef", "def" ) ));
  }
  
***************
*** 88,91 ****
--- 92,97 ----
     CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "abcdef" ) ));
     CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "" ) ));
+ 
+    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_CHECKSTR_CONTAIN( "abcdef", "cd" ) ));
  }
  
***************
*** 111,114 ****
--- 117,122 ----
     CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_EQUAL( abcdef, "abcdef" ) ));
     CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_EQUAL( "", std::string() ) ));
+ 
+    CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_CHECKSTR_EQUAL( "abcdef", abcdef ) ));
  }
  

[Cppunit-cvs] cppunit2/include/cpput assertstring.h,1.6,1.7

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

Update of /cvsroot/cppunit/cppunit2/include/cpput
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17220/include/cpput

Modified Files:
	assertstring.h 
Log Message:
* Added check version of string assertions

Index: assertstring.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpput/assertstring.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** assertstring.h	14 Aug 2007 17:30:52 -0000	1.6
--- assertstring.h	26 Jun 2008 16:24:11 -0000	1.7
***************
*** 102,105 ****
--- 102,141 ----
  
  
+ 
+ // string checks
+ 
+ /*! \brief Asserts that a string starts with the specified character sequence.
+  * \ingroup group_assertions
+  */
+ # define CPPUT_CHECKSTR_START   \
+    CPPUT_BEGIN_CHECKING_MACRO() \
+    ::CppUT::checkStringStartsWith
+ 
+ /*! \brief Asserts that a string ends with the specified character sequence.
+  * \ingroup group_assertions
+  */
+ # define CPPUT_CHECKSTR_END     \
+    CPPUT_BEGIN_CHECKING_MACRO() \
+    ::CppUT::checkStringEndsWith
+ 
+ /*! \brief Asserts that a string contains the specified character sequence.
+  * \ingroup group_assertions
+  */
+ # define CPPUT_CHECKSTR_CONTAIN \
+    CPPUT_BEGIN_CHECKING_MACRO() \
+    ::CppUT::checkStringContains
+ 
+ /*! \brief Asserts that two string are identical.
+  * \ingroup group_assertions
+  *
+  * Useful to compare \c const \c char \c * or string of different C++ types
+  * (MFC \c CString and \c std::string for example).
+  */
+ # define CPPUT_CHECKSTR_EQUAL   \
+    CPPUT_BEGIN_CHECKING_MACRO() \
+    ::CppUT::checkStringEquals
+ 
+ 
+ 
  } // namespace CppUT
  

[Cppunit-cvs] cppunit INSTALL-unix,1.9,1.10

[Paul P. <pau...@us...>]

Update of /cvsroot/cppunit/cppunit
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23700

Modified Files:
	INSTALL-unix 
Log Message:
added extra ./configure option for compiling on IRIX 6 / MIPSpro.  From Bug #846195


Index: INSTALL-unix
===================================================================
RCS file: /cvsroot/cppunit/cppunit/INSTALL-unix,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** INSTALL-unix	9 Apr 2004 18:41:41 -0000	1.9
--- INSTALL-unix	9 Jun 2008 00:12:41 -0000	1.10
***************
*** 62,69 ****
  -------------------------
  
! The MIPSpro compiler requires the "-LANG:std" flag to enable the
! standard C++ library.  You must set the CC variable when you configure,
  as follows
! 	./configure CC='CC -LANG:std'
  
  There is a bug in released versions of libtool prevents the -LANG flag
--- 62,69 ----
  -------------------------
  
! The MIPSpro compiler requires the "-LANG:std" flag to enable the standard 
! C++ library.  You must set the CC and CXX variable when you configure,
  as follows
! 	./configure CC='CC -LANG:std' CXX='CC -LANG:std'
  
  There is a bug in released versions of libtool prevents the -LANG flag

[Cppunit-cvs] cppunit/examples/msvc6/TestPlugIn .cvsignore, 1.3, NONE

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit/examples/msvc6/TestPlugIn
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28299/TestPlugIn

Removed Files:
	.cvsignore 
Log Message:
Remove unused file.

--- .cvsignore DELETED ---

[Cppunit-cvs] cppunit/examples/money MoneyTest.cpp, 1.3, 1.4 MoneyTest.h, 1.2, 1.3

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit/examples/money
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9722/examples/money

Modified Files:
	MoneyTest.cpp MoneyTest.h 
Log Message:
Replace deprecated CPPUNIT_TEST_EXCEPTION with code using CPPUNIT_ASSERT_THROW.

Index: MoneyTest.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit/examples/money/MoneyTest.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MoneyTest.h	14 Jul 2002 19:48:31 -0000	1.2
--- MoneyTest.h	21 Feb 2008 03:48:05 -0000	1.3
***************
*** 11,15 ****
    CPPUNIT_TEST( testEqual );
    CPPUNIT_TEST( testAdd );
!   CPPUNIT_TEST_EXCEPTION( testAddThrow, IncompatibleMoneyError );
    CPPUNIT_TEST_SUITE_END();
  
--- 11,15 ----
    CPPUNIT_TEST( testEqual );
    CPPUNIT_TEST( testAdd );
!   CPPUNIT_TEST( testAddThrow );
    CPPUNIT_TEST_SUITE_END();
  

Index: MoneyTest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/examples/money/MoneyTest.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MoneyTest.cpp	13 Oct 2005 21:25:39 -0000	1.3
--- MoneyTest.cpp	21 Feb 2008 03:48:05 -0000	1.4
***************
*** 80,83 ****
    // Process
    Money money( 123, "USD" );
!   money += money123FF;        // should throw an exception
  }
--- 80,83 ----
    // Process
    Money money( 123, "USD" );
!   CPPUNIT_ASSERT_THROW( money += money123FF, IncompatibleMoneyError );
  }

[Cppunit-cvs] cppunit ChangeLog,1.268,1.269

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9722

Modified Files:
	ChangeLog 
Log Message:
Replace deprecated CPPUNIT_TEST_EXCEPTION with code using CPPUNIT_ASSERT_THROW.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cppunit/cppunit/ChangeLog,v
retrieving revision 1.268
retrieving revision 1.269
diff -C2 -d -r1.268 -r1.269
*** ChangeLog	21 Feb 2008 03:10:04 -0000	1.268
--- ChangeLog	21 Feb 2008 03:48:05 -0000	1.269
***************
*** 1,4 ****
--- 1,9 ----
  2008-02-20  Steve M. Robbins  <sm...@su...>
  
+ 	* examples/money/MoneyTest.h (TestFixture): Change deprecated
+ 	CPPUNIT_TEST_EXCEPTION to simple CPPUNIT_TEST.
+ 	* examples/money/MoneyTest.cpp (testAddThrow): Wrap throwing
+ 	expression "money += money123FF" inside CPPUNIT_ASSERT_THROW().
+ 
  	* Changes to build without warnings using gcc -Wall -W -ansi.
  	Applied patch [1898225] to remove name of unused argument and use

[Cppunit-cvs] cppunit/src/cppunit BriefTestProgressListener.cpp, 1.5, 1.6 TestFactoryRegistry.cpp, 1.22, 1.23 TestPlugInDefaultImpl.cpp, 1.7, 1.8 TestSuccessListener.cpp, 1.2, 1.3 TextTestProgressListener.cpp, 1.7, 1.8 XmlOutputterHook.cpp, 1.3, 1.4

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit/src/cppunit
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27874/src/cppunit

Modified Files:
	BriefTestProgressListener.cpp TestFactoryRegistry.cpp 
	TestPlugInDefaultImpl.cpp TestSuccessListener.cpp 
	TextTestProgressListener.cpp XmlOutputterHook.cpp 
Log Message:
Changes to suppress warnings of gcc -Wall -W -ansi, mainly from patch [1898225].

Index: TextTestProgressListener.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/src/cppunit/TextTestProgressListener.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TextTestProgressListener.cpp	25 Jun 2004 11:11:45 -0000	1.7
--- TextTestProgressListener.cpp	21 Feb 2008 03:10:06 -0000	1.8
***************
*** 18,22 ****
  
  void 
! TextTestProgressListener::startTest( Test *test )
  {
    stdCOut() << ".";
--- 18,22 ----
  
  void 
! TextTestProgressListener::startTest( Test * )
  {
    stdCOut() << ".";
***************
*** 32,37 ****
  
  void 
! TextTestProgressListener::endTestRun( Test *test, 
!                                       TestResult *eventManager )
  {
    stdCOut()  <<  "\n";
--- 32,37 ----
  
  void 
! TextTestProgressListener::endTestRun( Test *, 
!                                       TestResult * )
  {
    stdCOut()  <<  "\n";

Index: BriefTestProgressListener.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/src/cppunit/BriefTestProgressListener.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BriefTestProgressListener.cpp	25 Jun 2004 11:11:45 -0000	1.5
--- BriefTestProgressListener.cpp	21 Feb 2008 03:10:06 -0000	1.6
***************
*** 38,42 ****
  
  void 
! BriefTestProgressListener::endTest( Test *test )
  {
    if ( !m_lastTestFailed )
--- 38,42 ----
  
  void 
! BriefTestProgressListener::endTest( Test * )
  {
    if ( !m_lastTestFailed )

Index: TestSuccessListener.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/src/cppunit/TestSuccessListener.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestSuccessListener.cpp	12 Jul 2002 05:59:57 -0000	1.2
--- TestSuccessListener.cpp	21 Feb 2008 03:10:06 -0000	1.3
***************
*** 26,30 ****
  
  void 
! TestSuccessListener::addFailure( const TestFailure &failure )
  {
    ExclusiveZone zone( m_syncObject );
--- 26,30 ----
  
  void 
! TestSuccessListener::addFailure( const TestFailure & )
  {
    ExclusiveZone zone( m_syncObject );

Index: XmlOutputterHook.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/src/cppunit/XmlOutputterHook.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XmlOutputterHook.cpp	12 Jul 2002 05:59:58 -0000	1.3
--- XmlOutputterHook.cpp	21 Feb 2008 03:10:06 -0000	1.4
***************
*** 6,10 ****
  
  void 
! XmlOutputterHook::beginDocument( XmlDocument *document )
  {
  }
--- 6,10 ----
  
  void 
! XmlOutputterHook::beginDocument( XmlDocument * )
  {
  }
***************
*** 12,16 ****
  
  void 
! XmlOutputterHook::endDocument( XmlDocument *document )
  {
  }
--- 12,16 ----
  
  void 
! XmlOutputterHook::endDocument( XmlDocument * )
  {
  }
***************
*** 18,25 ****
  
  void 
! XmlOutputterHook::failTestAdded( XmlDocument *document,
!                                  XmlElement *testElement,
!                                  Test *test,
!                                  TestFailure *failure )
  {
  }
--- 18,25 ----
  
  void 
! XmlOutputterHook::failTestAdded( XmlDocument *,
!                                  XmlElement *,
!                                  Test *,
!                                  TestFailure * )
  {
  }
***************
*** 27,33 ****
  
  void 
! XmlOutputterHook::successfulTestAdded( XmlDocument *document,
!                                        XmlElement *testElement,
!                                        Test *test )
  {
  }
--- 27,33 ----
  
  void 
! XmlOutputterHook::successfulTestAdded( XmlDocument *,
!                                        XmlElement *,
!                                        Test * )
  {
  }
***************
*** 35,40 ****
  
  void 
! XmlOutputterHook::statisticsAdded( XmlDocument *document,
!                                    XmlElement *statisticsElement )
  {
  }
--- 35,40 ----
  
  void 
! XmlOutputterHook::statisticsAdded( XmlDocument *,
!                                    XmlElement * )
  {
  }

Index: TestPlugInDefaultImpl.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/src/cppunit/TestPlugInDefaultImpl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestPlugInDefaultImpl.cpp	13 Oct 2005 20:13:16 -0000	1.7
--- TestPlugInDefaultImpl.cpp	21 Feb 2008 03:10:06 -0000	1.8
***************
*** 22,27 ****
  
  void 
! TestPlugInDefaultImpl::initialize( TestFactoryRegistry *registry,
!                                    const PlugInParameters &parameters )
  {
  }
--- 22,27 ----
  
  void 
! TestPlugInDefaultImpl::initialize( TestFactoryRegistry *,
!                                    const PlugInParameters & )
  {
  }
***************
*** 29,33 ****
  
  void 
! TestPlugInDefaultImpl::addListener( TestResult *eventManager )
  {
  }
--- 29,33 ----
  
  void 
! TestPlugInDefaultImpl::addListener( TestResult * )
  {
  }
***************
*** 35,39 ****
  
  void 
! TestPlugInDefaultImpl::removeListener( TestResult *eventManager )
  {
  }
--- 35,39 ----
  
  void 
! TestPlugInDefaultImpl::removeListener( TestResult * )
  {
  }
***************
*** 41,45 ****
  
  void 
! TestPlugInDefaultImpl::addXmlOutputterHooks( XmlOutputter *outputter )
  {
  }
--- 41,45 ----
  
  void 
! TestPlugInDefaultImpl::addXmlOutputterHooks( XmlOutputter * )
  {
  }
***************
*** 53,57 ****
  
  void 
! TestPlugInDefaultImpl::uninitialize( TestFactoryRegistry *registry )
  {
  }
--- 53,57 ----
  
  void 
! TestPlugInDefaultImpl::uninitialize( TestFactoryRegistry * )
  {
  }

Index: TestFactoryRegistry.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/src/cppunit/TestFactoryRegistry.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** TestFactoryRegistry.cpp	13 Oct 2005 20:13:15 -0000	1.22
--- TestFactoryRegistry.cpp	21 Feb 2008 03:10:06 -0000	1.23
***************
*** 102,106 ****
  
  void 
! TestFactoryRegistry::registerFactory( const std::string &name,
                                        TestFactory *factory )
  {
--- 102,106 ----
  
  void 
! TestFactoryRegistry::registerFactory( const std::string &,
                                        TestFactory *factory )
  {

[Cppunit-cvs] cppunit/examples/cppunittest MockTestCase.cpp, 1.6, 1.7 OrthodoxTest.h, 1.7, 1.8 XmlOutputterTest.cpp, 1.14, 1.15 assertion_traitsTest.cpp, 1.1, 1.2

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit/examples/cppunittest
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27874/examples/cppunittest

Modified Files:
	MockTestCase.cpp OrthodoxTest.h XmlOutputterTest.cpp 
	assertion_traitsTest.cpp 
Log Message:
Changes to suppress warnings of gcc -Wall -W -ansi, mainly from patch [1898225].

Index: assertion_traitsTest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/examples/cppunittest/assertion_traitsTest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** assertion_traitsTest.cpp	31 Jan 2007 05:27:07 -0000	1.1
--- assertion_traitsTest.cpp	21 Feb 2008 03:10:04 -0000	1.2
***************
*** 16,20 ****
  {
      CPPUNIT_ASSERT_EQUAL( std::string( "abc" ), 
! 			  CPPUNIT_NS::assertion_traits<char*>::toString( "abc" ) );
  
      CPPUNIT_ASSERT_EQUAL( std::string( "33" ), 
--- 16,20 ----
  {
      CPPUNIT_ASSERT_EQUAL( std::string( "abc" ), 
! 			  CPPUNIT_NS::assertion_traits<const char*>::toString( "abc" ) );
  
      CPPUNIT_ASSERT_EQUAL( std::string( "33" ), 

Index: MockTestCase.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/examples/cppunittest/MockTestCase.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MockTestCase.cpp	13 Jul 2002 10:33:49 -0000	1.6
--- MockTestCase.cpp	21 Feb 2008 03:10:04 -0000	1.7
***************
*** 113,117 ****
  
  void 
! MockTestCase::setExpectedTearDownCall( int callCount )
  {
  }
--- 113,117 ----
  
  void 
! MockTestCase::setExpectedTearDownCall( int )
  {
  }

Index: XmlOutputterTest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/examples/cppunittest/XmlOutputterTest.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** XmlOutputterTest.cpp	12 Jan 2007 05:56:34 -0000	1.14
--- XmlOutputterTest.cpp	21 Feb 2008 03:10:04 -0000	1.15
***************
*** 239,269 ****
    }
  
!   void beginDocument( CPPUNIT_NS::XmlDocument *document )
    {
      ++m_beginCalls;
    }
  
!   void endDocument( CPPUNIT_NS::XmlDocument *document )
    {
      ++m_endCalls;
    }
  
!   void failTestAdded( CPPUNIT_NS::XmlDocument *document,
!                       CPPUNIT_NS::XmlElement *testElement,
!                       CPPUNIT_NS::Test *test,
!                       CPPUNIT_NS::TestFailure *failure )
    {
      ++m_failedTestCalls;
    }
  
!   void successfulTestAdded( CPPUNIT_NS::XmlDocument *document,
!                             CPPUNIT_NS::XmlElement *testElement,
!                             CPPUNIT_NS::Test *test )
    {
      ++m_successfulTestCalls;
    }
  
!   void statisticsAdded( CPPUNIT_NS::XmlDocument *document,
!                         CPPUNIT_NS::XmlElement *statisticsElement )
    {
      ++m_statisticsCalls;
--- 239,269 ----
    }
  
!   void beginDocument( CPPUNIT_NS::XmlDocument * )
    {
      ++m_beginCalls;
    }
  
!   void endDocument( CPPUNIT_NS::XmlDocument * )
    {
      ++m_endCalls;
    }
  
!   void failTestAdded( CPPUNIT_NS::XmlDocument *,
!                       CPPUNIT_NS::XmlElement *,
!                       CPPUNIT_NS::Test *,
!                       CPPUNIT_NS::TestFailure * )
    {
      ++m_failedTestCalls;
    }
  
!   void successfulTestAdded( CPPUNIT_NS::XmlDocument *,
!                             CPPUNIT_NS::XmlElement *,
!                             CPPUNIT_NS::Test * )
    {
      ++m_successfulTestCalls;
    }
  
!   void statisticsAdded( CPPUNIT_NS::XmlDocument *,
!                         CPPUNIT_NS::XmlElement * )
    {
      ++m_statisticsCalls;

Index: OrthodoxTest.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit/examples/cppunittest/OrthodoxTest.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OrthodoxTest.h	13 Jul 2002 10:33:49 -0000	1.7
--- OrthodoxTest.h	21 Feb 2008 03:10:04 -0000	1.8
***************
*** 134,138 ****
      ValueBadCall( int value =0 ) : Value( value ) {}
  
!     ValueBadCall( const ValueBadCall &other ) 
      {
        static int serialNumber = 0;
--- 134,138 ----
      ValueBadCall( int value =0 ) : Value( value ) {}
  
!     ValueBadCall( const ValueBadCall & ) : Value()
      {
        static int serialNumber = 0;
***************
*** 157,161 ****
      }
  
!     ValueBadAssignment &operator =( const ValueBadAssignment &other )
      {
        ++m_value;
--- 157,161 ----
      }
  
!     ValueBadAssignment &operator =( const ValueBadAssignment & )
      {
        ++m_value;

[Cppunit-cvs] cppunit/examples/hierarchy main.cpp,1.13,1.14

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit/examples/hierarchy
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27874/examples/hierarchy

Modified Files:
	main.cpp 
Log Message:
Changes to suppress warnings of gcc -Wall -W -ansi, mainly from patch [1898225].

Index: main.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/examples/hierarchy/main.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** main.cpp	12 Jan 2007 05:27:05 -0000	1.13
--- main.cpp	21 Feb 2008 03:10:05 -0000	1.14
***************
*** 9,13 ****
  
  int 
! main(int argc, char** argv)
  {
    CPPUNIT_NS::TextUi::TestRunner runner;
--- 9,13 ----
  
  int 
! main()
  {
    CPPUNIT_NS::TextUi::TestRunner runner;

[Cppunit-cvs] cppunit/examples/simple Main.cpp,1.4,1.5

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit/examples/simple
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27874/examples/simple

Modified Files:
	Main.cpp 
Log Message:
Changes to suppress warnings of gcc -Wall -W -ansi, mainly from patch [1898225].

Index: Main.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/examples/simple/Main.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Main.cpp	25 Jun 2004 10:41:27 -0000	1.4
--- Main.cpp	21 Feb 2008 03:10:05 -0000	1.5
***************
*** 8,12 ****
  
  int
! main( int argc, char* argv[] )
  {
    // Create the event manager and test controller
--- 8,12 ----
  
  int
! main()
  {
    // Create the event manager and test controller

[Cppunit-cvs] cppunit/include/cppunit/extensions ExceptionTestCaseDecorator.h, 1.3, 1.4

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit/include/cppunit/extensions
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27874/include/cppunit/extensions

Modified Files:
	ExceptionTestCaseDecorator.h 
Log Message:
Changes to suppress warnings of gcc -Wall -W -ansi, mainly from patch [1898225].

Index: ExceptionTestCaseDecorator.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit/include/cppunit/extensions/ExceptionTestCaseDecorator.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ExceptionTestCaseDecorator.h	15 Mar 2003 08:55:28 -0000	1.3
--- ExceptionTestCaseDecorator.h	21 Feb 2008 03:10:06 -0000	1.4
***************
*** 93,97 ****
     * Should be overriden to check the exception.
     */
!   virtual void checkException( ExpectedExceptionType &e )
    {
    }
--- 93,97 ----
     * Should be overriden to check the exception.
     */
!   virtual void checkException( ExpectedExceptionType & )
    {
    }

[Cppunit-cvs] cppunit/src/DllPlugInTester CommandLineParserTest.cpp, 1.4, 1.5 DllPlugInTesterTest.cpp, 1.3, 1.4

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit/src/DllPlugInTester
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27874/src/DllPlugInTester

Modified Files:
	CommandLineParserTest.cpp DllPlugInTesterTest.cpp 
Log Message:
Changes to suppress warnings of gcc -Wall -W -ansi, mainly from patch [1898225].

Index: CommandLineParserTest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/src/DllPlugInTester/CommandLineParserTest.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CommandLineParserTest.cpp	18 Jun 2004 08:15:29 -0000	1.4
--- CommandLineParserTest.cpp	21 Feb 2008 03:10:06 -0000	1.5
***************
*** 33,37 ****
  {
    int count =0;
!   for ( const char **line = lines; *line != NULL; ++line, ++count );
  
    delete _parser;
--- 33,38 ----
  {
    int count =0;
!   for ( const char **line = lines; *line != NULL; ++line, ++count )
!       ;
  
    delete _parser;

Index: DllPlugInTesterTest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/src/DllPlugInTester/DllPlugInTesterTest.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DllPlugInTesterTest.cpp	25 Jun 2004 10:41:27 -0000	1.3
--- DllPlugInTesterTest.cpp	21 Feb 2008 03:10:06 -0000	1.4
***************
*** 4,8 ****
  
  
! int main(int argc, char* argv[])
  {
    CPPUNIT_NS::Test *suite = CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest();
--- 4,8 ----
  
  
! int main()
  {
    CPPUNIT_NS::Test *suite = CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest();

[Cppunit-cvs] cppunit/examples/money MoneyApp.cpp,1.4,1.5

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit/examples/money
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27874/examples/money

Modified Files:
	MoneyApp.cpp 
Log Message:
Changes to suppress warnings of gcc -Wall -W -ansi, mainly from patch [1898225].

Index: MoneyApp.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/examples/money/MoneyApp.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MoneyApp.cpp	25 Jun 2004 10:41:27 -0000	1.4
--- MoneyApp.cpp	21 Feb 2008 03:10:05 -0000	1.5
***************
*** 5,9 ****
  
  
! int main(int argc, char* argv[])
  {
    // Get the top level suite from the registry
--- 5,9 ----
  
  
! int main()
  {
    // Get the top level suite from the registry

[Cppunit-cvs] cppunit ChangeLog,1.267,1.268

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27874

Modified Files:
	ChangeLog 
Log Message:
Changes to suppress warnings of gcc -Wall -W -ansi, mainly from patch [1898225].

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cppunit/cppunit/ChangeLog,v
retrieving revision 1.267
retrieving revision 1.268
diff -C2 -d -r1.267 -r1.268
*** ChangeLog	20 Feb 2008 06:21:49 -0000	1.267
--- ChangeLog	21 Feb 2008 03:10:04 -0000	1.268
***************
*** 1,4 ****
--- 1,18 ----
  2008-02-20  Steve M. Robbins  <sm...@su...>
  
+ 	* Changes to build without warnings using gcc -Wall -W -ansi.
+ 	Applied patch [1898225] to remove name of unused argument and use
+ 	no-arg version of main(). Tested on both GCC 4.2.3 and a
+ 	prerelease of GCC 4.3.0.
+ 	* examples/cppunittest/assertion_traitsTest.cpp (test_toString):
+ 	Change template parameter of
+ 	CPPUNIT_NS::assertion_traits<char*>::toString() to const char*,
+ 	avoiding a deprecated conversion from string literal to char*.
+ 	* src/DllPlugInTester/CommandLineParserTest.cpp (parse): move
+ 	semicolon of empty loop body to its own line, avoiding a warning
+ 	in GCC 4.3.
+ 
+ 2008-02-20  Steve M. Robbins  <sm...@su...>
+ 
  	* configure.in: Update CPPUNIT_MICRO_VERSION for release 1.12.1.
  

[Cppunit-cvs] cppunit ChangeLog, 1.266, 1.267 configure.in, 1.86, 1.87

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22974

Modified Files:
	ChangeLog configure.in 
Log Message:
Update version to create release 1.12.1.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cppunit/cppunit/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -C2 -d -r1.266 -r1.267
*** ChangeLog	7 Feb 2008 08:48:15 -0000	1.266
--- ChangeLog	20 Feb 2008 06:21:49 -0000	1.267
***************
*** 1,2 ****
--- 1,6 ----
+ 2008-02-20  Steve M. Robbins  <sm...@su...>
+ 
+ 	* configure.in: Update CPPUNIT_MICRO_VERSION for release 1.12.1.
+ 
  2008-02-07  Steve M. Robbins  <sm...@su...>
  

Index: configure.in
===================================================================
RCS file: /cvsroot/cppunit/cppunit/configure.in,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** configure.in	27 Jan 2007 05:33:10 -0000	1.86
--- configure.in	20 Feb 2008 06:21:50 -0000	1.87
***************
*** 16,20 ****
  CPPUNIT_MAJOR_VERSION=1
  CPPUNIT_MINOR_VERSION=12
! CPPUNIT_MICRO_VERSION=0
  CPPUNIT_INTERFACE_AGE=0
  CPPUNIT_BINARY_AGE=0
--- 16,20 ----
  CPPUNIT_MAJOR_VERSION=1
  CPPUNIT_MINOR_VERSION=12
! CPPUNIT_MICRO_VERSION=1
  CPPUNIT_INTERFACE_AGE=0
  CPPUNIT_BINARY_AGE=0

[Cppunit-cvs] cppunit ChangeLog,1.265,1.266

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15609

Modified Files:
	ChangeLog 
Log Message:
Change from qlist.h to qptrlist.h, avoiding compatibility header.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cppunit/cppunit/ChangeLog,v
retrieving revision 1.265
retrieving revision 1.266
diff -C2 -d -r1.265 -r1.266
*** ChangeLog	5 Mar 2007 03:17:27 -0000	1.265
--- ChangeLog	7 Feb 2008 08:48:15 -0000	1.266
***************
*** 1,2 ****
--- 1,8 ----
+ 2008-02-07  Steve M. Robbins  <sm...@su...>
+ 
+ 	* src/qttestrunner/MostRecentTests.h: 
+ 	* src/qttestrunner/TestRunnerModel.h: Change from <qlist.h> to
+ 	replacment <qptrlist.h>; avoids use of compatibility headers.
+ 
  2007-03-04  Steve M. Robbins  <sm...@su...>
  

[Cppunit-cvs] cppunit/src/qttestrunner MostRecentTests.h, 1.2, 1.3 TestRunnerModel.h, 1.4, 1.5

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit/src/qttestrunner
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15609/src/qttestrunner

Modified Files:
	MostRecentTests.h TestRunnerModel.h 
Log Message:
Change from qlist.h to qptrlist.h, avoiding compatibility header.

Index: MostRecentTests.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit/src/qttestrunner/MostRecentTests.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MostRecentTests.h	13 Jul 2002 10:33:50 -0000	1.2
--- MostRecentTests.h	7 Feb 2008 08:48:15 -0000	1.3
***************
*** 9,13 ****
  #include <cppunit/Test.h>
  #include <qstring.h>
! #include <qlist.h>
  #include <qobject.h>
  
--- 9,13 ----
  #include <cppunit/Test.h>
  #include <qstring.h>
! #include <qptrlist.h>
  #include <qobject.h>
  

Index: TestRunnerModel.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit/src/qttestrunner/TestRunnerModel.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestRunnerModel.h	13 Jul 2002 10:33:50 -0000	1.4
--- TestRunnerModel.h	7 Feb 2008 08:48:15 -0000	1.5
***************
*** 9,13 ****
  #include <cppunit/Test.h>
  #include <cppunit/TestListener.h>
! #include <qlist.h>
  #include <qobject.h>
  #include <qthread.h>
--- 9,13 ----
  #include <cppunit/Test.h>
  #include <cppunit/TestListener.h>
! #include <qptrlist.h>
  #include <qobject.h>
  #include <qthread.h>