3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 15:26:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored self-test - doesn't need so many supporting classes

Browse Source
This commit is contained in:
Phil Nash 2011-02-09 09:08:10 +00:00
parent c8f12e1175
commit 3bad3d6956
2 changed files with 35 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Test/TestMain.cpp
View File

@ -21,10 +21,11 @@ TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results"
EmbeddedRunner runner; EmbeddedRunner runner;
runner.runMatching( "./succeeding/*" ); runner.runMatching( "./succeeding/*" );
CHECK( runner.getReporter().getSucceeded() == 196 ); INFO( runner.getOutput() );
CHECK( runner.getReporter().getFailed() == 0 ); CHECK( runner.getSuccessCount() == 196 );
CHECK( runner.getFailureCount() == 0 );
runner.runMatching( "./failing/*" ); runner.runMatching( "./failing/*" );
CHECK( runner.getReporter().getSucceeded() == 0 ); CHECK( runner.getSuccessCount() == 0 );
CHECK( runner.getReporter().getFailed() == 53 ); CHECK( runner.getFailureCount() == 53 );
} }

135
internal/catch_self_test.hpp
View File

@ -17,106 +17,6 @@
namespace Catch namespace Catch
{ {
class SelfTestReporter : public IReporter
{
public:
///////////////////////////////////////////////////////////////////////////
SelfTestReporter
()
: m_succeeded( 0 ),
m_failed( 0 )
{
}
///////////////////////////////////////////////////////////////////////////
static std::string getDescription
()
{
return "Captures results for self test purposes";
}
///////////////////////////////////////////////////////////////////////////
size_t getSucceeded
()
const
{
return m_succeeded;
}
///////////////////////////////////////////////////////////////////////////
size_t getFailed
()
const
{
return m_failed;
}
///////////////////////////////////////////////////////////////////////////
void reset()
{
m_succeeded = 0;
m_failed = 0;
}
private: // IReporter
///////////////////////////////////////////////////////////////////////////
virtual void StartTesting
()
{}
///////////////////////////////////////////////////////////////////////////
virtual void EndTesting
(
std::size_t succeeded,
std::size_t failed
)
{
m_succeeded = succeeded;
m_failed = failed;
}
///////////////////////////////////////////////////////////////////////////
// Deliberately unimplemented:
virtual void StartGroup( const std::string& ){}
virtual void EndGroup( const std::string&, std::size_t, std::size_t ){}
virtual void StartTestCase( const TestCaseInfo& ){}
virtual void StartSection( const std::string&, const std::string ){}
virtual void EndSection( const std::string&, std::size_t, std::size_t ){}
virtual void Result( const ResultInfo& ){}
virtual void EndTestCase( const TestCaseInfo&, std::size_t, std::size_t, const std::string&, const std::string& ){}
private:
size_t m_succeeded;
size_t m_failed;
};
class SelfTestConfig : public Config
{
public:
///////////////////////////////////////////////////////////////////////////
SelfTestConfig
()
: m_reporter( new SelfTestReporter() )
{
// reporter will be deleted by the base config class
setReporter( m_reporter );
setStreamBuf( m_oss.rdbuf() );
}
///////////////////////////////////////////////////////////////////////////
SelfTestReporter& getReporter
()
{
return *m_reporter;
}
private:
std::ostringstream m_oss;
SelfTestReporter* m_reporter;
};
class EmbeddedRunner class EmbeddedRunner
{ {
@ -133,22 +33,47 @@ namespace Catch
const std::string& rawTestSpec const std::string& rawTestSpec
) )
{ {
std::ostringstream oss;
Config config;
config.setStreamBuf( oss.rdbuf() );
config.setReporter( "basic" );
std::size_t result; std::size_t result;
Runner runner( m_config ); Runner runner( config );
m_config.getReporter().reset();
result = runner.runMatching( rawTestSpec ); result = runner.runMatching( rawTestSpec );
m_successes = runner.getSuccessCount();
m_failures = runner.getFailureCount();
m_output = oss.str();
return result; return result;
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
SelfTestReporter& getReporter std::string getOutput
() ()
{ {
return m_config.getReporter(); return m_output;
}
///////////////////////////////////////////////////////////////////////////
std::size_t getSuccessCount
()
const
{
return m_successes;
}
///////////////////////////////////////////////////////////////////////////
std:: size_t getFailureCount
()
const
{
return m_failures;
} }
private: private:
SelfTestConfig m_config; std::size_t m_successes;
std::size_t m_failures;
std::string m_output;
}; };
} }