Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/examples
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-03-30 10:34:21 +0200
committerMartin Hořeňovský2020-04-24 18:58:44 +0200
commite1e6872c4c0f79731894c9b763843af33d16bdab (patch)
tree46761d72b6bf87088e152aa8f42d1b092f2c5c8b /examples
parent3836aa9cebbd546fc3036836aac3b2e3f5fd9b74 (diff)
downloadcatch3-e1e6872c4c0f79731894c9b763843af33d16bdab.tar.gz
Standardize header names and file locations
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.
Diffstat (limited to 'examples')
-rw-r--r--examples/000-CatchMain.cpp2
-rw-r--r--examples/010-TestCase.cpp2
-rw-r--r--examples/020-TestCase-1.cpp2
-rw-r--r--examples/231-Cfg-OutputStreams.cpp2
-rw-r--r--examples/300-Gen-OwnGenerator.cpp4
-rw-r--r--examples/301-Gen-MapTypeConversion.cpp2
-rw-r--r--examples/310-Gen-VariablesInGenerators.cpp4
-rw-r--r--examples/311-Gen-CustomCapture.cpp4
8 files changed, 11 insertions, 11 deletions
diff --git a/examples/000-CatchMain.cpp b/examples/000-CatchMain.cpp
index 0580b932..5d06bd98 100644
--- a/examples/000-CatchMain.cpp
+++ b/examples/000-CatchMain.cpp
@@ -4,7 +4,7 @@
// of a testing binary, and other test files to link against it.
// Let Catch provide main():
-#include <catch2/catch_default_main.hpp>
+#include <catch2/internal/catch_default_main.hpp>
// That's it
diff --git a/examples/010-TestCase.cpp b/examples/010-TestCase.cpp
index 8eaa1c0e..d9939958 100644
--- a/examples/010-TestCase.cpp
+++ b/examples/010-TestCase.cpp
@@ -1,7 +1,7 @@
// 010-TestCase.cpp
// Let Catch provide main():
-#include <catch2/catch_default_main.hpp>
+#include <catch2/internal/catch_default_main.hpp>
// And write tests in the same file:
#include <catch2/catch_test_macros.hpp>
diff --git a/examples/020-TestCase-1.cpp b/examples/020-TestCase-1.cpp
index c734d029..5d17016a 100644
--- a/examples/020-TestCase-1.cpp
+++ b/examples/020-TestCase-1.cpp
@@ -4,7 +4,7 @@
// source code of Catch itself and reuse the resulting object file for linking.
// Let Catch provide main():
-#include <catch2/catch_default_main.hpp>
+#include <catch2/internal/catch_default_main.hpp>
#include <catch2/catch_test_macros.hpp>
diff --git a/examples/231-Cfg-OutputStreams.cpp b/examples/231-Cfg-OutputStreams.cpp
index 6c97d1be..d0c1a632 100644
--- a/examples/231-Cfg-OutputStreams.cpp
+++ b/examples/231-Cfg-OutputStreams.cpp
@@ -6,7 +6,7 @@
// there is no important difference between having `std::cerr` buffered
// or unbuffered.
-#include <catch2/catch_default_main.hpp>
+#include <catch2/internal/catch_default_main.hpp>
#include <catch2/catch_test_macros.hpp>
diff --git a/examples/300-Gen-OwnGenerator.cpp b/examples/300-Gen-OwnGenerator.cpp
index ec98a048..bff62907 100644
--- a/examples/300-Gen-OwnGenerator.cpp
+++ b/examples/300-Gen-OwnGenerator.cpp
@@ -5,8 +5,8 @@
// It will have infinite capacity and settable lower/upper bound
#include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_generators.hpp>
-#include <catch2/catch_generators_generic.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/generators/catch_generators_adapters.hpp>
#include <random>
diff --git a/examples/301-Gen-MapTypeConversion.cpp b/examples/301-Gen-MapTypeConversion.cpp
index 425da347..15b90fdd 100644
--- a/examples/301-Gen-MapTypeConversion.cpp
+++ b/examples/301-Gen-MapTypeConversion.cpp
@@ -3,7 +3,7 @@
#include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_generators_generic.hpp>
+#include <catch2/generators/catch_generators_adapters.hpp>
#include <string>
#include <sstream>
diff --git a/examples/310-Gen-VariablesInGenerators.cpp b/examples/310-Gen-VariablesInGenerators.cpp
index 3fb089e8..0339c5f1 100644
--- a/examples/310-Gen-VariablesInGenerators.cpp
+++ b/examples/310-Gen-VariablesInGenerators.cpp
@@ -7,8 +7,8 @@
// by value directly, or copied by the generators during construction.
#include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_generators_generic.hpp>
-#include <catch2/catch_generators_specific.hpp>
+#include <catch2/generators/catch_generators_adapters.hpp>
+#include <catch2/generators/catch_generators_random.hpp>
TEST_CASE("Generate random doubles across different ranges",
"[generator][example][advanced]") {
diff --git a/examples/311-Gen-CustomCapture.cpp b/examples/311-Gen-CustomCapture.cpp
index 35de7afc..13a7eab3 100644
--- a/examples/311-Gen-CustomCapture.cpp
+++ b/examples/311-Gen-CustomCapture.cpp
@@ -10,8 +10,8 @@
// that.
#include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_generators_generic.hpp>
-#include <catch2/catch_generators_specific.hpp>
+#include <catch2/generators/catch_generators_adapters.hpp>
+#include <catch2/generators/catch_generators_random.hpp>
TEST_CASE("Generate random doubles across different ranges",
"[generator][example][advanced]") {