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

More minor tweaks

Browse Source
This commit is contained in:
Phil Nash 2015-10-29 19:33:25 +00:00
parent ef62b578e2
commit 73a140fb9e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
projects/SelfTest/PartTrackerTests.cpp
View File

@ -104,7 +104,7 @@ namespace Catch
class PartTrackerBase : public IPartTracker { class PartTrackerBase : public IPartTracker {
protected: protected:
enum RunState { enum CycleState {
NotStarted, NotStarted,
Executing, Executing,
ExecutingChildren, ExecutingChildren,
@ -125,18 +125,18 @@ namespace Catch
TrackerContext& m_ctx; TrackerContext& m_ctx;
IPartTracker* m_parent; IPartTracker* m_parent;
Children m_children; Children m_children;
RunState m_runState; CycleState m_runState;
public: public:
PartTrackerBase( std::string const& name, TrackerContext& ctx, IPartTracker* parent ) PartTrackerBase( std::string const& name, TrackerContext& ctx, IPartTracker* parent )
: m_name( name ), : m_name( name ),
m_ctx( ctx ), m_ctx( ctx ),
m_parent( parent ), m_parent( parent ),
m_runState( NotStarted ) {} m_runState( NotStarted )
{}
virtual std::string name() const CATCH_OVERRIDE { virtual std::string name() const CATCH_OVERRIDE {
return m_name; return m_name;
} }
virtual bool isComplete() const CATCH_OVERRIDE { virtual bool isComplete() const CATCH_OVERRIDE {
return m_runState == CompletedSuccessfully || m_runState == Failed; return m_runState == CompletedSuccessfully || m_runState == Failed;
} }
@ -227,7 +227,6 @@ namespace Catch
}; };
class SectionTracker : public PartTrackerBase { class SectionTracker : public PartTrackerBase {
public: public:
SectionTracker( std::string const& name, TrackerContext& ctx, IPartTracker* parent ) SectionTracker( std::string const& name, TrackerContext& ctx, IPartTracker* parent )
@ -438,7 +437,6 @@ TEST_CASE( "PartTracker" ) {
REQUIRE( s2b.isSuccessfullyCompleted() == false ); REQUIRE( s2b.isSuccessfullyCompleted() == false );
testCase2.close(); testCase2.close();
// REQUIRE( testCase2.isComplete() );
REQUIRE( testCase2.isSuccessfullyCompleted() == false ); REQUIRE( testCase2.isSuccessfullyCompleted() == false );
// Need a final cycle // Need a final cycle