[Cppunit-cvs] cppunit2/src/cpputtest cpputtest.vcproj,1.7,1.8 main.cpp,1.9,1.10 registrytest.cpp,1.1
Brought to you by:
blep
Menu
▾
▴
[Cppunit-cvs] cppunit2/src/cpputtest cpputtest.vcproj,1.7,1.8 main.cpp,1.9,1.10 registrytest.cpp,1.1.1.1,1.2 testtestcase.cpp,1.5,1.6 testtestsuite.cpp,1.2,1.3
|
From: Baptiste L. <bl...@us...> - 2004-11-17 21:47:21
|
Update of /cvsroot/cppunit/cppunit2/src/cpputtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv508/src/cpputtest Modified Files: cpputtest.vcproj main.cpp registrytest.cpp testtestcase.cpp testtestsuite.cpp Log Message: * started removing TestDriver stuff from CppUnit 2 * Removed Test::run(), Test::totalTestCount and Test::parent * User can only subclass AbstractTestSuite or AbstractTestCase. * AbstractTest has been inlined into Test * Test no longer have parent * Removed TestListener::enterTest() & TestListener::exitTest() * Moved responsibility of running TestCase from AbstractTestCase to TestContext::run( AbstractTestCase &test ). * Removed method related to suite and enter/exit event from TestContext. * Disabled some unit tests (rely on running test which will change again shortly) Index: registrytest.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/registrytest.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** registrytest.cpp 27 Jan 2004 20:34:36 -0000 1.1.1.1 --- registrytest.cpp 17 Nov 2004 21:47:10 -0000 1.2 *************** *** 24,28 **** { CppUT::TestSuitePtr suite = registry_->createDefaultTests(); - CPPUT_ASSERT_EQUAL( 0, suite->totalTestCount() ); CPPUT_ASSERT( testNames_.empty() ); } --- 24,27 ---- *************** *** 36,40 **** registry_->addToDefault( makeTestFactory( "Test3" ) ); CppUT::TestSuitePtr suite = registry_->createDefaultTests(); - CPPUT_ASSERT_EQUAL( 3, suite->totalTestCount() ); CppUT::TestContext context; --- 35,38 ---- *************** *** 54,59 **** CppUT::TestSuitePtr suite = registry_->createTests( "Name" ); CppUT::TestSuitePtr suite2 = registry_->createTests( "Name2" ); - CPPUT_ASSERT_EQUAL( 2, suite->totalTestCount() ); - CPPUT_ASSERT_EQUAL( 1, suite2->totalTestCount() ); CppUT::TestContext context; --- 52,55 ---- *************** *** 78,82 **** registry_->addChild( "Name", "Name3" ); CppUT::TestSuitePtr suite = registry_->createTests( "Name" ); - CPPUT_ASSERT_EQUAL( 4, suite->totalTestCount() ); CppUT::TestContext context; --- 74,77 ---- Index: main.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/main.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** main.cpp 17 Nov 2004 08:59:34 -0000 1.9 --- main.cpp 17 Nov 2004 21:47:10 -0000 1.10 *************** *** 1,6 **** - #include <cpput/progresslistener.h> - #include <cpput/testrunresult.h> #include <cpput/test.h> - #include <cpput/testcontext.h> #include <cpput/testsuite.h> #include <iostream> --- 1,3 ---- *************** *** 8,14 **** #include "assertstringtest.h" #include "commandlineoptionstest.h" ! #include "registrytest.h" #include "enumeratortest.h" ! #include "testfixturetest.h" #include <cpput/testrunner.h> // cppunit2 testrunner for opentest --- 5,11 ---- #include "assertstringtest.h" #include "commandlineoptionstest.h" ! //#include "registrytest.h" #include "enumeratortest.h" ! //#include "testfixturetest.h" #include <cpput/testrunner.h> // cppunit2 testrunner for opentest *************** *** 17,22 **** bool testBasicAssertions(); ! bool testTestContext(); ! bool testTestRunResult(); bool testTestSuite(); bool testTestCase(); --- 14,19 ---- bool testBasicAssertions(); ! //bool testTestContext(); ! //bool testTestRunResult(); bool testTestSuite(); bool testTestCase(); *************** *** 30,35 **** testFunctors() && // testFunctors2() && ! testTestRunResult() && ! testTestContext() && testTestSuite() && testTestCase(); --- 27,32 ---- testFunctors() && // testFunctors2() && ! // testTestRunResult() && ! // testTestContext() && testTestSuite() && testTestCase(); *************** *** 37,66 **** - static void dumpFailures( const CppUT::TestSuite &allSuite, - const CppUT::TestRunResult &result ) - { - if ( result.successful() ) - { - std::cout << "All " << allSuite.totalTestCount() << " tests passed..." << std::endl; - return; - } - - for ( int index =0; index < result.failureCount(); ++index ) - { - const CppUT::TestResult &failure = result.failureAt( index ); - - if ( failure.location().isValid() ) - std::cout << failure.location().toString() << ": "; - else - std::cout << "Unknown failure location: "; - std::cout << CppUT::path( failure.test() ) << std::endl; - std::cout << failure.message().toString() << std::endl; - } - - std::cout << "Failures: " << result.failureCount() << ", "; - std::cout << "Tested: " << allSuite.totalTestCount() << std::endl; - } - - int main( int argc, const char *argv[] ) { --- 34,37 ---- *************** *** 76,81 **** CppUT::TestSuitePtr allSuite = CppUT::makeTestSuite( "All tests" ); ! allSuite->add( RegistryTest::suite() ); ! allSuite->add( TestFixtureTest::suite() ); allSuite->add( AssertStringTest::suite() ); allSuite->add( EnumeratorTest::suite() ); --- 47,52 ---- CppUT::TestSuitePtr allSuite = CppUT::makeTestSuite( "All tests" ); ! // allSuite->add( RegistryTest::suite() ); ! // allSuite->add( TestFixtureTest::suite() ); allSuite->add( AssertStringTest::suite() ); allSuite->add( EnumeratorTest::suite() ); *************** *** 83,99 **** // allSuite->add( CommandLineOptionsTest::suite() ); - - /* // Old stuff using CppUnit 2 - CppUT::TestContext context; - CppUT::TestRunResult result; - context.add( result ); - CppUT::BriefProgressListener progress; - context.add( progress ); - allSuite->run( context ); - - dumpFailures( *allSuite, result ); - return result.successful() ? 0 : 1; - */ - CppUT::TestRunner runner; CppUT::AbstractTestSuitePtr rootSuite = --- 54,57 ---- Index: testtestsuite.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testtestsuite.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** testtestsuite.cpp 4 Aug 2004 08:01:15 -0000 1.2 --- testtestsuite.cpp 17 Nov 2004 21:47:10 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- #include <cpput/assert.h> #include <cpput/resultexception.h> + #include <cpput/testcase.h> #include <cpput/testsuite.h> #include <cpput/testcontext.h> *************** *** 6,34 **** #include "mocktestvisitor.h" namespace { ! class CalledTest : public CppUT::AbstractTest { public: CalledTest( int &callCount ) ! : callCount_( callCount ) { } ! void run( CppUT::TestContext &context ) { ++callCount_; } - void accept( CppUT::TestVisitor &visitor ) - { - } - - int totalTestCount() const - { - return 1; - } - int &callCount_; }; --- 7,28 ---- #include "mocktestvisitor.h" + /// @todo Simplify this test some more... namespace { ! class CalledTest : public CppUT::AbstractTestCase { public: CalledTest( int &callCount ) ! : CppUT::AbstractTestCase( "CalledTest" ) ! , callCount_( callCount ) { } ! void run() { ++callCount_; } int &callCount_; }; *************** *** 53,63 **** suite1->add( test1 ); CPPUT_ASSERT_EQUAL( 1, suite1->testCount() ); - CPPUT_ASSERT_EQUAL( 1, suite1->totalTestCount() ); CPPUT_ASSERT( test1 == suite1->testAt(0), "returned test[0] is not added test" ); - CPPUT_ASSERT( test1->parentTest() == &*suite1 ); - - CppUT::TestContext context; - suite1->run( context ); - CPPUT_ASSERT_EQUAL( 1, callCount1, "test1 should have been called" ); int callCount2 = 0; --- 47,51 ---- *************** *** 65,85 **** suite1->add( test2 ); CPPUT_ASSERT_EQUAL( 2, suite1->testCount() ); - CPPUT_ASSERT_EQUAL( 2, suite1->totalTestCount() ); CPPUT_ASSERT( test1 == suite1->testAt(0), "returned test[0] is not added test" ); CPPUT_ASSERT( test2 == suite1->testAt(1), "returned test[1] is not added test" ); - CPPUT_ASSERT( test1->parentTest() == &*suite1 ); - CPPUT_ASSERT( test2->parentTest() == &*suite1 ); - - suite1->run( context ); - CPPUT_ASSERT_EQUAL( 2, callCount1, "test1 should have been called" ); - CPPUT_ASSERT_EQUAL( 1, callCount2, "test2 should have been called" ); - - CppUT::TestSuitePtr suite2 = CppUT::makeTestSuite( "Suite 2" ); - suite2->add( CppUT::TestPtr( new CalledTest( callCount1 ) ) ); - suite2->add( CppUT::TestPtr( new CalledTest( callCount1 ) ) ); - CPPUT_ASSERT_EQUAL( 2, suite2->totalTestCount() ); - - suite1->add( suite2 ); - CPPUT_ASSERT_EQUAL( 4, suite1->totalTestCount() ); } catch ( CppUT::AssertException &e ) --- 53,58 ---- Index: testtestcase.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testtestcase.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** testtestcase.cpp 17 Nov 2004 08:59:34 -0000 1.5 --- testtestcase.cpp 17 Nov 2004 21:47:10 -0000 1.6 *************** *** 85,88 **** --- 85,89 ---- "Test 1" ); CPPUT_ASSERT_EQUAL( "Test 1", test->name() ); + CPPUT_ASSERT( test->isTestCase() ); MockTestVisitor visitor; *************** *** 90,100 **** CPPUT_ASSERT_EQUAL( 1, visitor.visitTestCaseCount_ ); CPPUT_ASSERT_EQUAL( 0, visitor.visitTestSuiteCount_ ); - CPPUT_ASSERT( test->parentTest() == 0 ); - CPPUT_ASSERT_EQUAL( 1, test->totalTestCount() ); CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! test->run( context ); CPPUT_ASSERT_EQUAL( 1, testCall ); CPPUT_ASSERT_EQUAL( 0, result.failureCount() ); --- 91,99 ---- CPPUT_ASSERT_EQUAL( 1, visitor.visitTestCaseCount_ ); CPPUT_ASSERT_EQUAL( 0, visitor.visitTestSuiteCount_ ); CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! context.run( static_cast<CppUT::AbstractTestCase &>( *test ) ); CPPUT_ASSERT_EQUAL( 1, testCall ); CPPUT_ASSERT_EQUAL( 0, result.failureCount() ); *************** *** 128,135 **** "Test 2" ); CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! test->run( context ); CPPUT_ASSERT_EQUAL( 1, testSetUpCall ); CPPUT_ASSERT_EQUAL( 1, testRunCall ); --- 127,136 ---- "Test 2" ); + CPPUT_ASSERT( test->isTestCase() ); + CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! context.run( static_cast<CppUT::AbstractTestCase &>( *test ) ); CPPUT_ASSERT_EQUAL( 1, testSetUpCall ); CPPUT_ASSERT_EQUAL( 1, testRunCall ); *************** *** 148,156 **** &callback, &testTearDownCall, "Test" ); CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! test->run( context ); CPPUT_ASSERT_EQUAL( 1, testSetUpCall ); CPPUT_ASSERT_EQUAL( 0, testRunCall ); --- 149,158 ---- &callback, &testTearDownCall, "Test" ); + CPPUT_ASSERT( test->isTestCase() ); CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! context.run( static_cast<CppUT::AbstractTestCase &>( *test ) ); CPPUT_ASSERT_EQUAL( 1, testSetUpCall ); CPPUT_ASSERT_EQUAL( 0, testRunCall ); *************** *** 169,177 **** &callback, &testTearDownCall, "Test" ); CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! test->run( context ); CPPUT_ASSERT_EQUAL( 1, testSetUpCall ); CPPUT_ASSERT_EQUAL( 1, testRunCall ); --- 171,180 ---- &callback, &testTearDownCall, "Test" ); + CPPUT_ASSERT( test->isTestCase() ); CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! context.run( static_cast<CppUT::AbstractTestCase &>( *test ) ); CPPUT_ASSERT_EQUAL( 1, testSetUpCall ); CPPUT_ASSERT_EQUAL( 1, testRunCall ); *************** *** 190,198 **** &callbackThrow, &testTearDownCall, "Test" ); CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! test->run( context ); CPPUT_ASSERT_EQUAL( 1, testSetUpCall ); CPPUT_ASSERT_EQUAL( 1, testRunCall ); --- 193,202 ---- &callbackThrow, &testTearDownCall, "Test" ); + CPPUT_ASSERT( test->isTestCase() ); CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! context.run( static_cast<CppUT::AbstractTestCase &>( *test ) ); CPPUT_ASSERT_EQUAL( 1, testSetUpCall ); CPPUT_ASSERT_EQUAL( 1, testRunCall ); *************** *** 211,219 **** &TestTestCaseFixture::run ), "Test1" ); CPPUT_ASSERT_EQUAL( "Test1", test->name() ); CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! test->run( context ); CPPUT_ASSERT_EQUAL( 1, fixture->setUp_ ); CPPUT_ASSERT_EQUAL( 1, fixture->run_ ); --- 215,224 ---- &TestTestCaseFixture::run ), "Test1" ); + CPPUT_ASSERT( test->isTestCase() ); CPPUT_ASSERT_EQUAL( "Test1", test->name() ); CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! context.run( static_cast<CppUT::AbstractTestCase &>( *test ) ); CPPUT_ASSERT_EQUAL( 1, fixture->setUp_ ); CPPUT_ASSERT_EQUAL( 1, fixture->run_ ); *************** *** 231,239 **** CppUT::bind1( CppUT::makeMemFn1( fixture, &TestTestCaseFixture::runWithParameter ), 100 ), "Test1" ); CPPUT_ASSERT_EQUAL( "Test1", test->name() ); CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! test->run( context ); CPPUT_ASSERT_EQUAL( 0, fixture->setUp_ ); CPPUT_ASSERT_EQUAL( 111, fixture->run_ ); --- 236,245 ---- CppUT::bind1( CppUT::makeMemFn1( fixture, &TestTestCaseFixture::runWithParameter ), 100 ), "Test1" ); + CPPUT_ASSERT( test->isTestCase() ); CPPUT_ASSERT_EQUAL( "Test1", test->name() ); CppUT::TestContext context; CppUT::TestRunResult result; context.add( result ); ! context.run( static_cast<CppUT::AbstractTestCase &>( *test ) ); CPPUT_ASSERT_EQUAL( 0, fixture->setUp_ ); CPPUT_ASSERT_EQUAL( 111, fixture->run_ ); Index: cpputtest.vcproj =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/cpputtest.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** cpputtest.vcproj 22 Oct 2004 06:20:07 -0000 1.7 --- cpputtest.vcproj 17 Nov 2004 21:47:10 -0000 1.8 *************** *** 191,194 **** --- 191,206 ---- <File RelativePath="registrytest.cpp"> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> </File> <File *************** *** 200,203 **** --- 212,227 ---- <File RelativePath="testfixturetest.cpp"> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> </File> <File *************** *** 215,221 **** --- 239,269 ---- <File RelativePath=".\testtestcontext.cpp"> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> </File> <File RelativePath=".\testtestrunresult.cpp"> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCLCompilerTool"/> + </FileConfiguration> </File> <File |
