mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-25 14:56:10 +01:00
e1e6872c4c
This is both a really big and a really small commit. It is small in that it only contains renaming, moving and modification of include directives caused by this. It is really big in the obvious way of touching something like 200 files. The new rules for naming files is simple: headers use the `.hpp` extension. The rules for physical file layout is still kinda in progress, but the basics are also simple: * Significant parts of functionality get their own subfolder * Benchmarking is in `catch2/benchmark` * Matchers are in `catch2/matchers` * Generators are in `catch2/generators` * Reporters are in `catch2/reporters` * Baseline testing facilities are in `catch2/` * Various top level folders also contain `internal` subfolder, with files that users probably do not want to include directly, at least not until they have to write something like their own reporter. * The exact files in these subfolders is likely to change later on Note that while some includes were cleaned up in this commit, it is only the low hanging fruit and further cleanup using automatic tooling will happen later. Also note that various include guards, copyright notices and file headers will also be standardized later, rather than in this commit.
204 lines
6.3 KiB
C++
204 lines
6.3 KiB
C++
/*
|
|
* 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 <catch2/catch_test_macros.hpp>
|
|
#include <catch2/internal/catch_test_case_tracker.hpp>
|
|
|
|
|
|
using namespace Catch;
|
|
|
|
namespace {
|
|
Catch::TestCaseTracking::NameAndLocation makeNAL( std::string const& name ) {
|
|
return Catch::TestCaseTracking::NameAndLocation( name, Catch::SourceLineInfo("",0) );
|
|
}
|
|
}
|
|
|
|
TEST_CASE( "Tracker" ) {
|
|
|
|
TrackerContext ctx;
|
|
ctx.startRun();
|
|
ctx.startCycle();
|
|
|
|
|
|
ITracker& testCase = SectionTracker::acquire( ctx, makeNAL( "Testcase" ) );
|
|
REQUIRE( testCase.isOpen() );
|
|
|
|
ITracker& s1 = SectionTracker::acquire( ctx, makeNAL( "S1" ) );
|
|
REQUIRE( s1.isOpen() );
|
|
|
|
SECTION( "successfully close one section" ) {
|
|
s1.close();
|
|
REQUIRE( s1.isSuccessfullyCompleted() );
|
|
REQUIRE( testCase.isComplete() == false );
|
|
|
|
testCase.close();
|
|
REQUIRE( ctx.completedCycle() );
|
|
REQUIRE( testCase.isSuccessfullyCompleted() );
|
|
}
|
|
|
|
SECTION( "fail one section" ) {
|
|
s1.fail();
|
|
REQUIRE( s1.isComplete() );
|
|
REQUIRE( s1.isSuccessfullyCompleted() == false );
|
|
REQUIRE( testCase.isComplete() == false );
|
|
|
|
testCase.close();
|
|
REQUIRE( ctx.completedCycle() );
|
|
REQUIRE( testCase.isSuccessfullyCompleted() == false );
|
|
|
|
SECTION( "re-enter after failed section" ) {
|
|
ctx.startCycle();
|
|
ITracker& testCase2 = SectionTracker::acquire( ctx, makeNAL( "Testcase" ) );
|
|
REQUIRE( testCase2.isOpen() );
|
|
|
|
ITracker& s1b = SectionTracker::acquire( ctx, makeNAL( "S1" ) );
|
|
REQUIRE( s1b.isOpen() == false );
|
|
|
|
testCase2.close();
|
|
REQUIRE( ctx.completedCycle() );
|
|
REQUIRE( testCase.isComplete() );
|
|
REQUIRE( testCase.isSuccessfullyCompleted() );
|
|
}
|
|
SECTION( "re-enter after failed section and find next section" ) {
|
|
ctx.startCycle();
|
|
ITracker& testCase2 = SectionTracker::acquire( ctx, makeNAL( "Testcase" ) );
|
|
REQUIRE( testCase2.isOpen() );
|
|
|
|
ITracker& s1b = SectionTracker::acquire( ctx, makeNAL( "S1" ) );
|
|
REQUIRE( s1b.isOpen() == false );
|
|
|
|
ITracker& s2 = SectionTracker::acquire( ctx, makeNAL( "S2" ) );
|
|
REQUIRE( s2.isOpen() );
|
|
|
|
s2.close();
|
|
REQUIRE( ctx.completedCycle() );
|
|
|
|
testCase2.close();
|
|
REQUIRE( testCase.isComplete() );
|
|
REQUIRE( testCase.isSuccessfullyCompleted() );
|
|
}
|
|
}
|
|
|
|
SECTION( "successfully close one section, then find another" ) {
|
|
s1.close();
|
|
|
|
ITracker& s2 = SectionTracker::acquire( ctx, makeNAL( "S2" ) );
|
|
REQUIRE( s2.isOpen() == false );
|
|
|
|
testCase.close();
|
|
REQUIRE( testCase.isComplete() == false );
|
|
|
|
SECTION( "Re-enter - skips S1 and enters S2" ) {
|
|
ctx.startCycle();
|
|
ITracker& testCase2 = SectionTracker::acquire( ctx, makeNAL( "Testcase" ) );
|
|
REQUIRE( testCase2.isOpen() );
|
|
|
|
ITracker& s1b = SectionTracker::acquire( ctx, makeNAL( "S1" ) );
|
|
REQUIRE( s1b.isOpen() == false );
|
|
|
|
ITracker& s2b = SectionTracker::acquire( ctx, makeNAL( "S2" ) );
|
|
REQUIRE( s2b.isOpen() );
|
|
|
|
REQUIRE( ctx.completedCycle() == false );
|
|
|
|
SECTION ("Successfully close S2") {
|
|
s2b.close();
|
|
REQUIRE( ctx.completedCycle() );
|
|
|
|
REQUIRE( s2b.isSuccessfullyCompleted() );
|
|
REQUIRE( testCase2.isComplete() == false );
|
|
|
|
testCase2.close();
|
|
REQUIRE( testCase2.isSuccessfullyCompleted() );
|
|
}
|
|
SECTION ("fail S2") {
|
|
s2b.fail();
|
|
REQUIRE( ctx.completedCycle() );
|
|
|
|
REQUIRE( s2b.isComplete() );
|
|
REQUIRE( s2b.isSuccessfullyCompleted() == false );
|
|
|
|
testCase2.close();
|
|
REQUIRE( testCase2.isSuccessfullyCompleted() == false );
|
|
|
|
// Need a final cycle
|
|
ctx.startCycle();
|
|
ITracker& testCase3 = SectionTracker::acquire( ctx, makeNAL( "Testcase" ) );
|
|
REQUIRE( testCase3.isOpen() );
|
|
|
|
ITracker& s1c = SectionTracker::acquire( ctx, makeNAL( "S1" ) );
|
|
REQUIRE( s1c.isOpen() == false );
|
|
|
|
ITracker& s2c = SectionTracker::acquire( ctx, makeNAL( "S2" ) );
|
|
REQUIRE( s2c.isOpen() == false );
|
|
|
|
testCase3.close();
|
|
REQUIRE( testCase3.isSuccessfullyCompleted() );
|
|
}
|
|
}
|
|
}
|
|
|
|
SECTION( "open a nested section" ) {
|
|
ITracker& s2 = SectionTracker::acquire( ctx, makeNAL( "S2" ) );
|
|
REQUIRE( s2.isOpen() );
|
|
|
|
s2.close();
|
|
REQUIRE( s2.isComplete() );
|
|
REQUIRE( s1.isComplete() == false );
|
|
|
|
s1.close();
|
|
REQUIRE( s1.isComplete() );
|
|
REQUIRE( testCase.isComplete() == false );
|
|
|
|
testCase.close();
|
|
REQUIRE( testCase.isComplete() );
|
|
}
|
|
}
|
|
|
|
static bool previouslyRun = false;
|
|
static bool previouslyRunNested = false;
|
|
|
|
TEST_CASE( "#1394", "[.][approvals][tracker]" ) {
|
|
// -- Don't re-run after specified section is done
|
|
REQUIRE(previouslyRun == false);
|
|
|
|
SECTION( "RunSection" ) {
|
|
previouslyRun = true;
|
|
}
|
|
SECTION( "SkipSection" ) {
|
|
// cause an error if this section is called because it shouldn't be
|
|
REQUIRE(1 == 0);
|
|
}
|
|
}
|
|
|
|
TEST_CASE( "#1394 nested", "[.][approvals][tracker]" ) {
|
|
REQUIRE(previouslyRunNested == false);
|
|
|
|
SECTION( "NestedRunSection" ) {
|
|
SECTION( "s1" ) {
|
|
previouslyRunNested = true;
|
|
}
|
|
}
|
|
SECTION( "NestedSkipSection" ) {
|
|
// cause an error if this section is called because it shouldn't be
|
|
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();
|
|
}
|
|
}
|