Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/catch2/internal/catch_test_case_tracker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,11 @@ namespace TestCaseTracking {
currentTracker.addChild( CATCH_MOVE( newTracker ) );
}

if ( ctx.completedCycle() && tracker->isOpen() ) {
CATCH_INTERNAL_ERROR(
"The same SECTION was encountered multiple times in one test cycle" );
}

if ( !ctx.completedCycle() ) {
tracker->tryOpen();
}
Expand Down
22 changes: 22 additions & 0 deletions tests/SelfTest/IntrospectiveTests/PartTracker.tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,28 @@ TEST_CASE( "Tracker" ) {
}
}

TEST_CASE( "Tracker rejects a section encountered twice in one cycle" ) {
TrackerContext ctx;
ITracker& root = ctx.startRun();
std::vector<PathFilter> dummyFilters;
root.setFilters( &dummyFilters, false );
ctx.startCycle();

ITracker& testCase = SectionTracker::acquire( ctx, makeNAL( "Testcase" ) );
ITracker& section = SectionTracker::acquire( ctx, makeNAL( "Section" ) );
ITracker& firstChild = SectionTracker::acquire( ctx, makeNAL( "First child" ) );

firstChild.close();
SectionTracker::acquire( ctx, makeNAL( "Second child" ) );
section.close();

REQUIRE( ctx.completedCycle() );
REQUIRE( section.isOpen() );
REQUIRE_THROWS( SectionTracker::acquire( ctx, makeNAL( "Section" ) ) );

testCase.close();
}

static bool previouslyRun = false;
static bool previouslyRunNested = false;

Expand Down