Merge lp:~blep/cppunit2/testcase-factory into lp:cppunit2/trunk

[blep]

[blep (blep)]

The registry now contains test case factory instead of test case instance. This will allow multiple instances creation for thread safety and makes it easier to have parametrized test.

The suite registry has been revised to match common use case, such as having a common top level suite for all test cases of a library.

[lp:~blep/cppunit2/testcase-factory]

426. By Baptiste Lepilleur <email address hidden> on 2009-03-13

Fixed some compilation issues on Linux/gcc 4.4.

427. By blep <blep@unknown> on 2009-03-14

Fixed compilation issues with Solaris SunStudio 12.

[blep (blep)]

Compilation and test pass on Solaris/Sun Studio 12, as well as MSVS 6, 7.1, 8.0, and 9.0. No new compilation issues are introduced on Linux/gcc 4.4 (but stringize tests still do not compile).

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2008-12-14 14:18:05 +0000
+++ .bzrignore	2008-12-25 17:01:58 +0000
@@ -1,10 +1,14 @@
 bin
+build
 buildscons
 libs
 scons.py
-scons-local-*
+cppunit2/scons-local-*
+cppunit2/scons-LICENSE
+*.user
 *.ncb
+*.suo
 cppunit2/test/json_test/*.actual*
 cppunit2/test/json_test/*.rewrite
 cppunit2/test/json_test/*.process-output
-build
+makefiles/vs71/cppunit2.suo
 
=== modified file 'cppunit2/TODO'
--- cppunit2/TODO	2008-07-13 06:19:20 +0000
+++ cppunit2/TODO	2009-03-13 21:39:36 +0000
@@ -1,5 +1,4 @@
 * complete works on the CommandLines library => likely moved to opentest.
-* add support for ExtendedData in C function test case (CPPUT_TEST_FUNCTION...)
 * need a new Any supporting feature required for unit testing:
   - toString (toJson?)
   - type to text (for conversion error message)
@@ -9,8 +8,5 @@
   - support for unknown aggregate types.
   - conversion between type (int, uint, const char *, std::string...)
   - type comparison
-* arange for fixture based test case to create a new instance for each test run.
-  => solve requirement to implement setUp()/tearDown()
-  => ensure thread-safety when the same test is executed in multiple thread at the
-     same time (stress test)
+* write unit test for light test fixture
 
 
=== modified file 'cppunit2/doc/coding_guidelines.dox'
--- cppunit2/doc/coding_guidelines.dox	2007-08-14 15:42:14 +0000
+++ cppunit2/doc/coding_guidelines.dox	2008-12-11 20:28:30 +0000
@@ -17,7 +17,7 @@
 
 <table>
 <tr><td><b>First letter in upper case</b></td><td><b>First letter in lower case</b></td></tr>
-<tr><td><tt>TestCase</tt></td><td><tt>testCase</tt></td></tr>
+<tr><td><tt>TestMeta</tt></td><td><tt>testCase</tt></td></tr>
 <tr><td><tt>DLLLoader</tt></td><td><tt>dllLoader</tt></td></tr>
 </table>
 
@@ -40,9 +40,9 @@
 resource.c      // OK
 
 test_case.c     // BAD
-TestCase.c      // BAD
-TestCase.h      // BAD
-TestCase.C      // BAD
+TestMeta.c      // BAD
+TestMeta.h      // BAD
+TestMeta.C      // BAD
 \endcode
 
 \subsection cg_cppidentifiers C++ identifiers
@@ -94,7 +94,7 @@
 Example:
 \code
 Test
-TestCase
+TestMeta
 ExceptionGuard
 \endcode
 
@@ -217,11 +217,11 @@
 - return type in function definitions should be 
 \code
 // An example of constructor
-TestCase::TestCase( const CppTL::Functor0 &setUp,
+TestMeta::TestMeta( const CppTL::Functor0 &setUp,
                     const CppTL::Functor0 &run,
                     const CppTL::Functor0 &tearDown,
                     const std::string &name )
-   : AbstractTestCase( name )
+   : TestCase( name )
    , setUp_( setUp )
    , run_( run )
    , tearDown_( tearDown )
 
=== modified file 'cppunit2/doc/cpput.dox'
--- cppunit2/doc/cpput.dox	2007-08-16 13:51:04 +0000
+++ cppunit2/doc/cpput.dox	2008-12-20 10:45:17 +0000
@@ -43,8 +43,8 @@
 \section section_writing_test Writing tests
 
 \subsection section_instantiating_test Instantiating tests
-    A test case is exposed by instantiating a subclass of CppUT::AbstractTestCase. Each 
-time a test case is executed, the \link CppUT::AbstractTestCase::runTest() runTest()\endlink 
+    A test case is exposed by instantiating a subclass of CppUT::TestCase. Each 
+time a test case is executed, the \link CppUT::TestCase::runTest() runTest()\endlink 
 method is called. This method calls the virtual methods \testCaseSetup, \testCaseRun 
 and \testCaseTearDown. 
 The \testCaseRun and \testCaseTearDown methods are only called if
@@ -57,15 +57,15 @@
 automatically (see \ref section_skippingtest for detail).
 
     There is mainly two ways to create test case:
-        - Subclassing CppUT::AbstractTestCase and overridding at least \testCaseRun.
-        - Instantiating CppUT::TestCase, which subclass CppUT::AbstractTestCase, and
+        - Subclassing CppUT::TestCase and overridding at least \testCaseRun.
+        - Instantiating CppUT::TestMeta, which subclass CppUT::TestCase, and
           passing the function to execute in the constructor.
 
     A test case is usually created using CppUT::makeTestCase() that instantiate 
-CppUT::TestCase.
+CppUT::TestMeta.
 
 	Notes that test case instantiation is usually only done when you need to create your own
-convenience test case macro or you are populating a TestSuite with parametrized TestCase.
+convenience test case macro or you are populating a Suite with parametrized TestMeta.
 The framework provides severable way to create and register test case, see \ref section_lightfixture,
 \ref section_testfixture, \ref section_testfunction.
  
@@ -219,7 +219,7 @@
     Notes that a SkipTestException exception (a subclass of std::runtime_error) is thrown
 to abort the test.
 
-\subsection section_testfixture Creating TestCase: TestFixture
+\subsection section_testfixture Creating TestMeta: TestFixture
 
 A TestFixture is a class that implements multiple test cases sharing the same setUp/tearDown steps.
 Test cases are implements as "void test()" member function and each test case has its own instance
@@ -230,11 +230,11 @@
 - polymorphism: you can subclass a TestFixture and adds more test or override setUp/teardown 
 virtual member functions.
 - TestExtendedData can be specified for each test
-- TestFixture test cases are grouped within a TestSuite
+- TestFixture test cases are grouped within a Suite
 - macro usage is limited to a declaration of the test member function and is clearly separated 
 from code.
 
-\subsection section_lightfixture Creating TestCase: light Fixture
+\subsection section_lightfixture Creating TestMeta: light Fixture
 
 A Light test fixture is similar to a TestFixture but does not support the following features:
 - templated test class
@@ -243,18 +243,18 @@
 
 On the positive side, it is easier on the wrist.
 
-\subsection section_testfunction Creating TestCase: test functions
+\subsection section_testfunction Creating TestMeta: test functions
 
 A test case can be implemented as a plain C function "void test()".
 
-\subsection section_tablefixture Creating TestCase: using table fixture in test cases
+\subsection section_tablefixture Creating TestMeta: using table fixture in test cases
 
 Sometimes when writing test cases, you need to repeat the same test with different 
 input values. Table fixture are a way to do this.
 
 \see CPPUT_TEST_TABLE(), CPPUT_REGISTER_TEST_FUNCTION_TABLE_IN(), CPPUT_TEST_FUNCTION_TABLE_IN().
 
-\subsection section_inputfixture Creating TestCase: input fixture
+\subsection section_inputfixture Creating TestMeta: input fixture
 
 Input fixture are intended to run functional test cases with externalized input data.
 
 
=== modified file 'cppunit2/doc/doxyfile.in'
--- cppunit2/doc/doxyfile.in	2007-03-16 21:41:39 +0000
+++ cppunit2/doc/doxyfile.in	2008-12-11 20:28:30 +0000
@@ -26,9 +26,9 @@
 JAVADOC_AUTOBRIEF      = YES
 INHERIT_DOCS           = YES
 TAB_SIZE               = 3
-ALIASES                = "testCaseSetup=\link CppUT::AbstractTestCase::setUp() setUp()\endlink" \
-        "testCaseRun=\link CppUT::AbstractTestCase::run() run()\endlink" \
-        "testCaseTearDown=\link CppUT::AbstractTestCase::tearDown() tearDown()\endlink" \
+ALIASES                = "testCaseSetup=\link CppUT::TestCase::setUp() setUp()\endlink" \
+        "testCaseRun=\link CppUT::TestCase::run() run()\endlink" \
+        "testCaseTearDown=\link CppUT::TestCase::tearDown() tearDown()\endlink" \
         "json_ref=<a HREF='http://www.json.org/'>JSON (JavaScript Object Notation)</a>"
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
=== modified file 'cppunit2/examples/checking_assertions/main.cpp'
--- cppunit2/examples/checking_assertions/main.cpp	2005-11-07 21:43:08 +0000
+++ cppunit2/examples/checking_assertions/main.cpp	2009-03-13 20:59:56 +0000
@@ -1,10 +1,9 @@
 #include <examples/common/examplecommon.h>
-#include <cpput/testcase.h>
 
 
 // Checking assertion do not abort the test uppon failure:
 // all the failing assertions below will be reported by the test framework
-static void testBasicCheckingAssertion()
+CPPUT_TEST_FUNCTION( testBasicCheckingAssertion )
 {
    CPPUT_CHECK( 1 == 2, "1 is not equal to 2..."  );
    CPPUT_CHECK_EXPR( 1 + 2 == 4 );
@@ -18,8 +17,5 @@
 
 int main( int argc, const char *argv[] )
 {
-   CppUT::TestSuitePtr allSuite = CppUT::makeTestSuite( "All tests" );
-   allSuite->add( CppUT::makeTestCase( CppTL::cfn0( &testBasicCheckingAssertion ), 
-                                       "testBasicCheckingAssertion" ) );
-   return runExampleTests( argc, argv, allSuite.get() );
+   return runExampleTests( argc, argv );
 }
 
=== modified file 'cppunit2/examples/common/examplecommon.h'
--- cppunit2/examples/common/examplecommon.h	2005-11-13 09:17:57 +0000
+++ cppunit2/examples/common/examplecommon.h	2009-03-13 20:59:56 +0000
@@ -1,22 +1,17 @@
 #ifndef CPPUT_EXAMPLES_EXAMPLECOMMON_H_INCLUDED
 # define CPPUT_EXAMPLES_EXAMPLECOMMON_H_INCLUDED
 
-#include <cpput/testsuite.h>
+#include <cpput/registry.h>
 #include <cpput/lighttestrunner.h>
-//#include <cpput/testrunner.h>    // cppunit2 testrunner for opentest
 #include <cpput/assertcommon.h>
+#include <cpput/testfunction.h>
 
 inline int runExampleTests( int argc, 
-                            const char *argv[], 
-                            CppUT::Test *test )
+                            const char *argv[] )
 {
-//   CppUT::TestRunner runner;
-//   runner.setRootSuite( allSuite.get() );
-//   OpenTest::TextTestDriver driver( runner );
-//   bool sucessful = driver.run();
    CppUT::LightTestRunner runner;
-   runner.addTest( test );
-   bool sucessful = runner.runAllTests();
+   runner.addSuite( CppUT::Registry::getRootSuite() );
+   bool sucessful = runner.runTests();
    return sucessful ? 0 : 1;
 }
 
 
=== modified file 'cppunit2/examples/ignore_failure_demo/main.cpp'
--- cppunit2/examples/ignore_failure_demo/main.cpp	2005-11-11 19:54:15 +0000
+++ cppunit2/examples/ignore_failure_demo/main.cpp	2009-03-13 20:59:56 +0000
@@ -1,12 +1,11 @@
 #include <examples/common/examplecommon.h>
-#include <cpput/testcase.h>
 
 static int half( int x )
 {
    return (x+1) / 2;
 }
 
-static void testIgnoreFailure()
+CPPUT_TEST_FUNCTION( testIgnoreFailure )
 {
    CPPUT_CHECK_EQUAL( 1, half(2) );
    CPPUT_IGNORE_FAILURE(( CPPUT_CHECK_EQUAL( 2, half(5) ) ));
@@ -17,8 +16,5 @@
 
 int main( int argc, const char *argv[] )
 {
-   CppUT::TestSuitePtr allSuite = CppUT::makeTestSuite( "All tests" );
-   allSuite->add( CppUT::makeTestCase( CppTL::cfn0( &testIgnoreFailure ), 
-                                       "testIgnoreFailure" ) );
-   return runExampleTests( argc, argv, allSuite.get() );
+   return runExampleTests( argc, argv );
 }
 
=== modified file 'cppunit2/examples/input_test/main.cpp'
--- cppunit2/examples/input_test/main.cpp	2007-08-16 13:51:04 +0000
+++ cppunit2/examples/input_test/main.cpp	2009-03-13 20:59:56 +0000
@@ -1,6 +1,7 @@
 #include <examples/common/examplecommon.h>
 #include <cpput/testcase.h>
 #include <cpput/testinfo.h>
+#include <cpput/testfunction.h>
 #include <cpput/assertcommon.h>
 #include <cpput/inputbasedtest.h>
 #include <json/reader.h>
@@ -38,7 +39,7 @@
 
 
 
-static void testOperations()
+CPPUT_TEST_FUNCTION( testOperations ) 
 {
    Json::Reader reader;
    Json::Value data;
@@ -60,11 +61,5 @@
 
 int main( int argc, const char *argv[] )
 {
-   CppUT::TestSuitePtr allSuite = CppUT::makeTestSuite( "All tests" );
-
-   CppUT::TestPtr test1 = CppUT::makeTestCase( CppTL::cfn0( testOperations ), 
-                                               "testOperations" );
-   allSuite->add( test1 );
-
-   return runExampleTests( argc, argv, allSuite.get() );
+   return runExampleTests( argc, argv );
 }
 
=== modified file 'cppunit2/examples/light_fixture/main.cpp'
--- cppunit2/examples/light_fixture/main.cpp	2007-08-15 15:35:40 +0000
+++ cppunit2/examples/light_fixture/main.cpp	2009-03-13 20:59:56 +0000
@@ -25,7 +25,7 @@
    int y_;
 };
 
-struct LineTest
+struct LineTest : CppUT::TestCase
 {
     LineTest() 
         : p1_( 1, 0 )
@@ -37,24 +37,21 @@
 };
 
 // In the light fixture test you can directly access fixture members
-CPPUT_TEST_LIGHT_FIXTURE( LineTest, testSquaredLength )
+CPPUT_FIXTURE_TEST( LineTest, testSquaredLength )
 {
    CPPUT_CHECK_EQUAL( 1, p1_.squaredLength() );
    CPPUT_CHECK_EQUAL( 2*2, p2_.squaredLength() );
 }
 
-CPPUT_TEST_LIGHT_FIXTURE_WITH_SPECIFICS( LineTest, testAdd, timeOut(0.2) )
+
+CPPUT_FIXTURE_TEST_WITH_META( LineTest, testAdd, timeOut(0.2) )
 {
    p1_.add( p2_ );
    CPPUT_CHECK_EQUAL( 1+2*2, p1_.squaredLength() );
 }
 
-// Register the light fixture test suite to the default test suite.
-CPPUT_REGISTER_LIGHT_FIXTURE( LineTest );
-
 
 int main( int argc, const char *argv[] )
 {
-   CppUT::TestSuitePtr allSuite = CppUT::Registry::instance().createDefaultTests();
-   return runExampleTests( argc, argv, allSuite.get() );
+   return runExampleTests( argc, argv );
 }
 
=== modified file 'cppunit2/examples/log_demo/main.cpp'
--- cppunit2/examples/log_demo/main.cpp	2005-11-08 19:25:50 +0000
+++ cppunit2/examples/log_demo/main.cpp	2009-03-13 20:59:56 +0000
@@ -1,9 +1,8 @@
 #include <examples/common/examplecommon.h>
-#include <cpput/testcase.h>
 #include <cpptl/stringtools.h>
 
 
-static void testLogDemo()
+CPPUT_TEST_FUNCTION( testLogDemo )
 {
    for ( int index =0; index < 5; ++index )
    {
@@ -16,8 +15,5 @@
 
 int main( int argc, const char *argv[] )
 {
-   CppUT::TestSuitePtr allSuite = CppUT::makeTestSuite( "All tests" );
-   allSuite->add( CppUT::makeTestCase( CppTL::cfn0( &testLogDemo ), 
-                                       "testLogDemo" ) );
-   return runExampleTests( argc, argv, allSuite.get() );
+   return runExampleTests( argc, argv );
 }
 
=== modified file 'cppunit2/examples/parametrized_test/main.cpp'
--- cppunit2/examples/parametrized_test/main.cpp	2005-11-13 09:17:57 +0000
+++ cppunit2/examples/parametrized_test/main.cpp	2009-03-13 20:59:56 +0000
@@ -12,11 +12,11 @@
 
 int main( int argc, const char *argv[] )
 {
-   CppUT::TestSuitePtr allSuite = CppUT::makeTestSuite( "All tests" );
-   allSuite->add( CppUT::makeTestCase( CppTL::bind_cfn( testMultiply, 7, 2, 7*2 ), 
+   CppUT::Suite &rootSuite = CppUT::Registry::getRootSuite();
+   rootSuite.add( CppUT::makeTestCase( CppTL::bind_cfn( testMultiply, 7, 2, 7*2 ), 
                                        "multiply 7*2" ) );
-   allSuite->add( CppUT::makeTestCase( CppTL::bind_cfn( testMultiply, 7, 5, 7*4 ), 
+   rootSuite.add( CppUT::makeTestCase( CppTL::bind_cfn( testMultiply, 7, 5, 7*4 ), 
                                        "multiply 7*5 (failing demo)" ) );
 
-   return runExampleTests( argc, argv, allSuite.get() );
+   return runExampleTests( argc, argv );
 }
 
=== modified file 'cppunit2/examples/stringize_demo/main.cpp'
--- cppunit2/examples/stringize_demo/main.cpp	2005-11-08 19:25:50 +0000
+++ cppunit2/examples/stringize_demo/main.cpp	2009-03-13 20:59:56 +0000
@@ -1,5 +1,4 @@
 #include <examples/common/examplecommon.h>
-#include <cpput/testcase.h>
 #include <cpptl/stringtools.h>
 #include <cpput/assertenum.h>
 #include <deque>
@@ -33,7 +32,7 @@
 } 
 
 
-static void testStringize()
+CPPUT_TEST_FUNCTION( testStringize )
 {
    CPPUT_CHECK_EQUAL( ExampleNamespace::WeirdType(5678), ExampleNamespace::WeirdType(1234) );
 
@@ -47,8 +46,5 @@
 
 int main( int argc, const char *argv[] )
 {
-   CppUT::TestSuitePtr allSuite = CppUT::makeTestSuite( "All tests" );
-   allSuite->add( CppUT::makeTestCase( CppTL::cfn0( &testStringize ), 
-                                       "testStringize" ) );
-   return runExampleTests( argc, argv, allSuite.get() );
+   return runExampleTests( argc, argv );
 }
 
=== modified file 'cppunit2/examples/test_function/main.cpp'
--- cppunit2/examples/test_function/main.cpp	2007-08-15 15:35:40 +0000
+++ cppunit2/examples/test_function/main.cpp	2009-03-13 20:59:56 +0000
@@ -1,40 +1,38 @@
 #include <examples/common/examplecommon.h>
 #include <cpput/testfunction.h>
 
-static void test1() 
+// Register function test1 in the default test suite
+
+CPPUT_TEST_FUNCTION( test1 ) 
 {
    CPPUT_CHECK( 1 == 2, "1 is not equal to 2..."  );
    CPPUT_CHECK_EXPR( 1 + 2 == 4 );
 }
 
-// Register function test1 in the default test suite
-CPPUT_REGISTER_TEST_FUNCTION( test1 );
-
 
 // Register function test1 in the test suite named "MyTestSuite"
-CPPUT_REGISTER_TEST_FUNCTION_IN( test1, "MyTestSuite" );
-
-
-// Declare and register a function test2 in the default test suite
-CPPUT_TEST_FUNCTION( test2 )
-{
-   CPPUT_CHECK_FALSE( 1 == 1, "1 is equal to 1..."  );
-   CPPUT_CHECK_EXPR_FALSE( 1 + 1 == 2 );
-}
-
-
-// Declare and register a function test2 in the test suite named "MyTestSuite"
-CPPUT_TEST_FUNCTION_IN( test3, "MyTestSuite" )
-{
-   CPPUT_CHECK_EQUAL( 1, 2 );
-   CPPUT_CHECK_NOT_EQUAL( 34, 34 );
-}
-
-// Makes MyTestSuite a child of default.
-CPPUT_REGISTER_SUITE_RELATIONSHIP_TO_DEFAULT( "MyTestSuite" );
+CPPUT_SUITE( "MyTestSuite" ) 
+{
+
+   // Declare and register a function test2 in the default test suite
+   CPPUT_TEST_FUNCTION( test2 )
+   {
+      CPPUT_CHECK_FALSE( 1 == 1, "1 is equal to 1..."  );
+      CPPUT_CHECK_EXPR_FALSE( 1 + 1 == 2 );
+   }
+
+
+   // Declare and register a function test2 in the test suite named "MyTestSuite"
+   CPPUT_TEST_FUNCTION( test3 )
+   {
+      CPPUT_CHECK_EQUAL( 1, 2 );
+      CPPUT_CHECK_NOT_EQUAL( 34, 34 );
+   }
+
+}
+
 
 int main( int argc, const char *argv[] )
 {
-   CppUT::TestSuitePtr allSuite = CppUT::Registry::instance().createDefaultTests();
-   return runExampleTests( argc, argv, allSuite.get() );
+   return runExampleTests( argc, argv );
 }
 
=== modified file 'cppunit2/include/cpptl/config.h'
--- cppunit2/include/cpptl/config.h	2007-08-15 09:20:57 +0000
+++ cppunit2/include/cpptl/config.h	2009-03-12 21:42:38 +0000
@@ -274,7 +274,7 @@
 
    template<class T>
    inline void
-   swap( T &left, T &right )
+   trivialSwap( T &left, T &right )
    {
       T temp( left );
       left = right;
 
=== modified file 'cppunit2/include/cpptl/conststring.h'
--- cppunit2/include/cpptl/conststring.h	2005-11-08 20:44:55 +0000
+++ cppunit2/include/cpptl/conststring.h	2009-03-12 21:42:38 +0000
@@ -891,8 +891,8 @@
 inline void 
 ConstString::swap( ConstString &other )
 {
-   CppTL::swap( length_, other.length_ );
-   CppTL::swap( buffer_, other.buffer_ );
+   CppTL::trivialSwap( length_, other.length_ );
+   CppTL::trivialSwap( buffer_, other.buffer_ );
 }
 
 
@@ -1098,9 +1098,9 @@
 inline void 
 StringBuffer::swap( StringBuffer &other )
 {
-   CppTL::swap( capacity_, other.capacity_ );
-   CppTL::swap( length_, other.length_ );
-   CppTL::swap( buffer_, other.buffer_ );
+   CppTL::trivialSwap( capacity_, other.capacity_ );
+   CppTL::trivialSwap( length_, other.length_ );
+   CppTL::trivialSwap( buffer_, other.buffer_ );
 }
 
 
 
=== modified file 'cppunit2/include/cpptl/intrusiveptr.h'
--- cppunit2/include/cpptl/intrusiveptr.h	2006-09-06 17:23:26 +0000
+++ cppunit2/include/cpptl/intrusiveptr.h	2009-03-12 21:42:38 +0000
@@ -103,7 +103,7 @@
 
       void swap( ThisType &other )
       {
-         CppTL::swap( p_, other.p_ );
+         CppTL::trivialSwap( p_, other.p_ );
       }
 
       ThisType &operator =( const ThisType &other )
 
=== modified file 'cppunit2/include/cpptl/scopedptr.h'
--- cppunit2/include/cpptl/scopedptr.h	2005-07-04 06:09:30 +0000
+++ cppunit2/include/cpptl/scopedptr.h	2009-03-12 21:42:38 +0000
@@ -23,7 +23,7 @@
 
    void swap( SelfType &other )
    {
-      CppTL::swap( p_, other.p_ );
+      CppTL::trivialSwap( p_, other.p_ );
    }
 
    void reset( PointeeType *p = 0 )
 
=== modified file 'cppunit2/include/cpput/extendeddata.h'
--- cppunit2/include/cpput/extendeddata.h	2006-09-03 05:15:49 +0000
+++ cppunit2/include/cpput/extendeddata.h	2008-12-25 17:01:58 +0000
@@ -15,7 +15,7 @@
  * \code
  * class SomeClass : public TestExtendedDataFactory {
  * public:
- *    static void enrichTest( Test &test ) {
+ *    static void enrichTest( MetaData &test ) {
  *       CppUT::TestExtendedDataHelper( test )( describe( "Test conversion" ),
  *                                              timeOut( 30.0 ),
  *                                              depends( "testInit" ) );
@@ -26,7 +26,7 @@
  * The above code sample is equivalent to:
  *
  * \code
- * static void enrichTest( Test &test ) {
+ * static void enrichTest( MetaData &test ) {
  *    test.setDescription( "Test conversion" );
  *    test.setTimeOut( 30.0 );
  *    test.setDependenciesFromPackedString( "testInit" );
@@ -41,13 +41,13 @@
 class TestExtendedDataHelper
 {
 public:
-   TestExtendedDataHelper( Test &test );
+   TestExtendedDataHelper( MetaData &test );
    virtual ~TestExtendedDataHelper();
 
-   Test &operator()( const TestExtendedData &data ) const;
+   MetaData &operator()( const TestExtendedData &data ) const;
 
 private:
-   Test &test_;
+   MetaData &test_;
 };
 
 
@@ -58,7 +58,7 @@
 public:
    virtual ~TestExtendedData();
 
-   virtual void apply( Test &test ) const = 0;
+   virtual void apply( MetaData &test ) const = 0;
 
    TestExtendedDataList operator ,( const TestExtendedData &other ) const;
 };
@@ -66,13 +66,22 @@
 
 /*! \ingroup group_testfixture
  */
