Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include/internal
diff options
context:
space:
mode:
authorPhil Nash2012-12-05 08:40:53 +0000
committerPhil Nash2012-12-05 08:40:53 +0000
commitfe98123d0bcfac7c47f398b9ca6bd2dca5b41c6e (patch)
tree40b32e32431633c40aa42f4a2db209f214ff33c0 /include/internal
parentf276a0588c8c057b642266a94f893133fe0d99ef (diff)
downloadcatch3-fe98123d0bcfac7c47f398b9ca6bd2dca5b41c6e.tar.gz
Started new reporter, "console", which will replace "basic" when done.
Introduced Option template as part of this.
Diffstat (limited to 'include/internal')
-rw-r--r--include/internal/catch_impl.hpp4
-rw-r--r--include/internal/catch_interfaces_reporter.h71
-rw-r--r--include/internal/catch_option.hpp64
-rw-r--r--include/internal/catch_ptr.hpp6
-rw-r--r--include/internal/catch_test_case_info.h2
-rw-r--r--include/internal/catch_test_case_info.hpp8
6 files changed, 149 insertions, 6 deletions
diff --git a/include/internal/catch_impl.hpp b/include/internal/catch_impl.hpp
index 014a6345..8b4c226c 100644
--- a/include/internal/catch_impl.hpp
+++ b/include/internal/catch_impl.hpp
@@ -31,6 +31,7 @@
#include "../reporters/catch_reporter_basic.hpp"
#include "../reporters/catch_reporter_xml.hpp"
#include "../reporters/catch_reporter_junit.hpp"
+#include "../reporters/catch_reporter_console.hpp"
namespace Catch {
NonCopyable::~NonCopyable() {}
@@ -54,8 +55,11 @@ namespace Catch {
TestCaseStats::~TestCaseStats() {}
TestGroupStats::~TestGroupStats() {}
TestRunStats::~TestRunStats() {}
+ ThreadedSectionInfo::~ThreadedSectionInfo() {}
BasicReporter::~BasicReporter() {}
+ AccumulatingReporter::~AccumulatingReporter() {}
+ ConsoleReporter::~ConsoleReporter() {}
IRunner::~IRunner() {}
IMutableContext::~IMutableContext() {}
IConfig::~IConfig() {}
diff --git a/include/internal/catch_interfaces_reporter.h b/include/internal/catch_interfaces_reporter.h
index fc272755..2743e969 100644
--- a/include/internal/catch_interfaces_reporter.h
+++ b/include/internal/catch_interfaces_reporter.h
@@ -14,6 +14,7 @@
#include "catch_config.hpp"
#include "catch_test_case_info.h"
#include "catch_assertionresult.h"
+#include "catch_option.hpp"
#include <string>
#include <ostream>
@@ -25,7 +26,7 @@ namespace Catch
ReporterConfig( std::ostream& _stream, ConfigData const& _fullConfig )
: m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
- std::ostream& stream() { return *m_stream; }
+ std::ostream& stream() const { return *m_stream; }
std::string name() const { return m_fullConfig.name; }
bool includeSuccessfulResults() const { return m_fullConfig.includeWhichResults == Include::SuccessfulResults; }
bool warnAboutMissingAssertions() const { return m_fullConfig.warnings & ConfigData::WarnAbout::NoAssertions; }
@@ -66,6 +67,17 @@ namespace Catch
SourceLineInfo lineInfo;
};
+ struct ThreadedSectionInfo : SectionInfo, SharedImpl<> {
+ ThreadedSectionInfo( SectionInfo const& _sectionInfo, Ptr<ThreadedSectionInfo> const& _parent = Ptr<ThreadedSectionInfo>() )
+ : SectionInfo( _sectionInfo ),
+ parent( _parent )
+ {}
+ virtual ~ThreadedSectionInfo();
+
+ std::vector<Ptr<ThreadedSectionInfo> > children;
+ Ptr<ThreadedSectionInfo> parent;
+ };
+
struct AssertionStats : SharedImpl<> {
AssertionStats( AssertionResult const& _assertionResult,
Totals const& _totals )
@@ -150,6 +162,10 @@ namespace Catch
// !Work In progress
struct IStreamingReporter : IShared {
virtual ~IStreamingReporter();
+
+ // Implementing class must also provide the following static methid:
+ // static std::string getDescription();
+
virtual ReporterPreferences getPreferences() const = 0;
virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
@@ -171,6 +187,59 @@ namespace Catch
// - this would be used by the JUnit reporter, for example.
// - it may be used by the basic reporter, too, but that would clear down the stack
// as it goes
+ struct AccumulatingReporter : SharedImpl<IStreamingReporter> {
+
+ AccumulatingReporter( ReporterConfig const& _config )
+ : stream( _config.stream() )
+ {}
+
+ virtual ~AccumulatingReporter();
+
+ virtual void testRunStarting( TestRunInfo const& _testRunInfo ) {
+ testRunInfo = _testRunInfo;
+ }
+ virtual void testGroupStarting( GroupInfo const& _groupInfo ) {
+ unusedGroupInfo = _groupInfo;
+ }
+
+ virtual void testCaseStarting( TestCaseInfo const& _testInfo ) {
+ unusedTestCaseInfo = _testInfo;
+ }
+ virtual void sectionStarting( SectionInfo const& _sectionInfo ) {
+ Ptr<ThreadedSectionInfo> sectionInfo = new ThreadedSectionInfo( _sectionInfo );
+ unusedSectionInfo = sectionInfo;
+ if( !currentSectionInfo ) {
+ currentSectionInfo = sectionInfo;
+ }
+ else {
+ currentSectionInfo->children.push_back( sectionInfo );
+ sectionInfo->parent = currentSectionInfo;
+ currentSectionInfo = sectionInfo;
+ }
+ }
+
+ virtual void sectionEnded( Ptr<SectionStats const> const& /* _sectionStats */ ) {
+ currentSectionInfo = currentSectionInfo->parent;
+ unusedSectionInfo = currentSectionInfo;
+ }
+ virtual void testCaseEnded( Ptr<TestCaseStats const> const& /* _testCaseStats */ ) {
+ unusedTestCaseInfo.reset();
+ }
+ virtual void testGroupEnded( Ptr<TestGroupStats const> const& /* _testGroupStats */ ) {
+ unusedGroupInfo.reset();
+ }
+ virtual void testRunEnded( Ptr<TestRunStats const> const& /* _testRunStats */ ) {
+ }
+
+ Option<TestRunInfo> testRunInfo;
+ Option<GroupInfo> unusedGroupInfo;
+ Option<TestCaseInfo> unusedTestCaseInfo;
+ Ptr<ThreadedSectionInfo> unusedSectionInfo;
+ Ptr<ThreadedSectionInfo> currentSectionInfo;
+ bool currentSectionOpen;
+ std::ostream& stream;
+ };
+
// Deprecated
diff --git a/include/internal/catch_option.hpp b/include/internal/catch_option.hpp
new file mode 100644
index 00000000..0b01a4dc
--- /dev/null
+++ b/include/internal/catch_option.hpp
@@ -0,0 +1,64 @@
+/*
+ * Created by Phil on 02/12/2012.
+ * Copyright 2012 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)
+ */
+#ifndef TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED
+
+#include "catch_common.h"
+
+namespace Catch {
+
+ // An optional type
+ template<typename T>
+ class Option {
+ public:
+ Option() : nullableValue( NULL ) {}
+ Option( T const& _value )
+ : nullableValue( new( storage ) T( _value ) )
+ {}
+ Option( Option const& _other )
+ : nullableValue( _other ? new( storage ) T( *_other ) : NULL )
+ {}
+
+ ~Option() {
+ reset();
+ }
+
+ Option& operator= ( Option const& _other ) {
+ reset();
+ if( _other )
+ nullableValue = new( storage ) T( *_other );
+ return *this;
+ }
+
+ void reset() {
+ if( nullableValue )
+ nullableValue->~T();
+ nullableValue = NULL;
+ }
+ T& operator*() { return *nullableValue; }
+ const T& operator*() const { return *nullableValue; }
+ T* operator->() { return nullableValue; }
+ const T* operator->() const { return nullableValue; }
+
+ bool some() const { return nullableValue != NULL; }
+ bool none() const { return nullableValue == NULL; }
+
+ bool operator !() const { return nullableValue == NULL; }
+ operator SafeBool::type() const {
+ return SafeBool::makeSafe( some() );
+ }
+
+ private:
+ T* nullableValue;
+ char storage[sizeof(T)];
+ };
+
+
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED
diff --git a/include/internal/catch_ptr.hpp b/include/internal/catch_ptr.hpp
index 60000aaa..2817ddd1 100644
--- a/include/internal/catch_ptr.hpp
+++ b/include/internal/catch_ptr.hpp
@@ -31,6 +31,11 @@ namespace Catch {
if( m_p )
m_p->release();
}
+ void reset() {
+ if( m_p )
+ m_p->release();
+ m_p = NULL;
+ }
Ptr& operator = ( T* p ){
Ptr temp( p );
swap( temp );
@@ -47,6 +52,7 @@ namespace Catch {
T& operator*() const { return *m_p; }
T* operator->() const { return m_p; }
bool operator !() const { return m_p == NULL; }
+ operator SafeBool::type() const { return SafeBool::makeSafe( m_p != NULL ); }
private:
T* m_p;
diff --git a/include/internal/catch_test_case_info.h b/include/internal/catch_test_case_info.h
index b3f133b4..fd4e44ad 100644
--- a/include/internal/catch_test_case_info.h
+++ b/include/internal/catch_test_case_info.h
@@ -31,8 +31,8 @@ namespace Catch {
std::string className;
std::string description;
std::set<std::string> tags;
- bool isHidden;
SourceLineInfo lineInfo;
+ bool isHidden;
};
class TestCase : protected TestCaseInfo {
diff --git a/include/internal/catch_test_case_info.hpp b/include/internal/catch_test_case_info.hpp
index e7e12166..6795047d 100644
--- a/include/internal/catch_test_case_info.hpp
+++ b/include/internal/catch_test_case_info.hpp
@@ -41,8 +41,8 @@ namespace Catch {
className( _className ),
description( _description ),
tags( _tags ),
- isHidden( _isHidden ),
- lineInfo( _lineInfo )
+ lineInfo( _lineInfo ),
+ isHidden( _isHidden )
{}
TestCaseInfo::TestCaseInfo( const TestCaseInfo& other )
@@ -50,8 +50,8 @@ namespace Catch {
className( other.className ),
description( other.description ),
tags( other.tags ),
- isHidden( other.isHidden ),
- lineInfo( other.lineInfo )
+ lineInfo( other.lineInfo ),
+ isHidden( other.isHidden )
{}
TestCase::TestCase( ITestCase* testCase, const TestCaseInfo& info ) : TestCaseInfo( info ), test( testCase ) {}