mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 05:16:10 +01:00
Examples: remove references to catch_default_main
catch_default_main.hpp was removed in db32550898
The example 000-CatchMain.cpp is no longer compiled, but is still
present in the examples and is still references by other example
files. Remove the file and references to it, as they are confusing.
This commit is contained in:
parent
33ffc3b6fc
commit
0c722564c3
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
## Already available
|
## Already available
|
||||||
|
|
||||||
- Catch main: [Catch-provided main](../examples/000-CatchMain.cpp)
|
|
||||||
- Test Case: [Single-file](../examples/010-TestCase.cpp)
|
- Test Case: [Single-file](../examples/010-TestCase.cpp)
|
||||||
- Test Case: [Multiple-file 1](../examples/020-TestCase-1.cpp), [2](../examples/020-TestCase-2.cpp)
|
- Test Case: [Multiple-file 1](../examples/020-TestCase-1.cpp), [2](../examples/020-TestCase-2.cpp)
|
||||||
- Assertion: [REQUIRE, CHECK](../examples/030-Asn-Require-Check.cpp)
|
- Assertion: [REQUIRE, CHECK](../examples/030-Asn-Require-Check.cpp)
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
// 000-CatchMain.cpp
|
|
||||||
|
|
||||||
// It is generally recommended to have a single file provide the main
|
|
||||||
// of a testing binary, and other test files to link against it.
|
|
||||||
|
|
||||||
// Let Catch provide main():
|
|
||||||
#include <catch2/internal/catch_default_main.hpp>
|
|
||||||
|
|
||||||
// That's it
|
|
||||||
|
|
||||||
// Compile implementation of Catch for use with files that do contain tests:
|
|
||||||
// - g++ -std=c++11 -Wall -I$(CATCH_SINGLE_INCLUDE) -c 000-CatchMain.cpp
|
|
||||||
// - cl -EHsc -I%CATCH_SINGLE_INCLUDE% -c 000-CatchMain.cpp
|
|
@ -8,7 +8,7 @@
|
|||||||
// - REQUIRE_FALSE() stops at first failure.
|
// - REQUIRE_FALSE() stops at first failure.
|
||||||
// - CHECK_FALSE() continues after failure.
|
// - CHECK_FALSE() continues after failure.
|
||||||
|
|
||||||
// main() provided in 000-CatchMain.cpp
|
// main() provided by linkage to Catch2WithMain
|
||||||
|
|
||||||
#include <catch2/catch_test_macros.hpp>
|
#include <catch2/catch_test_macros.hpp>
|
||||||
|
|
||||||
@ -53,8 +53,8 @@ TEST_CASE( "Assert that something is false (continue after failure)", "[check-fa
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Compile & run:
|
// Compile & run:
|
||||||
// - g++ -std=c++11 -Wall -I$(CATCH_SINGLE_INCLUDE) -o 030-Asn-Require-Check 030-Asn-Require-Check.cpp 000-CatchMain.o && 030-Asn-Require-Check --success
|
// - g++ -std=c++11 -Wall -I$(CATCH_SINGLE_INCLUDE) -o 030-Asn-Require-Check 030-Asn-Require-Check.cpp && 030-Asn-Require-Check --success
|
||||||
// - cl -EHsc -I%CATCH_SINGLE_INCLUDE% 030-Asn-Require-Check.cpp 000-CatchMain.obj && 030-Asn-Require-Check --success
|
// - cl -EHsc -I%CATCH_SINGLE_INCLUDE% 030-Asn-Require-Check.cpp && 030-Asn-Require-Check --success
|
||||||
|
|
||||||
// Expected compact output (all assertions):
|
// Expected compact output (all assertions):
|
||||||
//
|
//
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
// - Sections (this file)
|
// - Sections (this file)
|
||||||
// - Traditional class-based fixtures
|
// - Traditional class-based fixtures
|
||||||
|
|
||||||
// main() provided in 000-CatchMain.cpp
|
// main() provided by linkage to Catch2WithMain
|
||||||
|
|
||||||
#include <catch2/catch_test_macros.hpp>
|
#include <catch2/catch_test_macros.hpp>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
@ -45,8 +45,8 @@ TEST_CASE( "vectors can be sized and resized", "[vector]" ) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Compile & run:
|
// Compile & run:
|
||||||
// - g++ -std=c++11 -Wall -I$(CATCH_SINGLE_INCLUDE) -o 100-Fix-Section 100-Fix-Section.cpp 000-CatchMain.o && 100-Fix-Section --success
|
// - g++ -std=c++11 -Wall -I$(CATCH_SINGLE_INCLUDE) -o 100-Fix-Section 100-Fix-Section.cpp && 100-Fix-Section --success
|
||||||
// - cl -EHsc -I%CATCH_SINGLE_INCLUDE% 100-Fix-Section.cpp 000-CatchMain.obj && 100-Fix-Section --success
|
// - cl -EHsc -I%CATCH_SINGLE_INCLUDE% 100-Fix-Section.cpp && 100-Fix-Section --success
|
||||||
|
|
||||||
// Expected compact output (all assertions):
|
// Expected compact output (all assertions):
|
||||||
//
|
//
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
// - Sections
|
// - Sections
|
||||||
// - Traditional class-based fixtures (this file)
|
// - Traditional class-based fixtures (this file)
|
||||||
|
|
||||||
// main() provided in 000-CatchMain.cpp
|
// main() provided by linkage to Catch2WithMain
|
||||||
|
|
||||||
#include <catch2/catch_test_macros.hpp>
|
#include <catch2/catch_test_macros.hpp>
|
||||||
|
|
||||||
@ -52,8 +52,8 @@ TEST_CASE_METHOD( UniqueTestsFixture, "Create Employee/Normal", "[create]" ) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Compile & run:
|
// Compile & run:
|
||||||
// - g++ -std=c++11 -Wall -I$(CATCH_SINGLE_INCLUDE) -o 110-Fix-ClassFixture 110-Fix-ClassFixture.cpp 000-CatchMain.o && 110-Fix-ClassFixture --success
|
// - g++ -std=c++11 -Wall -I$(CATCH_SINGLE_INCLUDE) -o 110-Fix-ClassFixture 110-Fix-ClassFixture.cpp && 110-Fix-ClassFixture --success
|
||||||
// - cl -EHsc -I%CATCH_SINGLE_INCLUDE% 110-Fix-ClassFixture.cpp 000-CatchMain.obj && 110-Fix-ClassFixture --success
|
// - cl -EHsc -I%CATCH_SINGLE_INCLUDE% 110-Fix-ClassFixture.cpp && 110-Fix-ClassFixture --success
|
||||||
|
|
||||||
// Expected compact output (all assertions):
|
// Expected compact output (all assertions):
|
||||||
//
|
//
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
// 120-Bdd-ScenarioGivenWhenThen.cpp
|
// 120-Bdd-ScenarioGivenWhenThen.cpp
|
||||||
|
|
||||||
// main() provided in 000-CatchMain.cpp
|
// main() provided by linkage with Catch2WithMain
|
||||||
|
|
||||||
#include <catch2/catch_test_macros.hpp>
|
#include <catch2/catch_test_macros.hpp>
|
||||||
|
|
||||||
@ -48,8 +48,8 @@ SCENARIO( "vectors can be sized and resized", "[vector]" ) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Compile & run:
|
// Compile & run:
|
||||||
// - g++ -std=c++11 -Wall -I$(CATCH_SINGLE_INCLUDE) -o 120-Bdd-ScenarioGivenWhenThen 120-Bdd-ScenarioGivenWhenThen.cpp 000-CatchMain.o && 120-Bdd-ScenarioGivenWhenThen --success
|
// - g++ -std=c++11 -Wall -I$(CATCH_SINGLE_INCLUDE) -o 120-Bdd-ScenarioGivenWhenThen 120-Bdd-ScenarioGivenWhenThen.cpp && 120-Bdd-ScenarioGivenWhenThen --success
|
||||||
// - cl -EHsc -I%CATCH_SINGLE_INCLUDE% 120-Bdd-ScenarioGivenWhenThen.cpp 000-CatchMain.obj && 120-Bdd-ScenarioGivenWhenThen --success
|
// - cl -EHsc -I%CATCH_SINGLE_INCLUDE% 120-Bdd-ScenarioGivenWhenThen.cpp && 120-Bdd-ScenarioGivenWhenThen --success
|
||||||
|
|
||||||
// Expected compact output (all assertions):
|
// Expected compact output (all assertions):
|
||||||
//
|
//
|
||||||
|
@ -420,8 +420,8 @@ TEST_CASE_METHOD( Fixture, "3: Testcase with class-based fixture", "[tag-C][tag-
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Compile & run:
|
// Compile & run:
|
||||||
// - g++ -std=c++11 -Wall -I$(CATCH_SINGLE_INCLUDE) -o 210-Evt-EventListeners 210-Evt-EventListeners.cpp 000-CatchMain.o && 210-Evt-EventListeners --success
|
// - g++ -std=c++11 -Wall -I$(CATCH_SINGLE_INCLUDE) -o 210-Evt-EventListeners 210-Evt-EventListeners.cpp && 210-Evt-EventListeners --success
|
||||||
// - cl -EHsc -I%CATCH_SINGLE_INCLUDE% 210-Evt-EventListeners.cpp 000-CatchMain.obj && 210-Evt-EventListeners --success
|
// - cl -EHsc -I%CATCH_SINGLE_INCLUDE% 210-Evt-EventListeners.cpp && 210-Evt-EventListeners --success
|
||||||
|
|
||||||
// Expected compact output (all assertions):
|
// Expected compact output (all assertions):
|
||||||
//
|
//
|
||||||
|
Loading…
Reference in New Issue
Block a user