3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1673 from sfranzen/fix-sections 

Fix TrackerBase::close children completion check
This commit is contained in:
Martin Hořeňovský 2019-06-30 09:17:01 +02:00 committed by GitHub
parent 6f32c67ea7 9a6551b22b
commit 2c3018a9d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_test_case_tracker.cpp
View File

@ -139,7 +139,7 @@ namespace TestCaseTracking {
m_runState = CompletedSuccessfully; m_runState = CompletedSuccessfully;
break; break;
case ExecutingChildren: case ExecutingChildren:
if( m_children.empty() || m_children.back()->isComplete() ) if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
m_runState = CompletedSuccessfully; m_runState = CompletedSuccessfully;
break; break;

2
projects/CMakeLists.txt
View File

@ -378,6 +378,8 @@ set_tests_properties(FilteredSection-2 PROPERTIES FAIL_REGULAR_EXPRESSION "No te
add_test(NAME ApprovalTests COMMAND ${PYTHON_EXECUTABLE} ${CATCH_DIR}/scripts/approvalTests.py $<TARGET_FILE:SelfTest>) add_test(NAME ApprovalTests COMMAND ${PYTHON_EXECUTABLE} ${CATCH_DIR}/scripts/approvalTests.py $<TARGET_FILE:SelfTest>)
set_tests_properties(ApprovalTests PROPERTIES FAIL_REGULAR_EXPRESSION "Results differed") set_tests_properties(ApprovalTests PROPERTIES FAIL_REGULAR_EXPRESSION "Results differed")
add_test(NAME RegressionCheck-1670 COMMAND $<TARGET_FILE:SelfTest> "#1670 regression check" -c A -r compact)
set_tests_properties(RegressionCheck-1670 PROPERTIES PASS_REGULAR_EXPRESSION "Passed 1 test case with 2 assertions.")
if (CATCH_USE_VALGRIND) if (CATCH_USE_VALGRIND)
add_test(NAME ValgrindRunTests COMMAND valgrind --leak-check=full --error-exitcode=1 $<TARGET_FILE:SelfTest>) add_test(NAME ValgrindRunTests COMMAND valgrind --leak-check=full --error-exitcode=1 $<TARGET_FILE:SelfTest>)

15
projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp
View File

@ -189,3 +189,18 @@ TEST_CASE( "#1394 nested", "[.][approvals][tracker]" ) {
REQUIRE(1 == 0); REQUIRE(1 == 0);
} }
} }
// Selecting a "not last" section inside a test case via -c "section" would
// previously only run the first subsection, instead of running all of them.
// This allows us to check that `"#1670 regression check" -c A` leads to
// 2 successful assertions.
TEST_CASE("#1670 regression check", "[.approvals][tracker]") {
SECTION("A") {
SECTION("1") SUCCEED();
SECTION("2") SUCCEED();
}
SECTION("B") {
SECTION("1") SUCCEED();
SECTION("2") SUCCEED();
}
}