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

More reformatting

Browse Source
This commit is contained in:
Phil Nash
2012-05-10 21:46:46 +01:00
parent d53573c95a
commit d10d2d3485
6 changed files with 150 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
include/internal/catch_test_case_registry_impl.hpp
View File

@@ -1,15 +1,10 @@
/*
* catch_test_case_registry_impl.hpp
* Catch
*
* Created by Phil on 7/1/2011
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
*
* Distributed under the Boost Software License, Version 1.0. (See accompanying
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*
*/
#include "catch_test_registry.hpp"
#include "catch_test_case_info.hpp"
#include "catch_context.h"
@@ -20,35 +15,22 @@
namespace Catch
{
class TestRegistry : public ITestCaseRegistry
{
class TestRegistry : public ITestCaseRegistry {
public:
///////////////////////////////////////////////////////////////////////////
TestRegistry
()
: m_unnamedCount( 0 )
{
}
TestRegistry() : m_unnamedCount( 0 ) {}
///////////////////////////////////////////////////////////////////////////
virtual void registerTest
(
const TestCaseInfo& testInfo
)
{
if( testInfo.getName() == "" )
{
virtual void registerTest( const TestCaseInfo& testInfo ) {
if( testInfo.getName() == "" ) {
std::ostringstream oss;
oss << testInfo.getName() << "unnamed/" << ++m_unnamedCount;
return registerTest( TestCaseInfo( testInfo, oss.str() ) );
}
if( m_functions.find( testInfo ) == m_functions.end() )
{
if( m_functions.find( testInfo ) == m_functions.end() ) {
m_functions.insert( testInfo );
m_functionsInOrder.push_back( testInfo );
}
else
{
else {
const TestCaseInfo& prev = *m_functions.find( testInfo );
std::cerr << "error: TEST_CASE( \"" << testInfo.getName() << "\" ) already defined.\n"
<< "\tFirst seen at " << SourceLineInfo( prev.getLineInfo() ) << "\n"
@@ -57,29 +39,18 @@ namespace Catch
}
}
///////////////////////////////////////////////////////////////////////////
virtual const std::vector<TestCaseInfo>& getAllTests
()
const
{
virtual const std::vector<TestCaseInfo>& getAllTests() const {
return m_functionsInOrder;
}
///////////////////////////////////////////////////////////////////////////
virtual std::vector<TestCaseInfo> getMatchingTestCases
(
const std::string& rawTestSpec
)
{
virtual std::vector<TestCaseInfo> getMatchingTestCases( const std::string& rawTestSpec ) {
TestSpec testSpec( rawTestSpec );
std::vector<TestCaseInfo> testList;
std::vector<TestCaseInfo>::const_iterator it = m_functionsInOrder.begin();
std::vector<TestCaseInfo>::const_iterator itEnd = m_functionsInOrder.end();
for(; it != itEnd; ++it )
{
if( testSpec.matches( it->getName() ) )
{
for(; it != itEnd; ++it ) {
if( testSpec.matches( it->getName() ) ) {
testList.push_back( *it );
}
}
@@ -94,53 +65,26 @@ namespace Catch
};
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
struct FreeFunctionTestCase : ITestCase
{
///////////////////////////////////////////////////////////////////////////
FreeFunctionTestCase
(
TestFunction fun
)
: m_fun( fun )
{}
///////////////////////////////////////////////////////////////////////////
virtual void invoke
()
const
{
class FreeFunctionTestCase : public ITestCase {
public:
FreeFunctionTestCase( TestFunction fun ) : m_fun( fun ) {}
virtual void invoke() const {
m_fun();
}
///////////////////////////////////////////////////////////////////////////
virtual ITestCase* clone
()
const
{
virtual ITestCase* clone() const {
return new FreeFunctionTestCase( m_fun );
}
///////////////////////////////////////////////////////////////////////////
virtual bool operator ==
(
const ITestCase& other
)
const
{
virtual bool operator == ( const ITestCase& other ) const {
const FreeFunctionTestCase* ffOther = dynamic_cast<const FreeFunctionTestCase*> ( &other );
return ffOther && m_fun == ffOther->m_fun;
}
///////////////////////////////////////////////////////////////////////////
virtual bool operator <
(
const ITestCase& other
)
const
{
virtual bool operator < ( const ITestCase& other ) const {
const FreeFunctionTestCase* ffOther = dynamic_cast<const FreeFunctionTestCase*> ( &other );
return ffOther && m_fun < ffOther->m_fun;
}
@@ -149,36 +93,21 @@ namespace Catch
TestFunction m_fun;
};
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
AutoReg::AutoReg
(
TestFunction function,
const char* name,
const char* description,
const SourceLineInfo& lineInfo
)
{
AutoReg::AutoReg( TestFunction function,
const char* name,
const char* description,
const SourceLineInfo& lineInfo ) {
registerTestCase( new FreeFunctionTestCase( function ), name, description, lineInfo );
}
///////////////////////////////////////////////////////////////////////////
AutoReg::~AutoReg
()
{
}
AutoReg::~AutoReg() {}
///////////////////////////////////////////////////////////////////////////
void AutoReg::registerTestCase
(
ITestCase* testCase,
const char* name,
const char* description,
const SourceLineInfo& lineInfo
)
{
void AutoReg::registerTestCase( ITestCase* testCase,
const char* name,
const char* description,
const SourceLineInfo& lineInfo ) {
Context::getTestCaseRegistry().registerTest( TestCaseInfo( testCase, name, description, lineInfo ) );
}