+class CPPUT_API NoTestExtendedData : public TestExtendedData
+{
+public: // overridden from TestExtendedData
+   void apply( MetaData &test ) const;
+};
+
+
+/*! \ingroup group_testfixture
+ */
 class TestExtendedDataList : public TestExtendedData
 {
 public:
    TestExtendedDataList( const TestExtendedData &left,
                               const TestExtendedData &right );
 public: // overridden from TestExtendedData
-   void apply( Test &test ) const;
+   void apply( MetaData &test ) const;
 
 private:
    const TestExtendedData &left_;
@@ -88,7 +97,7 @@
    DescriptionData( const std::string &description );
 
 public: // overridden from TestExtendedData
-   void apply( Test &test ) const;
+   void apply( MetaData &test ) const;
 
 private:
    std::string description_;
@@ -103,7 +112,7 @@
    TimeOutData( double timeOutInSeconds );
 
 public: // overridden from TestExtendedData
-   void apply( Test &test ) const;
+   void apply( MetaData &test ) const;
 
 private:
    double timeOutInSeconds_;
@@ -118,7 +127,7 @@
    DependenciesData(  const std::string &dependencies  );
 
 public: // overridden from TestExtendedData
-   void apply( Test &test ) const;
+   void apply( MetaData &test ) const;
 private:
    std::string dependencies_;
 };
@@ -132,7 +141,7 @@
    GroupData(  const std::string &groupName );
 
 public: // overridden from TestExtendedData
-   void apply( Test &test ) const;
+   void apply( MetaData &test ) const;
 private:
    std::string groupName_;
 };
@@ -149,7 +158,7 @@
 
    static TimeOutData timeOut( double timeOutInSeconds );
 
-   static DependenciesData depends( const std::string &dependencies );
+   static DependenciesData depends( const std::string &dependency );
 
    static GroupData group( const std::string &groupName );
 };
 
