[Cppunit-cvs] cppunit2/src/cpputtest minitestrunner.h,1.2,1.3 testfixturetest.cpp,1.5,1.6 testfixturetest.h,1.5,1.6

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

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

Modified Files:
	minitestrunner.h testfixturetest.cpp testfixturetest.h 
Log Message:
Added possibility to add test to a fixture and set its description and time-out (and other specifics).


Index: testfixturetest.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testfixturetest.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** testfixturetest.h	27 Feb 2005 16:12:08 -0000	1.5
--- testfixturetest.h	6 Aug 2005 22:24:54 -0000	1.6
***************
*** 17,20 ****
--- 17,21 ----
     void testDefaultIsNoSharedFixture();
     void testSharedFixture();
+    void testFixtureWithSpecifics();
  
  private:

Index: testfixturetest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testfixturetest.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** testfixturetest.cpp	27 Feb 2005 16:12:08 -0000	1.5
--- testfixturetest.cpp	6 Aug 2005 22:24:54 -0000	1.6
***************
*** 114,117 ****
--- 114,132 ----
     };
  
+    class TestFixtureWithSpecific : public CppUT::TestFixture
+    {
+       CPPUT_TESTSUITE_BEGIN( TestFixtureWithSpecific );
+       CPPUT_TEST_WITH_SPECIFICS( testFail,
+                                  ( describe( "Forced test failure" ),
+                                    timeOut( 30.0 ) 
+                                  ) );
+       CPPUT_TESTSUITE_END();
+    public:
+       void testFail()
+       {
+          CPPUT_ASSERT( false, "forced failure" );
+       }
+    };
+ 
  
  } // anonymous namespace
***************
*** 136,139 ****
--- 151,156 ----
     addTest( fixture, &TestFixtureTest::testSharedFixture,
              "testSharedFixture", suite );
+    addTest( fixture, &TestFixtureTest::testFixtureWithSpecifics,
+             "testFixtureWithSpecifics", suite );
  
     return suite;
***************
*** 219,220 ****
--- 236,253 ----
     CPPUT_ASSERT_EQUAL( 1, int(SharedFixtureTestBase::instances_.size() ) );
  }
+ 
+ 
+ void 
+ TestFixtureTest::testFixtureWithSpecifics()
+ {
+    CppUT::TestPtr suite = TestFixtureWithSpecific::suite();
+    CPPUT_ASSERT_EQUAL( 1, dynamic_cast<CppUT::TestSuite &>( *suite ).testCount() );
+    CppUT::TestPtr test = dynamic_cast<CppUT::TestSuite &>( *suite ).testAt(0);
+    CPPUT_ASSERT_EQUAL( "Forced test failure", test->description() );
+    CPPUT_ASSERT_EQUAL( 30.0, test->timeOut() );
+ 
+    MiniTestRunner runner;
+    runner.run( suite );
+    CPPUT_ASSERT_EQUAL( 1, runner.tested_ );
+    CPPUT_ASSERT_EQUAL( 1, runner.failed_ );
+ }

Index: minitestrunner.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/minitestrunner.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** minitestrunner.h	27 Feb 2005 16:12:07 -0000	1.2
--- minitestrunner.h	6 Aug 2005 22:24:53 -0000	1.3
***************
*** 70,72 ****
--- 70,74 ----
  };
  
+ // 0x00688ec0 "`anonymous namespace'::TestFixtureWithSpecific"
+ 
  #endif // CPPUTTEST_MINITESTRUNNER_H_INCLUDED