Convert examples to piecemeal includes

This commit is contained in:
Martin Hořeňovský 2020-01-21 14:46:07 +01:00
parent 26f78f96aa
commit 17281c09c3
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
8 changed files with 22 additions and 13 deletions

View File

@ -6,7 +6,8 @@
// main() provided in 000-CatchMain.cpp // main() provided in 000-CatchMain.cpp
#include <catch2/catch.hpp> #include <catch2/catch_test_macros.hpp>
#include <vector>
TEST_CASE( "vectors can be sized and resized", "[vector]" ) { TEST_CASE( "vectors can be sized and resized", "[vector]" ) {

View File

@ -6,7 +6,7 @@
// main() provided in 000-CatchMain.cpp // main() provided in 000-CatchMain.cpp
#include <catch2/catch.hpp> #include <catch2/catch_test_macros.hpp>
class DBConnection class DBConnection
{ {

View File

@ -10,7 +10,9 @@
// Let Catch provide the required interfaces: // Let Catch provide the required interfaces:
#define CATCH_CONFIG_EXTERNAL_INTERFACES #define CATCH_CONFIG_EXTERNAL_INTERFACES
#include <catch2/catch.hpp> #include <catch2/catch_test_macros.hpp>
#include <catch2/reporters/catch_reporter_bases.hpp>
#include <catch2/catch_reporter_registrars.hpp>
#include <iostream> #include <iostream>
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@ -306,7 +308,7 @@ char const * dashed_line =
struct MyListener : Catch::TestEventListenerBase { struct MyListener : Catch::TestEventListenerBase {
using TestEventListenerBase::TestEventListenerBase; // inherit constructor using TestEventListenerBase::TestEventListenerBase; // inherit constructor
// Get rid of Wweak-tables // Get rid of Wweak-tables
~MyListener(); ~MyListener();

View File

@ -8,7 +8,7 @@
#include <catch2/catch_default_main.hpp> #include <catch2/catch_default_main.hpp>
#include <catch2/catch.hpp> #include <catch2/catch_test_macros.hpp>
#include <sstream> #include <sstream>
#include <cstdio> #include <cstdio>

View File

@ -4,7 +4,9 @@
// Specifically we will implement a random number generator for integers // Specifically we will implement a random number generator for integers
// It will have infinite capacity and settable lower/upper bound // It will have infinite capacity and settable lower/upper bound
#include <catch2/catch.hpp> #include <catch2/catch_test_macros.hpp>
#include <catch2/catch_generators.hpp>
#include <catch2/catch_generators_generic.hpp>
#include <random> #include <random>

View File

@ -1,9 +1,9 @@
// 301-Gen-MapTypeConversion.cpp // 301-Gen-MapTypeConversion.cpp
// Shows how to use map to modify generator's return type. // Shows how to use map to modify generator's return type.
// TODO
#include <catch2/catch.hpp> #include <catch2/catch_test_macros.hpp>
#include <catch2/catch_generators_generic.hpp>
#include <string> #include <string>
#include <sstream> #include <sstream>
@ -23,7 +23,7 @@ public:
} }
std::string const& get() const override; std::string const& get() const override;
bool next() override { bool next() override {
return !!std::getline(m_stream, m_line); return !!std::getline(m_stream, m_line);
} }
@ -49,7 +49,7 @@ Catch::Generators::GeneratorWrapper<std::string> lines(std::string /* ignored fo
TEST_CASE("filter can convert types inside the generator expression", "[example][generator]") { TEST_CASE("filter can convert types inside the generator expression", "[example][generator]") {
auto num = GENERATE(map<int>([](std::string const& line) { return std::stoi(line); }, auto num = GENERATE(map<int>([](std::string const& line) { return std::stoi(line); },
lines("fake-file"))); lines("fake-file")));
REQUIRE(num > 0); REQUIRE(num > 0);
} }

View File

@ -6,7 +6,9 @@
// _WILL_ outlive the variables -- thus they should be either captured // _WILL_ outlive the variables -- thus they should be either captured
// by value directly, or copied by the generators during construction. // by value directly, or copied by the generators during construction.
#include <catch2/catch.hpp> #include <catch2/catch_test_macros.hpp>
#include <catch2/catch_generators_generic.hpp>
#include <catch2/catch_generators_specific.hpp>
TEST_CASE("Generate random doubles across different ranges", TEST_CASE("Generate random doubles across different ranges",
"[generator][example][advanced]") { "[generator][example][advanced]") {

View File

@ -9,7 +9,9 @@
// per-variable custom capture list, this example shows how to achieve // per-variable custom capture list, this example shows how to achieve
// that. // that.
#include <catch2/catch.hpp> #include <catch2/catch_test_macros.hpp>
#include <catch2/catch_generators_generic.hpp>
#include <catch2/catch_generators_specific.hpp>
TEST_CASE("Generate random doubles across different ranges", TEST_CASE("Generate random doubles across different ranges",
"[generator][example][advanced]") { "[generator][example][advanced]") {
@ -23,7 +25,7 @@ TEST_CASE("Generate random doubles across different ranges",
})); }));
auto r2(r1); auto r2(r1);
// This will take r1 by reference and r2 by value. // This will take r1 by reference and r2 by value.
// Note that there are no advantages for doing so in this example, // Note that there are no advantages for doing so in this example,
// it is done only for expository purposes. // it is done only for expository purposes.