=== modified file 'cppunit2/include/cpput/forwards.h'
--- cppunit2/include/cpput/forwards.h	2008-07-13 06:19:20 +0000
+++ cppunit2/include/cpput/forwards.h	2008-12-21 17:51:13 +0000
@@ -7,18 +7,21 @@
 namespace CppUT {
 
 class AbortingAssertionException;
-class AbstractTestCase;
-class AbstractTestSuite;
+class TestCase;
 class Message;
 class StandardTestExceptionGuard;
-class Test;
-class TestCase;
+class MetaData;
+class TestMeta;
 class TestExtendedData;
 class TestExtendedDataList;
 class ExceptionGuardElement;
 class ExceptionGuard;
-class TestSuite;
-class TestVisitor;
+
+// registry.h
+class Registry;
+class StaticSuite;
+class Suite;
+class SuiteMeta;
 
 // testinfo.h
 class CheckerResult;
@@ -36,12 +39,10 @@
 typedef CppTL::ConstString ResourceName;
 
 // for ...
-typedef CppTL::IntrusivePtr<AbstractTestCase> AbstractTestCasePtr;
-typedef CppTL::IntrusivePtr<AbstractTestSuite> AbstractTestSuitePtr;
+typedef CppTL::IntrusivePtr<TestCase> TestCasePtr;
 typedef CppTL::IntrusivePtr<ExceptionGuardElement> ExceptionGuardElementPtr;
-typedef CppTL::IntrusivePtr<Test> TestPtr;
+//typedef CppTL::IntrusivePtr<MetaData> TestPtr;
 typedef CppTL::IntrusivePtr<TestInfo> TestInfoPtr;
-typedef CppTL::IntrusivePtr<TestSuite> TestSuitePtr;
 typedef CppTL::IntrusivePtr<TestResultUpdater> TestResultUpdaterPtr;
 
 // for resource.h
 
=== added file 'cppunit2/include/cpput/interface.h'
--- cppunit2/include/cpput/interface.h	1970-01-01 00:00:00 +0000
+++ cppunit2/include/cpput/interface.h	2008-12-20 10:45:17 +0000
@@ -0,0 +1,119 @@
+#ifndef CPPUT_INTERFACE_INCLUDED_H
+# define CPPUT_INTERFACE_INCLUDED_H
+
+namespace CppUT {
+
+    /** Minimized and simple interface that expose all user oriented features.
+     * All implementation details are hidden behind pimpl idiom.
+     * Tests discovery:
+     * - list all tests
+     * - greping by test name, with stars matching
+     * Adding a test factory:
+     * - C function
+     * - Macro fixture
+     * - Polymorphic fixture
+     * Executing a list of test
+     * - events on test execution
+     * - list of all results
+     * Writing tests:
+     * - assertions
+     * - string converter
+     * - equality comparison
+     *   => prefer predicates instead of operator customization (but may still be useful).
+     * - using resources
+     * Resources factory:
+     * - declaring resources
+     *
+     * - Major refactoring:
+     *   Takes down the registry and replace it with a test case registry
+     *   => we next to register factory for test case, not for test suite
+     *   => test suite becomes only organizational element likes group
+     *   => test suite just have a name & a parent suite name
+
+1) Split TestCase into
+- TestMeta
+  => all description stuff:
+     - Test base class interface
+     - requireResource()
+     - factory function to create TestCase instance
+- TestCase
+  => all behavior stuffs:
+     - virtual setUp/runTest/tearDown
+2) LightTestRunner
+- accept TestMeta as input, not Test
+
+How to proceed:
+Step 1: introducing the test case factory
+1) Rename TestCase to TestMeta
+2) Change fixture factory to accept a factory for the fixture instead of an instance
+3) Introduce new TestCase class with setUp/run/tearDown
+4) Change parent class of subclass of TestMeta to TestCase and
+   create the TestMeta using makeFixtureTestCase
+
+How to handle abstract test case:
+- test may be defined in abstract base class
+=> fixture factory is only available if fixture was instantiated.
+conclusion:
+Subclassing need to be reworked to:
+- instantiate the test case for real when a concrete derived class exist
+- store an abstract test meta in suite
+- materialize on concrete class
+
+
+Need to separate Suite from TestMeta.
+=> break the inheritance, only test cases are runnable
+
+Go for minimal test suite for now:
+- has a name
+- may have a parent test suite
+- may have child test suites
+- may have TestCaseMeta
+
+How and where are suite stored ?
+=> want to make path separator configurable
+=> this means that static parent/child relationship must be stored
+=> but interpretation occurs at run-time
+=> need to keep a list of TestMeta associated to a suite
+
+
+
+*/
+
+
+/// Parent suite macro below can be implemented as follow:
+/// Alls tests between BEGIN / END are registered in the specified suite.
+/// @param name use '/' to separate parent and child suite
+///             Starts the name with '/' to make the suite a root suite visible to all.
+/// Notes: this can be implemented as a set of nested anonymous namespace:
+/// using CppUT::parentSuite;
+/// namespace { // CPPUT_BEGIN_SUITE( "Trading" )
+///    const char *currentSuite = "Trading";
+///    namespace { // CPPUT_BEGIN_SUITE( "Forex" )
+///        const char *currentSuite = "Forex";
+///    } // CPPUT_END_SUITE
+/// } // CPPUT_END_SUITE
+
+
+// Parent Suite Declaration
+#define CPPUT_SET_DEFAULT_SUITE( name )
+#define CPPUT_SUITE( name )
+#define CPPUT_NESTED_SUITE( name )
+#define CPPUT_END_NESTED_SUITE
+#define CPPUT_END_SUITE
+
+// Parenting suite
+#define CPPUT_PARENT_SUITE( parentName, childName )
+
+// Plain C function
+#define CPPUT_REGISTER_TEST_FUNCTION( testFunction )
+#define CPPUT_TEST( testFunctionName )
+
+// Lightweight fixture
+#define CPPUT_TEST_LIGHT_FIXTURE( FixtureType, testName )
+#define CPPUT_TEST_LIGHT_FIXTURE_WITH_SPECIFICS( FixtureType, testName, specifics )
+
+} // namespace CppUT
+
+
+
+#endif // CPPUT_INTERFACE_INCLUDED_H
 
=== modified file 'cppunit2/include/cpput/lightfixture.h'
--- cppunit2/include/cpput/lightfixture.h	2007-08-15 15:48:29 +0000
+++ cppunit2/include/cpput/lightfixture.h	2009-03-13 20:59:56 +0000
@@ -6,38 +6,54 @@
 # include "testcase.h"
 # include "registry.h"
 
-/*! \bief Implementation detail for light fixture: make class name.
- */
-#define _CPPUT_LF_CLASS( FixtureType, testName ) \
-   FixtureType##_##testName
-
-/*! \brief Implementation detail for light fixture.
- * Implementation Notes: a class deriving from the \c FixtureType is created 
- * for each test. The user actually implement the member function named after \c testName.
- */
-#define _CPPUT_TEST_LIGHT_FIXTURE_IMPL( FixtureType, testName, specificsCode )            \
-   class _CPPUT_LF_CLASS(FixtureType,testName) : public FixtureType                       \
-                                               , public ::CppUT::TestExtendedDataFactory  \
-   {                                                                                      \
-   public:                                                                                \
-      static ::CppUT::TestPtr cpputMakeTest() /* TestFactory */                           \
-      {                                                                                   \
-         ::CppUT::TestPtr test( ::CppUT::makeTestCase(                                    \
-            &_CPPUT_LF_CLASS(FixtureType,testName)::cpputTest, #testName ) );             \
-         specificsCode                                                                    \
-         return test;                                                                     \
-      }                                                                                   \
-   public:                                                                                \
-      static void cpputTest()                                                             \
-      {                                                                                   \
-         _CPPUT_LF_CLASS(FixtureType,testName) fixture;                                   \
-         fixture.testName();                                                              \
-      }                                                                                   \
-      void testName();                                                                    \
-   };                                                                                     \
-   CPPUT_REGISTER_TESTFACTORY_IN( &_CPPUT_LF_CLASS(FixtureType,testName)::cpputMakeTest,  \
-                                  #FixtureType );                                         \
-   void _CPPUT_LF_CLASS(FixtureType,testName)::testName()
+namespace CppUT {
+   namespace Impl {
+      inline TestMeta 
+      declareFixtureTestCase( TestCaseFactoryFn factory,
+                              const char *fixtureSuiteName,
+                              const char *testCaseName,
+                              Suite &parentSuite )
+      {
+         TestMeta test( factory, testCaseName );
+         parentSuite.makeNestedSuite( fixtureSuiteName ).add( test );
+         return test;
+      }
+
+      inline TestMeta 
+      declareFixtureTestCase( TestCaseFactoryFn factory,
+                              const char *fixtureSuiteName,
+                              const char *testCaseName,
+                              const ::CppUT::TestExtendedData &metaData,
+                              Suite &parentSuite )
+      {
+         MetaData testMetaData( testCaseName );
+         metaData.apply( testMetaData );
+         TestMeta test( factory, testMetaData );
+         parentSuite.makeNestedSuite( fixtureSuiteName ).add( test );
+         return test;
+      }
+   }
+}
+
+#define _CPPUT_FIXTURE_TEST_COMMON( FixtureType, testFunction )         \
+   class FixtureType##testFunction : public FixtureType                 \
+   {                                                                    \
+      static ::CppUT::TestMeta testMeta;                                \
+   public:                                                              \
+      static ::CppUT::TestCase *cpputFactory()                          \
+      {                                                                 \
+         return new FixtureType##testFunction();                        \
+      }                                                                 \
+                                                                        \
+   public: /* overriden from CppUT::TestCase */                         \
+      virtual void run();                                               \
+   };                                                                   \
+                                                                        \
+   ::CppUT::TestMeta FixtureType##testFunction::testMeta(               \
+      ::CppUT::Impl::declareFixtureTestCase(                            \
+                              &FixtureType##testFunction::cpputFactory, \
+                              #FixtureType,                             \
+                              #testFunction,                            \
 
 /*! \brief Declare and register a light fixture test case.
  * The test case is named after the function name and register in the suite named after 
@@ -57,8 +73,12 @@
  * }
  * \endCode
  */
-#define CPPUT_TEST_LIGHT_FIXTURE( FixtureType, testName )                      \
-   _CPPUT_TEST_LIGHT_FIXTURE_IMPL( FixtureType, testName, (void)0; )
+#define CPPUT_FIXTURE_TEST( FixtureType, testFunction )                 \
+   _CPPUT_FIXTURE_TEST_COMMON( FixtureType, testFunction )              \
+                              CPPUT_CURRENT_SUITE() ) );                \
+                                                                        \
+   void FixtureType##testFunction::run()
+
 
 /*! \brief Declare and register a light fixture test case with extended data.
  * The test case is named after the function name and register in the suite named after 
@@ -78,19 +98,16 @@
  * }
  * \endCode
  */
-#define CPPUT_TEST_LIGHT_FIXTURE_WITH_SPECIFICS( FixtureType, testName, specifics )       \
-   _CPPUT_TEST_LIGHT_FIXTURE_IMPL( FixtureType, testName,                                 \
-         ( specifics ).apply( *test ); )
-
-/*! \brief register the light fixture suite to the default Registry suite.
- */
-#define CPPUT_REGISTER_LIGHT_FIXTURE( FixtureType ) \
-   CPPUT_REGISTER_SUITE_RELATIONSHIP_TO_DEFAULT( #FixtureType )
-
-/*! \brief register the light fixture suite to the specified Registry suite.
- */
-#define CPPUT_REGISTER_LIGHT_FIXTURE_IN( FixtureType, parentSuiteName ) \
-   CPPUT_REGISTER_SUITE_RELATIONSHIP( #FixtureType, parentSuiteName )
+#define CPPUT_FIXTURE_TEST_WITH_META( FixtureType, testFunction, metaData ) \
+   _CPPUT_FIXTURE_TEST_COMMON( FixtureType, testFunction )              \
+                              metaData,                                 \
+                              CPPUT_CURRENT_SUITE() ) );                \
+                                                                        \
+   void FixtureType##testFunction::run()
+
+#define CPPUT_EXPORTED_FIXTURE_SUITE( FixtureType, exportedVariableName )  \
+   extern ::CppUT::SuiteMeta exportedVariableName(                         \
+   CPPUT_CURRENT_SUITE().makeNestedSuite( #FixtureType ) )
 
 
 #endif // CPPUT_LIGHTFIXTURE_H_INCLUDED
 
=== modified file 'cppunit2/include/cpput/lighttestrunner.h'
--- cppunit2/include/cpput/lighttestrunner.h	2008-12-18 22:15:59 +0000
+++ cppunit2/include/cpput/lighttestrunner.h	2008-12-21 13:50:58 +0000
@@ -3,6 +3,7 @@
 
 # include <cpput/forwards.h>
 # include <cpput/testinfo.h>
+# include <cpput/registry.h>
 # include <cpptl/intrusiveptr.h>
 # include <deque>
 
@@ -18,9 +19,9 @@
 
       virtual ~LightTestRunner();
 
-      void addTest( const TestPtr &test );
+      void addSuite( const Suite &suite );
 
-      bool runAllTests();
+      bool runTests();
 
    private: // overridden from TestResultUpdater
       virtual void addResultLog( const Json::Value &log );
@@ -28,9 +29,8 @@
       virtual void addResultAssertion( const Assertion &assertion );
 
    private:
-      void runTest( const TestPtr &test );
-      void runTestSuite( const TestSuitePtr &suite );
-      void runTestCase( const AbstractTestCasePtr &testCase );
+      void runTestSuite( const Suite &suite );
+      void runTestCase( const TestMeta &testCase );
       CppTL::ConstString getTestPath() const;
       void reportFailure( const Assertion &failure );
       void reportLog( const Json::Value &log );
@@ -41,8 +41,8 @@
          bool isLog_;
       };
 
-      typedef std::deque<TestPtr> Tests;
-      Tests tests_;
+      typedef std::deque<Suite> SuitesToRun;
+      SuitesToRun suitesToRun_;
       typedef std::deque<CppTL::ConstString> TestPath;
       TestPath testPath_;
       CppTL::StringBuffer report_;
 
=== renamed file 'cppunit2/include/cpput/test.h' => 'cppunit2/include/cpput/metadata.h'
--- cppunit2/include/cpput/test.h	2006-09-03 05:15:49 +0000
+++ cppunit2/include/cpput/metadata.h	2009-03-13 21:39:02 +0000
@@ -1,30 +1,37 @@
-#ifndef CPPUT_TEST_H_INCLUDED
-# define CPPUT_TEST_H_INCLUDED
+#ifndef CPPUT_METADATA_H_INCLUDED
+# define CPPUT_METADATA_H_INCLUDED
 
 # include <cpput/forwards.h>
 # include <json/value.h>
 # include <cpptl/conststring.h>
 # include <cpptl/intrusiveptr.h>
+# include <cpput/extendeddata.h>
 # include <string>
 
 
 namespace CppUT {
 
-class TestVisitor;
-
 /*! This class represents the data about a test.
  * \ingroup group_testcases
  *
- * It is the base class of AbstractTestCase and AbstractTestSuite.
+ * It is the base class of TestMeta.
  */
-class CPPUT_API Test : public CppTL::IntrusiveCount
+class CPPUT_API MetaData : public CppTL::IntrusiveCount
 {
-   // ensure that this class can only be derived by AbstractTestCase and
-   // AbstractTestSuite.
-   friend class AbstractTestCase;
-   friend class AbstractTestSuite;
 public:
-   virtual ~Test()
+   explicit MetaData( const std::string &name )
+   {
+      info_["configuration/name"] = name;
+   }
+
+   explicit MetaData( const std::string &name,
+                      const TestExtendedData &metaDataFactory )
+   {
+      info_["configuration/name"] = name;
+      metaDataFactory.apply( *this );
+   }
+
+   virtual ~MetaData()
    {
    }
 
@@ -68,13 +75,6 @@
       return info_["configuration"]["groups"][index].asString();
    }
 
-   /// @warning You must never change the name of the test after
-   /// registering the test or scheduling it for running.
-   void setName( const std::string &name )
-   {
-      info_["configuration/name"] = name;
-   }
-
    //OpenTest::PropertiesAccessor info() const
    //{
    //   return info_.accessor();
@@ -87,28 +87,6 @@
    //   return info_;
    //}
 
-   /// Returns \c true if the class is derived from AbstractTestSuite.
-   bool isTestSuite() const
-   {
-      return !isTestCase();
-   }
-
-   virtual void accept( TestVisitor &visitor ) = 0;
-
-   /// Returns \c true if the class is derived from AbstractTestCase.
-   virtual bool isTestCase() const = 0;
-
-private:
-   Test()
-   {
-      setName( "<undefined>" );
-   }
-
-   Test( const std::string &name )
-   {
-      setName( name );
-   }
-
 private:
    Json::Value info_;
 };
@@ -116,4 +94,4 @@
 
 } // namespace CppUT
 
-#endif // CPPUT_TEST_H_INCLUDED
+#endif // CPPUT_METADATA_H_INCLUDED
 
=== modified file 'cppunit2/include/cpput/parametrizedsource.h'
--- cppunit2/include/cpput/parametrizedsource.h	2005-02-27 13:38:28 +0000
+++ cppunit2/include/cpput/parametrizedsource.h	2008-12-11 20:28:30 +0000
@@ -78,7 +78,7 @@
    SuitePaths suitePath_;
 };
 /*
-class ParametrizedTestCase : public AbstractTestCase
+class ParametrizedTestCase : public TestCase
 {
 public:
 };
 
=== modified file 'cppunit2/include/cpput/registry.h'
--- cppunit2/include/cpput/registry.h	2007-08-15 09:20:57 +0000
+++ cppunit2/include/cpput/registry.h	2008-12-21 13:50:58 +0000
@@ -1,288 +1,248 @@
-#ifndef CPPUT_REGISTRY_H_INCLUDED
-# define CPPUT_REGISTRY_H_INCLUDED
-
-# include <cpput/forwards.h>
-# include <cpptl/conststring.h>
-# include <cpptl/functor.h>
-# include <deque>
-# include <map>
-
-
-namespace CppUT {
-
-/*! \ingroup group_testregistry
-*/
-typedef CppTL::Functor0R<TestPtr> TestFactory;
-
-/*! \ingroup group_testregistry
-*/
-typedef int TestFactoryId;
-
-
-/*! \ingroup group_testregistry
- * Static registry for all tests.
- * Any suite or test added to the registry by a dynamic library that contains test should
- * be removed using remove(). Helper macros take carre of this.
- */
-class CPPUT_API Registry
-{
-public:
-   static std::string defaultParentSuiteName();
-
-   static Registry &instance();
-
-   Registry();
-
-   void addChild( const std::string &parentSuiteName,
-                  const std::string &childSuiteName );
-   void addChildToDefault( const std::string &childSuiteName );
-
-   bool removeChild( const std::string &parentSuiteName,
-                     const std::string &childSuiteName );
-
-   TestFactoryId add( const std::string &parentSuiteName,
-                      const TestFactory &testFactory );
-   TestFactoryId add( const std::string &parentSuiteName,
-                      TestPtr (*factory)() );
-   TestFactoryId add( const std::string &parentSuiteName,
-                      TestPtr (*factory)( const std::string &suiteName ),
-                      const std::string &suiteName = std::string("") );
-
-   TestFactoryId addToDefault( const TestFactory &testFactory );
-   TestFactoryId addToDefault( TestPtr (*factory)() );
-   TestFactoryId addToDefault( TestPtr (*factory)( const std::string &suiteName ),
-                               const std::string &suiteName = std::string("") );
-
-   bool remove( TestFactoryId testFactoryId );
-
-   TestSuitePtr createTests( const std::string &suiteName ) const;
-
-   TestSuitePtr createDefaultTests() const;
-
-   void addCreatedTests( const std::string &suiteName,
-                         const TestSuitePtr &suite ) const;
-
-private:
-   void addChildSuite( const std::string &suiteName, 
-                       const TestSuitePtr &suite ) const;
-
-   void addSuiteRegisteredTests( const std::string &suiteName, 
-                                 const TestSuitePtr &suite ) const;
-
-   TestFactoryId nextFactoryId();
-
-   typedef std::pair<TestFactory, TestFactoryId> TestFactoryWithId;
-   
-   typedef std::deque<TestFactoryWithId> TestFactories;
-   typedef std::map<CppTL::ConstString,TestFactories> TestFactoryRegistry;
-   TestFactoryRegistry registry_;
-
-   typedef std::multimap<CppTL::ConstString,CppTL::ConstString> ParentChildRelationShips;
-   ParentChildRelationShips relations_;
-
-   typedef std::map<TestFactoryId,CppTL::ConstString> TestFactoryParentSuiteById;
-   TestFactoryParentSuiteById parentSuiteById_;
-
-   TestFactoryId nextId_;
-};
-
-
-namespace Impl {
-   
-   enum RegisterToNamedSuiteTag {
-      registerToNamedSuite
-   };
-
-} // namespace Impl
-
-
-/*! \ingroup group_testregistry
-*/
-template<class SuiteType>
-class SuiteRegisterer
-{
-public:
-   SuiteRegisterer()
-   {
-      testFactoryId_ = Registry::instance().addToDefault( &SuiteType::suite );
-   }
-
-   SuiteRegisterer( const std::string &suiteName )
-   {
-      testFactoryId_ = Registry::instance().addToDefault( &SuiteType::suite, 
-                                                          suiteName );
-   }
-
-   SuiteRegisterer( Impl::RegisterToNamedSuiteTag,
-                    const std::string &parentSuiteName )
-   {
-      testFactoryId_ = Registry::instance().add( parentSuiteName,
-                                                 &SuiteType::suite );
-   }
-
-   SuiteRegisterer( Impl::RegisterToNamedSuiteTag,
-                    const std::string &parentSuiteName, 
-                    const std::string &suiteName )
-   {
-      testFactoryId_ = Registry::instance().add( parentSuiteName,
-                                                 &SuiteType::suite,
-                                                 suiteName );
-   }
-
-   ~SuiteRegisterer()
-   {
-      Registry::instance().remove( testFactoryId_ );
-   }
-
-protected:
-   SuiteRegisterer( TestFactoryId testFactoryId ):
-         testFactoryId_( testFactoryId )
-   {
-   }
-
-private:
-   TestFactoryId testFactoryId_;
-};
-
-
-
-/*! \ingroup group_testregistry
-*/
-#define CPPUT_REGISTER_NAMED_SUITE_TO_DEFAULT( TestFixtureType, suiteName )  \
-  static CppUT::SuiteRegisterer< TestFixtureType >                           \
-             CPPTL_MAKE_UNIQUE_NAME(cpputSuiteRegisterer )(suiteName);
-
-
-/*! \ingroup group_testregistry
-*/
-#define CPPUT_REGISTER_SUITE_TO_DEFAULT( TestFixtureType )                   \
-  static CppUT::SuiteRegisterer< TestFixtureType >                           \
-             CPPTL_MAKE_UNIQUE_NAME(cpputSuiteRegisterer );
-
-
-/*! \ingroup group_testregistry
-*/
-#define CPPUT_REGISTER_SUITE_IN( TestFixtureType, parentSuiteName )          \
-  static CppUT::SuiteRegisterer< TestFixtureType >                           \
-             CPPTL_MAKE_UNIQUE_NAME(cpputSuiteRegisterer)(                   \
-                     CppUT::Impl::registerToNamedSuite,                      \
-                     parentSuiteName );
-
-
-/*! \ingroup group_testregistry
-*/
-#define CPPUT_REGISTER_NAMED_SUITE_IN( TestFixtureType,                      \
-                                       parentSuiteName,                      \
-                                       suiteName )                           \
-  static CppUT::SuiteRegisterer< TestFixtureType >                           \
-             CPPTL_MAKE_UNIQUE_NAME(cpputSuiteRegisterer )(                  \
-                     CppUT::Impl::registerToNamedSuite,                      \
-                     parentSuiteName,                                        \
-                     suiteName );
-
-/*! \ingroup group_testregistry
-*/
-class SuiteRelationshipRegisterer
-{
-public:
-   explicit SuiteRelationshipRegisterer( const std::string &childSuiteName )
-      : childSuiteName_( childSuiteName )
-      , parentSuiteName_( Registry::defaultParentSuiteName() )
-   {
-      Registry::instance().addChildToDefault( childSuiteName );
-   }
-
-   SuiteRelationshipRegisterer( const std::string &parentSuiteName,
-                                const std::string &childSuiteName )
-      : parentSuiteName_( parentSuiteName )
-      , childSuiteName_( childSuiteName )
-   {
-      Registry::instance().addChild( parentSuiteName, childSuiteName );
-   }
-
-   ~SuiteRelationshipRegisterer()
-   {
-      Registry::instance().removeChild( parentSuiteName_.str(), 
-                                        childSuiteName_.str() );
-   }
-
-private:
-   CppTL::ConstString parentSuiteName_;
-   CppTL::ConstString childSuiteName_;
-};
-
-
-/*! \ingroup group_testregistry
-*/
-#define CPPUT_REGISTER_SUITE_RELATIONSHIP( parentSuiteName, childSuiteName ) \
-   static ::CppUT::SuiteRelationshipRegisterer                               \
-             CPPTL_MAKE_UNIQUE_NAME(cpputSuiteRelationShipRegisterer )(      \
-                                            parentSuiteName,                 \
-                                            childSuiteName )
-
-
-/*! \ingroup group_testregistry
-*/
-#define CPPUT_REGISTER_SUITE_RELATIONSHIP_TO_DEFAULT( childSuiteName )       \
-   static ::CppUT::SuiteRelationshipRegisterer                               \
-             CPPTL_MAKE_UNIQUE_NAME(cpputSuiteRelationShipRegisterer )(      \
-                                            childSuiteName )
-
-
-// Plain C function tests
-
-/*! \ingroup group_testregistry
- * \brief Helper object used to statically register a TestFactory.
- */
-class TestFactoryRegisterer
-{
-public:
-   typedef TestPtr (*FactoryFn)();
-
-   TestFactoryRegisterer( FactoryFn testFactory )
-   {
-      testFactoryId_ = Registry::instance().addToDefault( CppTL::cfn0r<TestPtr>(testFactory) );
-   }
-
-   TestFactoryRegisterer( TestFactory testFactory )
-   {
-      testFactoryId_ = Registry::instance().addToDefault( testFactory );
-   }
-
-   TestFactoryRegisterer( TestFactory testFactory, const std::string &parentSuiteName )
-   {
-      testFactoryId_ = Registry::instance().add( parentSuiteName, testFactory );
-   }
-
-   TestFactoryRegisterer( FactoryFn testFactory, const std::string &parentSuiteName )
-   {
-      testFactoryId_ = Registry::instance().add( parentSuiteName, CppTL::cfn0r<TestPtr>(testFactory) );
-   }
-
-   ~TestFactoryRegisterer()
-   {
-      Registry::instance().remove( testFactoryId_ );
-   }
-
-private:
-   TestFactoryId testFactoryId_;
-};
-
-/*! \ingroup group_testregistry
- * \brief Register the specified TestFactory in the default Registry suite.
- */
-#define CPPUT_REGISTER_TESTFACTORY_TO_DEFAULT( testFactory )               \
-   static ::CppUT::TestFactoryRegisterer                                   \
-      CPPTL_MAKE_UNIQUE_NAME(cpputTestFactoryRegisterer)( testFactory )
-
-/*! \ingroup group_testregistry
- * \brief Register the specified TestFactory in the specified Registry suite.
- */
-#define CPPUT_REGISTER_TESTFACTORY_IN( testFactory, parentSuiteName )      \
-   static ::CppUT::TestFactoryRegisterer                                   \
-      CPPTL_MAKE_UNIQUE_NAME(cpputTestFactoryRegisterer)( testFactory, parentSuiteName )
-
-} // namespace CppUT
-
-
-#endif // CPPUT_REGISTRY_H_INCLUDED
+#ifndef CPPUT_REGISTRY_H_INCLUDED
+# define CPPUT_REGISTRY_H_INCLUDED
+
+# include <cpput/forwards.h>
+# include <cpptl/conststring.h>
+# include <cpptl/functor.h>
+# include <deque>
+# include <map>
+
+namespace CppUT {
+   namespace Impl {
+      class RegistryImpl;
+      class SuiteImpl;
+
+      /// Creates a suite with the specified name and makes it the new default root suite.
+      /// The suite is nested into the current default root suite if any,
+      /// or the top level root suite otherwise.
+      /// @return Always \c NULL.
+      StaticSuite *makeAndSetDefaultRootSuite( const char *name );
+
+      /// Sets the default root suite to the top level root suite.
+      /// @return Always \c NULL.
+      StaticSuite *resetDefaultRootSuite();
+
+      /// Creates a suite with the specified name.
+      /// The suite is nested into the current default suite if any,
+      /// or the top level root suite otherwise.
+      /// @return Always \c NULL.
+      StaticSuite *makeNestedSuiteInDefaultRootSuite( const char *name );
+
+      /// Makes \c suite a child of \c parentSuite.
+      /// \c suite is removed from its current parent and make
+      /// a nested suite of \c parentSuite.
+      /// @return Always \c NULL.
+      StaticSuite *reparentSuite( Suite &parentSuite, 
+                                  Suite &suite );
+
+
+      SuiteMeta currentSuite(); 
+   } // namespace Impl
+
+// internal
+#define _CPPUT_DECLARE_ROOT_SUITE( name, factory )                \
+   static ::CppUT::StaticSuite *                                  \
+      CPPTL_MAKE_UNIQUE_NAME(cpputRootSuite) =                    \
+      ::CppUT::Impl::factory( name )
+
+
+///*! \ingroup group_testregistry
+class Suite
+{
+   friend class Impl::RegistryImpl;
+   friend class SuiteMeta;
+public:
+   /// Creates an invalid suite.
+   Suite();
+
+   /// Creates a new orphaned suite
+   Suite( const std::string &name );
+
+   //Suite( const Suite &other );
+   ~Suite();
+
+   //Suite &operator =( const Suite &other );
+
+   Suite parent() const;
+
+   bool isValid() const;
+
+   std::string name() const;
+
+   int nestedSuiteCount() const;
+   Suite nestedSuiteAt( int index ) const;
+   Suite nestedSuiteByName( const std::string &name ) const;
+   Suite makeNestedSuite( const std::string &name );
+
+   int testCaseCount() const;
+   const TestMeta *testCaseAt( int index ) const;
+
+   void add( const TestMeta &testCase );
+
+private:
+   Suite( Impl::SuiteImpl *suite );
+   Impl::SuiteImpl *impl_;
+};
+
+
+/*! \ingroup group_testregistry
+ * \brief Static Suite description handle.
+ */
+class SuiteMeta : public Suite
+{
+   friend class Impl::RegistryImpl;
+public:
+   ~SuiteMeta();
+
+   /// Returns the suite.
+   /// \internal Implementation detail of for CPPUT_CURRENT_SUITE().
+   SuiteMeta &operator()();
+
+private:
+   explicit SuiteMeta( Impl::SuiteImpl *impl );
+};
+
+
+/*! \ingroup group_testregistry
+ * Static registry for all tests.
+ * Any suite or test added to the registry by a dynamic library that contains test should
+ * be removed using remove(). Helper macros take carre of this.
+ */
+class CPPUT_API Registry
+{
+public:
+   static Suite getRootSuite();
+
+   static std::string dump();
+
+private:
+
+//
+//   static std::string defaultParentSuiteName();
+//
+//   static Registry &instance();
+//
+//   Registry();
+//
+//   void addChild( const std::string &parentSuiteName,
+//                  const std::string &childSuiteName );
+//   void addChildToDefault( const std::string &childSuiteName );
+//
+//   bool removeChild( const std::string &parentSuiteName,
+//                     const std::string &childSuiteName );
+//
+//   TestFactoryId add( const std::string &parentSuiteName,
+//                      const TestFactory &testFactory );
+//   TestFactoryId add( const std::string &parentSuiteName,
+//                      TestPtr (*factory)() );
+//   TestFactoryId add( const std::string &parentSuiteName,
+//                      TestPtr (*factory)( const std::string &suiteName ),
+//                      const std::string &suiteName = std::string("") );
+//
+//   TestFactoryId addToDefault( const TestFactory &testFactory );
+//   TestFactoryId addToDefault( TestPtr (*factory)() );
+//   TestFactoryId addToDefault( TestPtr (*factory)( const std::string &suiteName ),
+//                               const std::string &suiteName = std::string("") );
+//
+//   bool remove( TestFactoryId testFactoryId );
+//
+//   TestSuitePtr createTests( const std::string &suiteName ) const;
+//
+//   TestSuitePtr createDefaultTests() const;
+//
+//   void addCreatedTests( const std::string &suiteName,
+//                         const TestSuitePtr &suite ) const;
+//
+//private:
+//   void addChildSuite( const std::string &suiteName, 
+//                       const TestSuitePtr &suite ) const;
+//
+//   void addSuiteRegisteredTests( const std::string &suiteName, 
+//                                 const TestSuitePtr &suite ) const;
+//
+//   TestFactoryId nextFactoryId();
+//
+//   typedef std::pair<TestFactory, TestFactoryId> TestFactoryWithId;
+//   
+//   typedef std::deque<TestFactoryWithId> TestFactories;
+//   typedef std::map<CppTL::ConstString,TestFactories> TestFactoryRegistry;
+//   TestFactoryRegistry registry_;
+//
+//   typedef std::multimap<CppTL::ConstString,CppTL::ConstString> ParentChildRelationShips;
+//   ParentChildRelationShips relations_;
+//
+//   typedef std::map<TestFactoryId,CppTL::ConstString> TestFactoryParentSuiteById;
+//   TestFactoryParentSuiteById parentSuiteById_;
+//
+//   TestFactoryId nextId_;
+};
+
+
+/*! \ingroup group_testregistry
+ * \brief Set the default test suite.
+ * This is a convenience function to be used in an header. It defined the default
+ * parent suite for all tests including that headers. This is typically used to
+ * group all tests of a given library under the same parent suite.
+ *
+ * \code
+ * // MyLib/testing.h
+ * #ifndef MYLIB_TESTING_H_INCLUDED
+ * # define MYLIB_TESTING_H_INCLUDED
+ * # include <cpput/registry.h>
+ * CPPUT_SET_DEFAULT_SUITE( "MyLib" );
+ * #endif
+ * // MyLib/test1.cpp
+ * #include "testing.h"
+ * // TestCase "test1" will be placed into the suite "MyLib"
+ * CPPUT_TEST( test1 ) { // ...
+ * }
+ * // MyLib/test2.cpp
+ * #include "testing.h"
+ * // TestCase "test1" will be placed into the suite "MyLib"
+ * CPPUT_TEST( test1 ) { // ...
+ * }
+ * \endcode
+ * \warning You must use CPPUT_NESTED_SUITE if you want to put test in a child suite of
+ *          MyLib.
+ */
+#define CPPUT_SET_DEFAULT_SUITE( name )                              \
+   namespace {                                                       \
+      _CPPUT_DECLARE_ROOT_SUITE( name, makeAndSetDefaultRootSuite ); \
+   }
+
+/*! \ingroup group_testregistry
+ * \brief Returns the suite test will register in the context were the macro occurs.
+ * Notes: this is mostly an implementation detail. Should not need this unless you are
+ * creating  some new kind of test case factor like CPPUT_TEST, CPPUT_FIXTURE_TEST...
+ * @return This macro expand into an expression of type CppUT::SuiteMeta.
+ */
+#define CPPUT_CURRENT_SUITE() \
+   ::CppUT::Impl::currentSuite()
+
+
+/*! \ingroup group_testregistry
+ * \brief Declares the root parent suite of tests until CPPUT_END_SUITE.
+ */
+#define CPPUT_SUITE( name )                                                \
+   _CPPUT_DECLARE_ROOT_SUITE( name, makeNestedSuiteInDefaultRootSuite );   \
+   namespace
+
+#define CPPUT_SUITE_REGISTER( FixtureType )                    \
+   static ::CppUT::StaticSuite *                               \
+      CPPTL_MAKE_UNIQUE_NAME(cpputRegisterFixtureSuite) =      \
+      ::CppUT::Impl::reparentSuite( CPPUT_CURRENT_SUITE(),     \
+                                    FixtureType :: suite() )
+
+} // namespace CppUT
+
+
+namespace {
+   // Cause the static initializer to be called in each translation unit,
+   // Reset the current suite to the top root suite.
+   static ::CppUT::StaticSuite *cpputTopRootSuite = 
+      ::CppUT::Impl::resetDefaultRootSuite();
+} // end anonymous namespace
+
+
+
+#endif // CPPUT_REGISTRY_H_INCLUDED
 
=== modified file 'cppunit2/include/cpput/tablefixture.h'
--- cppunit2/include/cpput/tablefixture.h	2007-08-16 13:51:04 +0000
+++ cppunit2/include/cpput/tablefixture.h	2008-12-11 20:28:30 +0000
@@ -453,7 +453,7 @@
    };
 
 
-   class TableFixture : public AbstractTestCase
+   class TableFixture : public TestCase
    {
    public:
       typedef void (TableFixture::*ActionFn)();
 
=== modified file 'cppunit2/include/cpput/testcase.h'
--- cppunit2/include/cpput/testcase.h	2008-07-13 06:19:20 +0000
+++ cppunit2/include/cpput/testcase.h	2009-03-13 21:39:02 +0000
@@ -2,9 +2,10 @@
 # define CPPUT_TESTCASE_H_INCLUDED
 
 # include <cpput/forwards.h>
+# include <cpput/extendeddata.h>
 # include <cpptl/functor.h>
 # include <cpput/resource.h>
-# include <cpput/test.h>
+# include <cpput/metadata.h>
 # include <string>
 # include <set>
 # include <vector>
@@ -12,41 +13,93 @@
 
 namespace CppUT {
 
+typedef CppTL::Functor0R<TestCase *> TestCaseFactory;
+typedef TestCase *(*TestCaseFactoryFn)();
+
 /*! \brief An abstract test case that can be run.
  * \ingroup group_testcases
  */
-class CPPUT_API AbstractTestCase : public Test
-{
-public:
-   AbstractTestCase( const std::string &name );
+class CPPUT_API TestCase : public TestExtendedDataFactory
+{
+   friend class TestMeta;
+public:
+   TestCase();
+
+   virtual ~TestCase();
+
+   virtual void setUp();
+
+   virtual void run() = 0;
+
+   virtual void tearDown();
+
+   //void setUpTestResources();
+
+   //void tearDownTestResources();
+};
+
+
+template<class FunctorType>
+class FunctorTestCase : public TestCase
+{
+public:
+   static TestCase *factory( FunctorType run )
+   {
+      return new FunctorTestCase<FunctorType>( run );
+   }
+
+   FunctorTestCase( FunctorType run )
+      : run_( run )
+   {
+   }
+
+public: // overriden from TestCase
+   virtual void run()
+   {
+      run_();
+   }
+
+private:
+   FunctorType run_;
+};
+
+
+
+
+/*! \brief A test case that can be run.
+ * \ingroup group_testcases
+ */
+class CPPUT_API TestMeta : public MetaData
+{
+public:
+   TestMeta( const TestCaseFactory &factory,
+             const std::string &name );
+
+   TestMeta( TestCaseFactoryFn factory,
+             const std::string &name );
+
+   TestMeta( const TestCaseFactory &factory,
+             const MetaData &metaData );
+
+   TestMeta( TestCaseFactoryFn factory,
+             const MetaData &metaData );
 
    /*! \brief Indicates that the test case requires the specified resource.
     *
     * The specified resource will be acquired before calling setUp() and
-    * will be at the earliest after calling tearDown().
+    * will be released at the earliest after calling tearDown().
     *
     * \param resourceName Name of the resource to acquire.
     * \see ResourceHandlerRegistry, getResource().
     */
    void requireResource( const std::string &resourceName );
 
-   /*! \brief Prepare the acquisition of resource at the beginning of the test run.
-    *
-    * This must be called at the beginning of the test run for each test case.
-    * It allows couting how many time a resource will be used and during
-    * the test run, determining when a resource is no longer needed to free it.
-    *
-    * A ResourceLazyPtr is obtained for each required resource via the
-    * ResourceHandlerRegistry.
-    */
-   void prepareResourceAcquisition();
-
    /*! \brief Run the test case using the default ExceptionGuard.
     *
     * The default exception guard only detect 
     * 
     */
-   bool runTest();
+   bool runTest() const;
 
    /*! \brief Run the test case using the specified ExceptionGuard.
     *
@@ -60,126 +113,94 @@
     *                    information for failure report from exception 
     *                    that do not subclass std::exception.
     */
-   bool runTest( const ExceptionGuard &guardsChain );
-
-public: // overridden from Test
-   void accept( TestVisitor &visitor );
-
-   /// Returns \c true if the class is derived from AbstractTestCase.
-   bool isTestCase() const;
-
-// Those member functions are public to allow decoration of setUp/run/tearDown
-public:
-   virtual void setUp();
-
-   virtual void run() = 0;
-
-   virtual void tearDown();
+   bool runTest( const ExceptionGuard &guardsChain ) const;
 
 private:
+   typedef std::vector<ResourceLazyPtr> RequiredResources;
+
+   /// @todo fix framework to call this when scheduling tests
+   /*! \brief Prepare the acquisition of resource at the beginning of the test run.
+    *
+    * This must be called at the beginning of the test run for each test case.
+    * It allows couting how many time a resource will be used and during
+    * the test run, determining when a resource is no longer needed to free it.
+    *
+    * A ResourceLazyPtr is obtained for each required resource via the
+    * ResourceHandlerRegistry.
+    */
+   void prepareResourceAcquisition( RequiredResources &requiredResources) const;
+
    /*! \brief Acquires and setup the resource required by the test case.
     * Notes: If you decorate the test case, you must ensure
     * that you also decorate call to acquireTestResource().
     * \return \c true if all resources were acquired, \c false otherwise.
     */
-   virtual void acquireTestResources( bool &allResourceAcquired );
-
-   /*! \brief 
-    */
-   void setUpTestResources();
-
-   void tearDownTestResources();
+   void acquireTestResources( bool &allResourceAcquired ) const;
 
 private:
    typedef std::set<ResourceName> ResourceNames;
    /// Required resource names
    ResourceNames resourceNames_;
-   typedef std::vector<ResourceLazyPtr> RequiredResources;
-   RequiredResources requiredResources_;
-};
-
-
-/*! \brief A test case that can be run.
- * \ingroup group_testcases
- */
-class CPPUT_API TestCase : public AbstractTestCase
-{
-public:
-   TestCase( const CppTL::Functor0 &run,
-             const std::string &name );
-
-   TestCase( const CppTL::Functor0 &setUp,
-             const CppTL::Functor0 &run,
-             const CppTL::Functor0 &tearDown,
-             const std::string &name );
-
-public: // overridden from AbstractTestCase
-   void setUp();
-
-   void run();
-
-   void tearDown();
-
-private:
-   CppTL::Functor0 setUp_;
-   CppTL::Functor0 run_;
-   CppTL::Functor0 tearDown_;
-};
-
-
-
-/*! \brief Creates a TestCase with the specified name and run functor.
- * \ingroup group_testcases
- */
-TestPtr CPPUT_API makeTestCase( void (*run)(),
-                                const std::string &name );
-
-
-/*! \brief Creates a TestCase with the specified name and run functor.
- * \ingroup group_testcases
- */
-TestPtr CPPUT_API makeTestCase( const CppTL::Functor0 &run,
-                                const std::string &name );
-
-
-/*! \brief Creates a TestCase with the specified name and setUp, run, and tearDown functor.
- * \ingroup group_testcases
- */
-TestPtr CPPUT_API makeTestCase( const CppTL::Functor0 &setUp,
-                                const CppTL::Functor0 &run,
-                                const CppTL::Functor0 &tearDown,
-                                const std::string &name );
-
-/*! \brief Creates a TestCase with the specified name that will always fail.
+   TestCaseFactory factory_;
+};
+
+// Implementation Notes:
+// Be wary of makeTestCase overloading. There is an optimizer bug in MSVC6 that cause it
+// to recursively call makeTestCase(CppTL::Functor0) when such an overloading exist
+// and makeTestCase is called with a functor. This has been worked around by removing that 
+// overloading.
+
+
+
+/*! \brief Creates a TestMeta with the specified name and run function.
+ * \ingroup group_testcases
+ */
+TestMeta CPPUT_API makeTestCase( void (*run)(),
+                                 const std::string &name );
+
+
+/*! \brief Creates a TestMeta with the specified name, run function and metaData.
+ * \ingroup group_testcases
+ */
+TestMeta CPPUT_API makeTestCase( void (*run)(),
+                                 const MetaData &metaData );
+
+
+/*! \brief Creates a TestMeta with the specified name and run functor.
+ * \ingroup group_testcases
+ * FunctorType must be copyable and callable with no parameter.
+ */
+template<class FunctorType>
+TestMeta makeTestCase( FunctorType run,
+                       const std::string &name )
+{
+   return TestMeta( CppTL::bind_cfnr( &FunctorTestCase<FunctorType>::factory, run ), name );
+}
+
+
+/*! \brief Creates a TestMeta with the specified name and run functor.
+ * \ingroup group_testcases
+ * FunctorType must be copyable and callable with no parameter.
+ */
+template<class FunctorType>
+TestMeta makeTestCase( FunctorType run,
+                       const MetaData &metaData )
+{
+   return TestMeta( CppTL::bind_cfnr( &FunctorTestCase<FunctorType>::factory, run ), metaData );
+}
+
+
+/*! \brief Creates a TestMeta with the specified name that will always fail.
  * \ingroup group_testcases
  *
  * The test case run body simply call CPPUT_FAIL() with the specified message.
  *
- * This is useful for example when a TestSuite is created from input data 
+ * This is useful for example when a Suite is created from input data 
  * and those an invalid or inaccessible. A failing test case can be added to
  * the suite to report the error.
  */
-TestPtr CPPUT_API makeFailingTestCase( const std::string &name,
-                                       const Message &message );
-
-/*! \brief Creates a TestCase using a fixture-like object.
- * \ingroup group_testcases
- *
- * The test case will delegate implementation of AbstractTestCase setUp() and
- * tearDown() to method of the same name on the given \c fixture object.
- */
-template<typename FixtureType>
-TestPtr makeFixtureTestCase( const CppTL::IntrusivePtr<FixtureType> &fixture,
-                             const CppTL::Functor0 &run,
-                             const std::string &name )
-{
-   /// @todo Use traits to get smart-pointer type and allow for any type of smart-pointer
-   return makeTestCase( CppTL::memfn0( fixture, &FixtureType::setUp ),
-                        run,
-                        CppTL::memfn0( fixture, &FixtureType::tearDown ),
-                        name );
-}
-
+TestMeta CPPUT_API makeFailingTestCase( const std::string &name,
+                                        const Message &message );
 
 } // namespace CppUT
 
 
=== modified file 'cppunit2/include/cpput/testfixture.h'
--- cppunit2/include/cpput/testfixture.h	2005-11-13 09:12:01 +0000
+++ cppunit2/include/cpput/testfixture.h	2008-12-31 19:13:19 +0000
@@ -4,13 +4,217 @@
 # include <cpput/forwards.h>
 # include <cpput/extendeddata.h>
 # include <cpput/testcase.h>
-# include <cpput/testsuite.h>
+# include <cpput/registry.h>
 # include <cpput/translate.h>
 # include <cpptl/typename.h>
 
 
 namespace CppUT {
 
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+// Internal implementation macros
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+
+// Internal
+// Prolog parts that is common to abstract, base and derived fixture classes.
+// Declares test case factory and run member function pointer.
+#define _CPPUT_TESTSUITE_COMMON( FixtureType )                             \
+   public:                                                                 \
+   void (FixtureType :: *cpputRun_)();                                     \
+                                                                           \
+   typedef FixtureType CppUTSelfType;                                      \
+                                                                           \
+   struct FixtureTestFactory                                               \
+   {                                                                       \
+      typedef ::CppUT::TestCase *result_type;                              \
+                                                                           \
+      void (FixtureType :: *run_)();                                       \
+      ::CppUT::TestCaseFactoryFn factory_;                                 \
+                                                                           \
+                                                                           \
+      static void addTest( ::CppUT::Suite &suite,                          \
+         ::CppUT::TestCaseFactoryFn fixtureFactory,                        \
+         const char *name,                                                 \
+         void (FixtureType :: *run)() )                                    \
+      {                                                                    \
+         FixtureTestFactory factory;                                       \
+         factory.run_ = run;                                               \
+         factory.factory_ = fixtureFactory;                                \
+         suite.add( ::CppUT::TestMeta( ::CppTL::fn0r( factory ),           \
+                                       name ) );                           \
+      }                                                                    \
+                                                                           \
+      static void addTest( ::CppUT::Suite &suite,                          \
+         ::CppUT::TestCaseFactoryFn fixtureFactory,                        \
+         const char *name,                                                 \
+         void (FixtureType :: *run)(),                                     \
+         const ::CppUT::TestExtendedData &metaData )                       \
+      {                                                                    \
+         FixtureTestFactory factory;                                       \
+         factory.run_ = run;                                               \
+         factory.factory_ = fixtureFactory;                                \
+         suite.add( ::CppUT::TestMeta( ::CppTL::fn0r( factory ),           \
+                                       ::CppUT::MetaData( name, metaData ) \
+                                     ) );                                  \
+      }                                                                    \
+                                                                           \
+                                                                           \
+      ::CppUT::TestCase *operator()() const                                \
+      {                                                                    \
+         FixtureType *fixture = static_cast<FixtureType *>( factory_() );  \
+         if ( fixture != 0 )                                               \
+         {                                                                 \
+            fixture->cpputClearRunnable();                                 \
+            fixture->cpputRun_ = run_;                                     \
+         }                                                                 \
+         return fixture;                                                   \
+      }                                                                    \
+   };                                                                      \
+                                                                           \
+                                                                           \
+   virtual void cpputClearRunnable()                                       \
+   {                                                                       \
+      cpputRun_ = 0;                                                       \
+   }
+
+
+// Internal
+// Part that is common to all concrete fixture classes
+// Declares fixture, and suite factories.
+#define _CPPUT_TESTSUITE_COMMON_CONCRETE( FixtureType )                    \
+   static ::CppUT::TestCase *fixtureFactory()                              \
+   {                                                                       \
+      return new FixtureType();                                            \
+   }                                                                       \
+                                                                           \
+   static ::CppUT::Suite suite()                                           \
+   {                                                                       \
+      ::CppUT::Suite thisSuite( #FixtureType );                            \
+      addTests( thisSuite );                                               \
+      return thisSuite;                                                    \
+   }                                                                       \
+                                                                           \
+   static void addTests( ::CppUT::Suite &suite,                            \
+      ::CppUT::TestCaseFactoryFn factory = &FixtureType :: fixtureFactory )\
+   {
+
+// Internal
+// Part that is common to all abstract fixture classes.
+// Declares suite factory.
+# define _CPPUT_TESTSUITE_COMMON_ABSTRACT( FixtureType )                   \
+   static void addTests( ::CppUT::Suite &suite,                            \
+                         ::CppUT::TestCaseFactoryFn factory )              \
+   {
+
+
+// Internal
+// Part that is common to all derived fixture classes.
+// Chaine suite factory with parent class factory.
+# define _CPPUT_TESTSUITE_COMMON_EXTEND( FixtureType, ParentFixtureType )  \
+      ParentFixtureType :: addTests( suite, factory )
+
+
+// Internal
+// Part that is common to all base hierarchy fixture classes.
+// Run test based on content of member function pointer cpputRun_.
+# define _CPPUT_TESTSUITE_BASE_RUN( FixtureType )                          \
+   /* overridden from CppUT::TestCase */                                   \
+   virtual void run()                                                      \
+   {                                                                       \
+      (this->*cpputRun_)();                                                \
+   }
+
+
+// Internal
+// Part that is common to all derived fixture classes.
+// Run test based on content of member function pointer cpputRun_ if set,
+// otherwise forward run call to base class.
+# define _CPPUT_TESTSUITE_DERIVED_RUN( FixtureType, ParentFixtureType )    \
+   /* overridden from CppUT::TestCase */                                   \
+   virtual void run()                                                      \
+   {                                                                       \
+      if ( cpputRun_ == 0 )                                                \
+         ParentFixtureType :: run();                                       \
+      else                                                                 \
+         (this->*cpputRun_)();                                             \
+   }
+
+
+
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+// Interface macros
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+
+
+# define CPPUT_TESTSUITE_BEGIN( FixtureType )                              \
+   _CPPUT_TESTSUITE_COMMON( FixtureType )                                  \
+   _CPPUT_TESTSUITE_BASE_RUN( FixtureType )                                \
+   _CPPUT_TESTSUITE_COMMON_CONCRETE( FixtureType )                         \
+
+# define CPPUT_TESTSUITE_ABSTRACT_BEGIN( FixtureType )                     \
+   _CPPUT_TESTSUITE_COMMON( FixtureType )                                  \
+   _CPPUT_TESTSUITE_BASE_RUN( FixtureType )                                \
+   _CPPUT_TESTSUITE_COMMON_ABSTRACT( FixtureType )
+
+# define CPPUT_TESTSUITE_ABSTRACT_EXTEND( FixtureType, ParentFixtureType ) \
+   _CPPUT_TESTSUITE_COMMON( FixtureType )                                  \
+   _CPPUT_TESTSUITE_DERIVED_RUN( FixtureType, ParentFixtureType )          \
+   _CPPUT_TESTSUITE_COMMON_ABSTRACT( FixtureType )                         \
+   _CPPUT_TESTSUITE_COMMON_EXTEND( FixtureType, ParentFixtureType );
+
+# define CPPUT_TESTSUITE_EXTEND( FixtureType, ParentFixtureType )          \
+   _CPPUT_TESTSUITE_COMMON( FixtureType )                                  \
+   _CPPUT_TESTSUITE_DERIVED_RUN( FixtureType, ParentFixtureType )          \
+   _CPPUT_TESTSUITE_COMMON_CONCRETE( FixtureType )                         \
+   _CPPUT_TESTSUITE_COMMON_EXTEND( FixtureType, ParentFixtureType );
+
+# define CPPUT_TESTSUITE_TEST( testMethod )                                \
+      FixtureTestFactory::addTest( suite, factory, #testMethod,            \
+                                   &CppUTSelfType :: testMethod )
+
+# define CPPUT_TESTSUITE_TEST_WITH_META( testMethod, theMetaData )         \
+      FixtureTestFactory::addTest( suite, factory, #testMethod,            \
+                                   &CppUTSelfType :: testMethod,           \
+                                   theMetaData )
+
+# define CPPUT_TESTSUITE_END()                                             \
+   }                                                                       \
+   private:
+
+#if 0
+
+
+/// @todo somehow hide this
+template<class FixtureType>
+class CallFixtureRunMethod
+{
+public:
+    typedef FixtureType *first_argument_type;
+    typedef void (FixtureType::*RunFn)();
+
+    static ::CppTL::Functor1<FixtureType *> make( RunFn run )
+    {
+        return ::CppTL::fn1( CallFixtureRunMethod( run ) );
+    }
+
+    explicit CallFixtureRunMethod( RunFn run )
+        : run_( run )
+    {
+    }
+
+    void operator()( FixtureType *fixture ) const
+    {
+        (fixture->*run_)();
+    }
+
+private:
+    RunFn run_;
+};
+
 
 /*! \ingroup group_testfixture
  */
@@ -42,102 +246,6 @@
 
 
 
-/// \cond implementation_detail
-namespace Impl {
-
-   typedef CppTL::IntrusivePtr<TestFixture> TestFixturePtr;
-
-   class CPPUT_API FixtureFactory
-   {
-   public:
-      virtual ~FixtureFactory()
-      {
-      }
-
-      TestFixturePtr operator()()
-      {
-         return createNewFixture();
-      }
-
-   private:
-      virtual TestFixturePtr createNewFixture() =0;
-   };
-
-
-   template<typename FixtureType>
-   class FixtureFactoryImpl : public FixtureFactory
-   {
-   public:
-      TestFixturePtr createNewFixture()
-      {
-         return TestFixturePtr( new FixtureType() );
-      }
-   };
-
-   template<typename FixtureType>
-   class FixtureFactoryWrapper
-   {
-   public:
-      FixtureFactoryWrapper( FixtureFactory &factory )
-         : factory_( factory )
-      {
-      }
-
-      CppTL::IntrusivePtr<FixtureType> operator()()
-      {
-		  return ::CppTL::staticPointerCast<FixtureType>( factory_() );
-      }
-
-   private:
-      FixtureFactory &factory_;
-   };
-} // namespace Impl
-/// \endcond implementation_detail
-
-
-/* Code generated by the helper macros is roughly like this:
-
-class SomeTest : public CppUT::TestFixture
-{
-public:     // CPPUT_TESTSUITE_BEGIN
-   typedef FixtureType CppUT_ThisType;
-
-   static std::string defaultSuiteName()
-   {
-      return ::CppTL::getTypeName<CppUT_ThisType>( #FixtureType );
-   }
-
-   void addTests_( const ::CppUT::TestSuitePtr &suite,
-                   ::CppUT::Impl::FixtureFactory &factory_ )
-   {
-      ::CppUT::Impl::FixtureFactoryWrapper<CppUT_ThisType> fixtureFactory( factory_ );
-      ::CppTL::IntrusivePtr<FixtureType> fixture;
-
-      // CPPUT_TESTSUITE_EXTEND (if defined)
-      ParentFixtureType::addTests_( suite, factory_ );
-
-      // CPPUT_TEST( testMethod )
-      fixture = fixtureFactory();
-      suite->add( ::CppUT::makeFixtureTestCase( fixture, 
-                                                &FixtureType::testMethod, 
-                                                #testMethod ) );
-
-      
-   }  // if ended using CPPUT_ABSTRACT_TESTSUITE_END, stop there (suite() is not defined)
-
-   // if ended using CPPUT_TESTSUITE_END, define the static function suite
-   static ::CppUT::TestSuitePtr suite()
-   {
-      ::CppUT::TestSuitePtr testSuite( ::CppUT::makeTestSuite( defaultSuiteName() ) );
-      ::CppUT::Impl::FixtureFactoryImpl<CppUT_ThisType> factory;
-      addTests_( testSuite, factory );
-      return testSuite;
-   }
-};
-
-*/
-
-
 
 # if CPPUT_USE_RTTI_TO_NAME_SUITE
 #  define CPPUT_TESTSUITE_NAME_FROM_TYPE( FixtureType )					\
@@ -148,72 +256,19 @@
 # endif // if CPPUT_USE_RTTI_TO_NAME_SUITE
 
 
-
-/*! \ingroup group_testfixture
- */
-# define CPPUT_TESTSUITE_BEGIN( FixtureType )                                \
-public:                                                                      \
-   typedef FixtureType CppUT_ThisType;                                       \
-                                                                             \
-   static std::string defaultSuiteName()                                     \
-   {                                                                         \
-      return CPPUT_TESTSUITE_NAME_FROM_TYPE( FixtureType );                  \
-   }                                                                         \
-                                                                             \
-   static void addTests_( const ::CppUT::TestSuitePtr &suite,                \
-                          ::CppUT::Impl::FixtureFactory &factory_ )          \
-   {                                                                         \
-      ::CppUT::Impl::FixtureFactoryWrapper<CppUT_ThisType> fixtureFactory(   \
-         factory_ );                                                         \
-      ::CppTL::IntrusivePtr<FixtureType> fixture
-  
-/*! \ingroup group_testfixture
- */
-# define CPPUT_TESTSUITE_EXTEND( FixtureType, ParentFixtureType )            \
-      CPPUT_TESTSUITE_BEGIN( FixtureType );                                  \
-      ParentFixtureType::addTests_( suite, factory_ )
-
-/*! \ingroup group_testfixture
- */
-# define CPPUT_TESTSUITE_END()                                                \
-   }                                                                          \
-                                                                              \
-   static ::CppUT::TestPtr suite( const std::string &name = std::string("") ) \
-   {                                                                          \
-      std::string suiteName = name;                                           \
-      if ( suiteName.empty() )                                                \
-          suiteName = defaultSuiteName();                                     \
-      ::CppUT::TestSuitePtr testSuite = ::CppUT::makeTestSuite( suiteName );  \
-      ::CppUT::Impl::FixtureFactoryImpl<CppUT_ThisType> factory;              \
-      addTests_( testSuite, factory );                                        \
-      return ::CppTL::staticPointerCast< ::CppUT::Test >( testSuite );        \
-   }
-
-/*! \ingroup group_testfixture
- */
-# define CPPUT_ABSTRACT_TESTSUITE_END()                                      \
-   }
-
-/*! \ingroup group_testfixture
- */
-# define CPPUT_TEST( testMethod )                                            \
-      fixture = fixtureFactory();                                            \
-      suite->add( ::CppUT::makeFixtureTestCase( fixture,                     \
-                   ::CppTL::memfn0( fixture,                                 \
-                                    &CppUT_ThisType::testMethod ),           \
-                   #testMethod ) )
-
-/*! \ingroup group_testfixture
- */
-# define CPPUT_TEST_WITH_SPECIFICS( testMethod, specifics )                  \
+/*! \ingroup group_testfixture
+ */
+# define CPPUT_TESTSUITE_TEST_WITH_SPECIFICS( testMethod, specifics )                  \
       fixture = fixtureFactory();                                            \
       addTestWithSpecifics( *suite,                                          \
-                            ::CppUT::makeFixtureTestCase( fixture,           \
-                               ::CppTL::memfn0( fixture,                     \
-                                  &CppUT_ThisType::testMethod ),             \
-                                                          #testMethod ),     \
+         ::CppUT::makeFixtureTestCase( ::CppTL::Type<CppUT_ThisType>(),      \
+            ::CppUT::CallFixtureRunMethod<CppUT_ThisType>::make(             \
+                        &CppUT_ThisType::testMethod ),                       \
+                     #testMethod ),                                          \
                             specifics )
-         
+
+#endif
+
 } // namespace CppUT
 
 
 
=== modified file 'cppunit2/include/cpput/testfunction.h'
--- cppunit2/include/cpput/testfunction.h	2007-08-15 15:48:29 +0000
+++ cppunit2/include/cpput/testfunction.h	2008-12-29 20:51:19 +0000
@@ -9,30 +9,31 @@
 
 namespace CppUT 
 {
-   class TestFunctionFactory
-   {
-   public:
-      typedef TestPtr result_type; // Functor return type
-
-      typedef void (*TestFn)();
-
-      TestFunctionFactory( TestFn test, const char *name )
-         : test_( test )
-         , name_( name )
-      {
-      }
-
-      TestPtr operator()() const
-      {
-         return makeTestCase( test_, name_ );
-      }
-
-      TestFn test_;
-      const char *name_;
-   };
+   /// @todo move it to .cpp
+   inline TestMeta 
+   declareTestCaseFunction( void (*run)(), 
+                            const char *name, 
+                            Suite &parentSuite )
+   {
+      TestMeta test = makeTestCase( run, name );
+      parentSuite.add( test );
+      return test;
+   }
+
+   /// @todo move it to .cpp
+   inline TestMeta 
+   declareTestCaseFunction( void (*run)(), 
+                            const MetaData &metaData,
+                            Suite &parentSuite )
+   {
+      TestMeta test = makeTestCase( run, metaData );
+      parentSuite.add( test );
+      return test;
+   }
+
 } // end namespace CppUT
 
-/*! \brief Make the specified C function a test case and register it in the default Registry suite.
+/*! \brief Make the specified C function a test case and register it in the current suite.
  * \code
  * static void myTest1() {
  *   CPPUT_ASSERT_TRUE( false );
@@ -40,55 +41,58 @@
  * CPPUT_REGISTER_TEST_FUNCTION( myTest1 );
  * \endcode
  */
-#define CPPUT_REGISTER_TEST_FUNCTION( testFunction )                                \
-   CPPUT_REGISTER_TESTFACTORY_TO_DEFAULT(                                           \
-   ::CppTL::fn0r( ::CppUT::TestFunctionFactory( &testFunction, #testFunction ) ) )
-
-/*! \brief Make the specified C function a test case and register it in the specified Registry suite.
- * \code
- * static void myTest1() {
- *   CPPUT_ASSERT_TRUE( false );
- * }
- * CPPUT_REGISTER_TEST_FUNCTION_IN( myTest1, "BoolTest" );
- * \endcode
- */
-#define CPPUT_REGISTER_TEST_FUNCTION_IN( testFunction, parentSuiteName )            \
-   CPPUT_REGISTER_TESTFACTORY_IN(                                                   \
-   ::CppTL::fn0r( ::CppUT::TestFunctionFactory( &testFunction, #testFunction )),    \
-      parentSuiteName )
-
-/*! \brief Declare and register a simple test case in the default Registry suite.
- * The function is declared as a static void testFunction().
- * \code
- * CPPUT_TEST_FUNCTION( myTest1 ) {
- *   CPPUT_ASSERT_TRUE( false );
- * }
- * \endcode
- */
-#define CPPUT_TEST_FUNCTION( testFunctionName )       \
-   static void testFunctionName();                    \
-   CPPUT_REGISTER_TEST_FUNCTION( testFunctionName );  \
-   static void testFunctionName()
-
-/*! \brief Declare and register a simple test case in the specified Registry suite.
- * The function is declared as a static void testFunction().
- * \code
- * CPPUT_TEST_FUNCTION_IN( myTest1, "BoolTests" ) {
- *   CPPUT_ASSERT_TRUE( false );
- * }
- * \endcode
- */
-#define CPPUT_TEST_FUNCTION_IN( testFunctionName, parentSuiteName )       \
-   static void testFunctionName();                                        \
-   CPPUT_REGISTER_TEST_FUNCTION_IN( testFunctionName, parentSuiteName );  \
-   static void testFunctionName()
-
-/* @todo support for extended test data
-CPPUT_REGISTER_TEST_FUNCTION_IN_DEFAULT_WITH_SPECIFICS( 
-            myTest, 
-            (timeOut(0.2), 
-            describe("Always fails")) )
-*/
+#define _CPPUT_REGISTER_TEST_FUNCTION( testFunction )                \
+   static ::CppUT::TestMeta                                          \
+      CPPTL_MAKE_UNIQUE_NAME( cpputmeta ## testFunctionName ) =      \
+      ::CppUT::declareTestCaseFunction( &testFunction,               \
+                                        #testFunction,               \
+                                        CPPUT_CURRENT_SUITE() )
+
+#define _CPPUT_REGISTER_TEST_FUNCTION_WITH_META( testFunction, metaData )  \
+   static ::CppUT::TestMeta                                                \
+      CPPTL_MAKE_UNIQUE_NAME( cpputmeta ## testFunctionName ) =            \
+      ::CppUT::declareTestCaseFunction( &testFunction,                     \
+                                        metaData,                          \
+                                        CPPUT_CURRENT_SUITE() )
+
+
+/*! \brief Declare and register a simple test case in the current suite.
+ * The function is declared as a static void testFunction().
+ * \code
+ * CPPUT_TEST_FUNCTION( myTest1 ) {
+ *   CPPUT_ASSERT_TRUE( false );
+ * }
+ * \endcode
+ */
+#define CPPUT_TEST_FUNCTION( testFunctionName )             \
+   static void testFunctionName();                          \
+   _CPPUT_REGISTER_TEST_FUNCTION( testFunctionName );        \
+   static void testFunctionName()
+
+/*! \brief Declare and register a simple test case in the current suite.
+ * The function is declared as a static void testFunction().
+ * \code
+ * CPPUT_TEST_FUNCTION( myTest1 ) {
+ *   CPPUT_ASSERT_TRUE( false );
+ * }
+ * \endcode
+ */
+#define CPPUT_TEST_FUNCTION_WITH_META( testFunctionName, metaData )                                   \
+   namespace {                                                                                        \
+      class CppUT##testFunctionName##Meta : public ::CppUT::TestExtendedDataFactory                   \
+      {                                                                                               \
+      public:                                                                                         \
+         static ::CppUT::MetaData cppUTRegisterTestCase()                                             \
+         {                                                                                            \
+            return ::CppUT::MetaData( #testFunctionName, metaData );                                  \
+         }                                                                                            \
+      };                                                                                              \
+   }                                                                                                  \
+   static void testFunctionName();                                                                    \
+   _CPPUT_REGISTER_TEST_FUNCTION_WITH_META( testFunctionName,                                         \
+                                            CppUT##testFunctionName##Meta::cppUTRegisterTestCase() ); \
+   static void testFunctionName()
+
 
 
 #endif // CPPUT_TESTFUNCTION_H_INCLUDED
 
=== modified file 'cppunit2/include/cpput/testinfo.h'
--- cppunit2/include/cpput/testinfo.h	2008-07-13 06:19:20 +0000
+++ cppunit2/include/cpput/testinfo.h	2008-12-13 10:11:21 +0000
@@ -303,7 +303,7 @@
     * For simplicity, we will use the following compact form for reference :
     * x += f + l / checkCond( condition ); 
     * checkCond must returns an CheckerResult which as overloaded operator /.
-    * operator = evaluate right to left
+    * operator += evaluate right to left
     * operator + evaluate left to right
     * operator / evaluate left to right and as priority over +.
     * So 'condition expression' is evaluted first, then checkCond(condition) is evaluated. 
@@ -428,7 +428,7 @@
        * \param name Name of the resource to obtains. This resource must have been
        *             declared in the list of resource required by the test case.
        * \warning This function may only be called inside a test case (setUp, run or tearDown).
-       * \see AbstractTestCase::requireResource, ResourceHandlerRegistry.
+       * \see TestCase::requireResource, ResourceHandlerRegistry.
        */
       Resource &getResource( const ResourceName &name );
 
@@ -460,7 +460,7 @@
     * \param name Name of the resource to obtains. This resource must have been
     *             declared in the list of resource required by the test case.
     * \warning This function may only be called inside a test case (setUp, run or tearDown).
-    * \see AbstractTestCase::requireResource, ResourceHandlerRegistry.
+    * \see TestCase::requireResource, ResourceHandlerRegistry.
     */
    Resource &CPPUT_API getResource( const ResourceName &name );
 
 
=== removed file 'cppunit2/include/cpput/testsuite.h'
--- cppunit2/include/cpput/testsuite.h	2006-06-05 10:02:56 +0000
+++ cppunit2/include/cpput/testsuite.h	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-#ifndef CPPUT_TESTSUITE_H_INCLUDED
-# define CPPUT_TESTSUITE_H_INCLUDED
-
-# include <cpput/test.h>
-# include <deque>
-
-
-namespace CppUT {
-
-/*! \brief An abstract test suite that represents a collection of Test.
- * \ingroup group_testcases
- */
-class CPPUT_API AbstractTestSuite : public Test
-{
-public:
-   AbstractTestSuite();
-
-   AbstractTestSuite( const std::string &name );
-
-   virtual int testCount() const = 0;
-
-   virtual TestPtr testAt( int index ) const = 0;
-
-public: // overridden from Test
-   void accept( TestVisitor &visitor );
-
-   /// Returns \c true if the class is derived from AbstractTestCase.
-   bool isTestCase() const;
-};
-
-
-/*! \brief A test suite that represents a collection of Test.
- * \ingroup group_testcases
- */
-class CPPUT_API TestSuite : public AbstractTestSuite
-{
-public:
-   TestSuite( const std::string &name );
-
-   void add( const TestPtr &test );
-
-   void add( const TestSuitePtr &test );
-
-// overridden from AbstractTestSuite
-   int testCount() const;
-
-   TestPtr testAt( int index ) const;
-
-private:
-   typedef std::deque<TestPtr> Tests;
-   Tests tests_;
-};
-
-
-/*! \brief Creates a TestSuite with the specified name.
- * \ingroup group_testcases
- */
-TestSuitePtr CPPUT_API makeTestSuite( const std::string &name );
-
-} // namespace CppUT
-
-
-
-#endif // CPPUT_TESTSUITE_H_INCLUDED
 
=== removed file 'cppunit2/include/cpput/testvisitor.h'
--- cppunit2/include/cpput/testvisitor.h	2005-09-06 05:14:49 +0000
+++ cppunit2/include/cpput/testvisitor.h	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-#ifndef CPPUT_TESTVISITOR_H_INCLUDED
-# define CPPUT_TESTVISITOR_H_INCLUDED
-
-# include <cpput/config.h>
-# include <cpput/forwards.h>
-
-namespace CppUT {
-
-class CPPUT_API TestVisitor
-{
-public:
-   virtual ~TestVisitor()
-   {
-   }
-
-   virtual void visitTestCase( AbstractTestCase &test ) = 0;
-
-   virtual void visitTestSuite( AbstractTestSuite &suite ) = 0;
-};
-
-
-} // namespace CppUT
-
-
-
-#endif // CPPUT_TESTVISITOR_H_INCLUDED
 
=== added directory 'cppunit2/makefiles/vs6'
=== added file 'cppunit2/makefiles/vs6/cpput_lib.dsp'
--- cppunit2/makefiles/vs6/cpput_lib.dsp	1970-01-01 00:00:00 +0000
+++ cppunit2/makefiles/vs6/cpput_lib.dsp	2009-03-13 21:31:02 +0000
@@ -0,0 +1,360 @@
+# Microsoft Developer Studio Project File - Name="cpput_lib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=cpput_lib - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "cpput_lib.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "cpput_lib.mak" CFG="cpput_lib - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "cpput_lib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "cpput_lib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "cpput_lib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../build/msvc6/cpput_lib/Release"
+# PROP Intermediate_Dir "../../build/msvc6/cpput_lib/Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "cpput_lib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../build/msvc6/cpput_lib/Debug"
+# PROP Intermediate_Dir "../../build/msvc6/cpput_lib/Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "cpput_lib - Win32 Release"
+# Name "cpput_lib - Win32 Debug"
+# Begin Group "cpptl"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\_stlimpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\any.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\atomiccounter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\autolink.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\conststring.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\cpptl_autolink.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\enumerator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\format.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\forwards.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\functor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\intrusiveptr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpptl\json_reader.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpptl\json_value.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpptl\json_valueiterator.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpptl\json_writer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\reflection.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\reflection.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\reflectionimpl10.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\scopedptr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\sharedptr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\smallmap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\stringtools.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpptl\thread.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\thread.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\thread.inl
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\typeinfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\typename.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\typetraits.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpptl\value.h
+# End Source File
+# End Group
+# Begin Group "cpput"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\cpput\assert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\assertcommon.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\assertenum.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpput\assertstring.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\assertstring.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\autolink.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpput\dllproxy.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\dllproxy.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\equality.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpput\exceptionguard.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\exceptionguard.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpput\extendeddata.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\extendeddata.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\forwards.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\inputbasedtest.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\interface.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\lightfixture.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpput\lighttestrunner.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\lighttestrunner.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpput\message.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\message.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\opentestadaptor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpput\registry.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\registry.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpput\resource.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\stringize.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\tablefixture.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\test.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpput\testcase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\testcase.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\testfixture.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\testfunction.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpput\testinfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\testinfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\cpput\translate.h
+# End Source File
+# End Group
+# End Target
+# End Project
 
=== added file 'cppunit2/makefiles/vs6/cpput_lib.dsw'
--- cppunit2/makefiles/vs6/cpput_lib.dsw	1970-01-01 00:00:00 +0000
+++ cppunit2/makefiles/vs6/cpput_lib.dsw	2009-03-13 21:31:02 +0000
@@ -0,0 +1,44 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "cpput_lib"=".\cpput_lib.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "cpput_test"=".\cpput_test.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name cpput_lib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
 
=== added file 'cppunit2/makefiles/vs6/cpput_test.dsp'
--- cppunit2/makefiles/vs6/cpput_test.dsp	1970-01-01 00:00:00 +0000
+++ cppunit2/makefiles/vs6/cpput_test.dsp	2009-03-13 21:31:02 +0000
@@ -0,0 +1,178 @@
+# Microsoft Developer Studio Project File - Name="cpput_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=cpput_test - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "cpput_test.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "cpput_test.mak" CFG="cpput_test - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "cpput_test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "cpput_test - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "cpput_test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../build/msvc6/cpput_lib/Release"
+# PROP Intermediate_Dir "../../build/msvc6/cpput_lib/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map /debug /debugtype:both /machine:I386
+# SUBTRACT LINK32 /pdbtype:<none>
+
+!ELSEIF  "$(CFG)" == "cpput_test - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../build/msvc6/cpput_lib/Debug"
+# PROP Intermediate_Dir "../../build/msvc6/cpput_lib/Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "cpput_test - Win32 Release"
+# Name "cpput_test - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\assertenumtest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\assertenumtest.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\assertstringtest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\enumeratortest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\enumeratortest.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\minitestrunner.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\mocktestlistener.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\reflectiontest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\reflectiontest.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\registrytest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\registrytest.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\smallmaptest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\smallmaptest.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\testbasicassertion.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\testexceptionguard.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\testfixturetest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\testfunctor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\testinfotest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\testing.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\testtestcase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\valuetest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cpputtest\valuetest.h
+# End Source File
+# End Target
+# End Project
 
=== modified file 'cppunit2/makefiles/vs71/cppunit2.suo'
 Binary files cppunit2/makefiles/vs71/cppunit2.suo	2005-09-06 05:35:12 +0000 and cppunit2/makefiles/vs71/cppunit2.suo	2008-12-29 20:49:53 +0000 differ
=== modified file 'cppunit2/makefiles/vs71/cpput_lib.vcproj'
--- cppunit2/makefiles/vs71/cpput_lib.vcproj	2007-08-14 15:30:52 +0000
+++ cppunit2/makefiles/vs71/cpput_lib.vcproj	2008-12-29 20:49:53 +0000
@@ -1,281 +1,305 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="cpput_lib"
-	ProjectGUID="{79273A0D-700E-4AFA-B7F2-14D4CC325521}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../build/cpput/debug"
-			IntermediateDirectory="../../build/cpput/debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cpput_vc71_libmd.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../build/cpput/release"
-			IntermediateDirectory="../../build/cpput/release"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cpput_vc71_libmd.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="codetorevisit"
-			Filter="">
-			<File
-				RelativePath="..\..\src\cpput\parametrizedsource.cpp">
-			</File>
-			<File
-				RelativePath="..\..\include\cpput\parametrizedsource.h">
-			</File>
-			<File
-				RelativePath="..\..\src\cpput\tablefixture.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\cpput\tablefixture.h">
-			</File>
-			<File
-				RelativePath="..\..\src\cpput\testrunner.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\cpput\testrunner.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="doc"
-			Filter="">
-			<File
-				RelativePath="..\..\doc\coding_guidelines.dox">
-			</File>
-			<File
-				RelativePath="..\..\doc\cpput.dox">
-			</File>
-			<File
-				RelativePath="..\..\doc\cpput_todo.dox">
-			</File>
-			<File
-				RelativePath="..\..\doc\custom.css">
-			</File>
-			<File
-				RelativePath="..\..\doc\doxyfile.in">
-			</File>
-			<File
-				RelativePath="..\..\doc\footer.html">
-			</File>
-			<File
-				RelativePath="..\..\doc\header.html">
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\src\cpput\assert.cpp">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\assertcommon.h">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\assertenum.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\assertstring.cpp">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\assertstring.h">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\autolink.h">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\config.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\dllproxy.cpp">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\dllproxy.h">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\equality.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\exceptionguard.cpp">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\exceptionguard.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\extendeddata.cpp">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\extendeddata.h">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\forwards.h">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\inputtest.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\lighttestrunner.cpp">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\lighttestrunner.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\message.cpp">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\message.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\registry.cpp">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\registry.h">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\stringize.h">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\test.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\testcase.cpp">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\testcase.h">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\testfixture.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\testinfo.cpp">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\testinfo.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\testsuite.cpp">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\testsuite.h">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\testvisitor.h">
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\translate.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="cpput_lib"
+	ProjectGUID="{79273A0D-700E-4AFA-B7F2-14D4CC325521}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../../build/cpput/debug"
+			IntermediateDirectory="../../build/cpput/debug"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/cpput_vc71_libmd.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="../../build/cpput/release"
+			IntermediateDirectory="../../build/cpput/release"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/cpput_vc71_libmd.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="codetorevisit"
+			Filter="">
+			<File
+				RelativePath="..\..\src\cpput\parametrizedsource.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\include\cpput\parametrizedsource.h">
+			</File>
+			<File
+				RelativePath="..\..\src\cpput\tablefixture.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\include\cpput\tablefixture.h">
+			</File>
+			<File
+				RelativePath="..\..\src\cpput\testrunner.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\include\cpput\testrunner.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="doc"
+			Filter="">
+			<File
+				RelativePath="..\..\doc\coding_guidelines.dox">
+			</File>
+			<File
+				RelativePath="..\..\doc\cpput.dox">
+			</File>
+			<File
+				RelativePath="..\..\doc\cpput_todo.dox">
+			</File>
+			<File
+				RelativePath="..\..\doc\custom.css">
+			</File>
+			<File
+				RelativePath="..\..\doc\doxyfile.in">
+			</File>
+			<File
+				RelativePath="..\..\doc\footer.html">
+			</File>
+			<File
+				RelativePath="..\..\doc\header.html">
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\src\cpput\assert.cpp">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\assertcommon.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\assertenum.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpput\assertstring.cpp">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\assertstring.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\autolink.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\config.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpput\dllproxy.cpp">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\dllproxy.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\equality.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpput\exceptionguard.cpp">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\exceptionguard.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpput\extendeddata.cpp">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\extendeddata.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\forwards.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\inputbasedtest.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\inputtest.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\interface.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\lightfixture.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpput\lighttestrunner.cpp">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\lighttestrunner.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpput\message.cpp">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\message.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\opentestadaptor.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpput\registry.cpp">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\registry.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpput\resource.cpp">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\resource.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\stringize.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\test.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpput\testcase.cpp">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\testcase.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\testfixture.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\testfunction.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpput\testinfo.cpp">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\testinfo.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\testvisitor.h">
+		</File>
+		<File
+			RelativePath="..\..\include\cpput\translate.h">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
 
=== modified file 'cppunit2/makefiles/vs71/cpput_test.vcproj'
--- cppunit2/makefiles/vs71/cpput_test.vcproj	2008-06-26 14:28:05 +0000
+++ cppunit2/makefiles/vs71/cpput_test.vcproj	2008-12-25 17:01:58 +0000
@@ -1,261 +1,282 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="cpput_test"
-	ProjectGUID="{2506991E-13CA-49C9-8686-AACDE35C21B6}"
-	RootNamespace="cpput_test"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../build/cpput_test/debug"
-			IntermediateDirectory="../../build/cpput_test/debug"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/cpput_test.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/cpput_test.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Running post-build unit tests"
-				CommandLine="$(TargetPath)"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../build/cpput_test/release"
-			IntermediateDirectory="../../build/cpput_test/release"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/cpput_test.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Running post-build unit tests"
-				CommandLine="$(TargetPath)"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="codetorevisit"
-			Filter="">
-			<File
-				RelativePath="..\..\src\cpputtest\testfunctor2.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\cpputtest\testfunctor3.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\cpputtest\testtestrunresult.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\src\cpputtest\assertenumtest.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\assertenumtest.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\assertstringtest.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\assertstringtest.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\commandlineoptionstest.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\commandlineoptionstest.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\enumeratortest.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\enumeratortest.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\main.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\minitestrunner.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\mocktestlistener.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\mocktestvisitor.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\reflectiontest.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\reflectiontest.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\registrytest.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\registrytest.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\smallmaptest.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\smallmaptest.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\testbasicassertion.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\testexceptionguard.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\testfixturetest.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\testfixturetest.h">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\testfunctor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\testinfotest.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\testtestcase.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\testtestsuite.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\valuetest.cpp">
-		</File>
-		<File
-			RelativePath="..\..\src\cpputtest\valuetest.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="cpput_test"
+	ProjectGUID="{2506991E-13CA-49C9-8686-AACDE35C21B6}"
+	RootNamespace="cpput_test"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../../build/cpput_test/debug"
+			IntermediateDirectory="../../build/cpput_test/debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/cpput_test.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/cpput_test.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Running post-build unit tests"
+				CommandLine="$(TargetPath)"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="../../build/cpput_test/release"
+			IntermediateDirectory="../../build/cpput_test/release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/cpput_test.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Running post-build unit tests"
+				CommandLine="$(TargetPath)"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="codetorevisit"
+			Filter="">
+			<File
+				RelativePath="..\..\src\cpputtest\testfunctor2.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\cpputtest\testfunctor3.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\cpputtest\testtestrunresult.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\src\cpputtest\assertenumtest.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\assertenumtest.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\assertstringtest.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\assertstringtest.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\commandlineoptionstest.cpp">
+			<FileConfiguration
+				Name="Debug|Win32"
+				ExcludedFromBuild="TRUE">
+				<Tool
+					Name="VCCLCompilerTool"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				ExcludedFromBuild="TRUE">
+				<Tool
+					Name="VCCLCompilerTool"/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\commandlineoptionstest.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\enumeratortest.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\enumeratortest.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\main.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\minitestrunner.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\mocktestlistener.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\mocktestvisitor.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\reflectiontest.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\reflectiontest.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\registrytest.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\registrytest.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\smallmaptest.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\smallmaptest.h">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\testbasicassertion.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\testexceptionguard.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\testfixturetest.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\testfunctor.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\testinfotest.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\testtestcase.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\testtestsuite.cpp">
+			<FileConfiguration
+				Name="Debug|Win32"
+				ExcludedFromBuild="TRUE">
+				<Tool
+					Name="VCCLCompilerTool"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				ExcludedFromBuild="TRUE">
+				<Tool
+					Name="VCCLCompilerTool"/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\valuetest.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\cpputtest\valuetest.h">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
 
=== modified file 'cppunit2/makefiles/vs80/cpput_lib.vcproj'
--- cppunit2/makefiles/vs80/cpput_lib.vcproj	2008-07-13 06:19:20 +0000
+++ cppunit2/makefiles/vs80/cpput_lib.vcproj	2008-12-20 10:16:30 +0000
@@ -1,402 +1,414 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="cpput_lib"
-	ProjectGUID="{79273A0D-700E-4AFA-B7F2-14D4CC325521}"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../build/cpput/debug"
-			IntermediateDirectory="../../build/cpput/debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cpput_vc71_libmd.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../build/cpput/release"
-			IntermediateDirectory="../../build/cpput/release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cpput_vc71_libmd.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="codetorevisit"
-			>
-			<File
-				RelativePath="..\..\src\cpput\parametrizedsource.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\cpput\parametrizedsource.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\cpput\tablefixture.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\cpput\testrunner.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\cpput\testrunner.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="doc"
-			>
-			<File
-				RelativePath="..\..\changelog.txt"
-				>
-			</File>
-			<File
-				RelativePath="..\..\doc\coding_guidelines.dox"
-				>
-			</File>
-			<File
-				RelativePath="..\..\doc\cpput.dox"
-				>
-			</File>
-			<File
-				RelativePath="..\..\doc\cpput_todo.dox"
-				>
-			</File>
-			<File
-				RelativePath="..\..\doc\custom.css"
-				>
-			</File>
-			<File
-				RelativePath="..\..\doc\doxyfile.in"
-				>
-			</File>
-			<File
-				RelativePath="..\..\doc\footer.html"
-				>
-			</File>
-			<File
-				RelativePath="..\..\doc\header.html"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\src\cpput\assert.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\assertcommon.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\assertenum.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\assertstring.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\assertstring.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\autolink.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\config.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\dllproxy.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\dllproxy.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\equality.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\exceptionguard.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\exceptionguard.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\extendeddata.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\extendeddata.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\forwards.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\inputbasedtest.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\lightfixture.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\lighttestrunner.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\lighttestrunner.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\message.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\message.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\registry.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\registry.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\stringize.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\tablefixture.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\test.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\testcase.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\testcase.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\testfixture.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\testfunction.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\testinfo.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\testinfo.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\cpput\testsuite.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\testsuite.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\testvisitor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\include\cpput\translate.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="cpput_lib"
+	ProjectGUID="{79273A0D-700E-4AFA-B7F2-14D4CC325521}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../../build/cpput/debug"
+			IntermediateDirectory="../../build/cpput/debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/cpput_vc71_libmd.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="../../build/cpput/release"
+			IntermediateDirectory="../../build/cpput/release"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>