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

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-02-20 13:57:24 +0100
committerMartin Hořeňovský2020-02-20 17:42:11 +0100
commitc3013a62519f099c3556e090a396a7a4bda11478 (patch)
tree2ef00b34258023bab2e09fe54523d10b6575abeb /src
parent40e35d43182c69f56ab892f92e079af5d2b94dc5 (diff)
downloadcatch3-c3013a62519f099c3556e090a396a7a4bda11478.tar.gz
Move matcher implementation to their own subfolder
In the future we can expect many more matchers, so let's give them a place to live. Also moved matcher-related internal files to `internal` subfolder. Ideally we should sort out all of our source code, but that will have to come later.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt30
-rw-r--r--src/catch2/catch_assertionhandler.cpp4
-rw-r--r--src/catch2/internal/catch_capture_matchers.cpp (renamed from src/catch2/catch_capture_matchers.cpp)4
-rw-r--r--src/catch2/internal/catch_capture_matchers.h (renamed from src/catch2/catch_capture_matchers.h)0
-rw-r--r--src/catch2/matchers/catch_matchers.cpp (renamed from src/catch2/catch_matchers.cpp)2
-rw-r--r--src/catch2/matchers/catch_matchers.h (renamed from src/catch2/catch_matchers.h)2
-rw-r--r--src/catch2/matchers/catch_matchers_exception.cpp (renamed from src/catch2/catch_matchers_exception.cpp)2
-rw-r--r--src/catch2/matchers/catch_matchers_exception.hpp (renamed from src/catch2/catch_matchers_exception.hpp)2
-rw-r--r--src/catch2/matchers/catch_matchers_floating.cpp (renamed from src/catch2/catch_matchers_floating.cpp)2
-rw-r--r--src/catch2/matchers/catch_matchers_floating.h (renamed from src/catch2/catch_matchers_floating.h)2
-rw-r--r--src/catch2/matchers/catch_matchers_generic.cpp (renamed from src/catch2/catch_matchers_generic.cpp)2
-rw-r--r--src/catch2/matchers/catch_matchers_generic.hpp (renamed from src/catch2/catch_matchers_generic.hpp)2
-rw-r--r--src/catch2/matchers/catch_matchers_string.cpp (renamed from src/catch2/catch_matchers_string.cpp)5
-rw-r--r--src/catch2/matchers/catch_matchers_string.h (renamed from src/catch2/catch_matchers_string.h)2
-rw-r--r--src/catch2/matchers/catch_matchers_templates.cpp (renamed from src/catch2/catch_matchers_templates.cpp)2
-rw-r--r--src/catch2/matchers/catch_matchers_templates.hpp (renamed from src/catch2/catch_matchers_templates.hpp)2
-rw-r--r--src/catch2/matchers/catch_matchers_vector.h (renamed from src/catch2/catch_matchers_vector.h)2
17 files changed, 32 insertions, 35 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e5db746..d08e2e9c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,7 +39,7 @@ set(INTERNAL_HEADERS
${SOURCES_DIR}/catch_assertioninfo.h
${SOURCES_DIR}/catch_assertionresult.h
${SOURCES_DIR}/catch_capture.hpp
- ${SOURCES_DIR}/catch_capture_matchers.h
+ ${SOURCES_DIR}/internal/catch_capture_matchers.h
${SOURCES_DIR}/catch_clara.h
${SOURCES_DIR}/catch_commandline.h
${SOURCES_DIR}/catch_common.h
@@ -72,13 +72,13 @@ set(INTERNAL_HEADERS
${SOURCES_DIR}/catch_interfaces_testcase.h
${SOURCES_DIR}/catch_leak_detector.h
${SOURCES_DIR}/catch_list.h
- ${SOURCES_DIR}/catch_matchers.h
- ${SOURCES_DIR}/catch_matchers_exception.hpp
- ${SOURCES_DIR}/catch_matchers_floating.h
- ${SOURCES_DIR}/catch_matchers_generic.hpp
- ${SOURCES_DIR}/catch_matchers_string.h
- ${SOURCES_DIR}/catch_matchers_templates.hpp
- ${SOURCES_DIR}/catch_matchers_vector.h
+ ${SOURCES_DIR}/matchers/catch_matchers.h
+ ${SOURCES_DIR}/matchers/catch_matchers_exception.hpp
+ ${SOURCES_DIR}/matchers/catch_matchers_floating.h
+ ${SOURCES_DIR}/matchers/catch_matchers_generic.hpp
+ ${SOURCES_DIR}/matchers/catch_matchers_string.h
+ ${SOURCES_DIR}/matchers/catch_matchers_templates.hpp
+ ${SOURCES_DIR}/matchers/catch_matchers_vector.h
${SOURCES_DIR}/catch_message.h
${SOURCES_DIR}/catch_meta.hpp
${SOURCES_DIR}/catch_objc.hpp
@@ -130,7 +130,7 @@ set(IMPL_SOURCES
${SOURCES_DIR}/catch_approx.cpp
${SOURCES_DIR}/catch_assertionhandler.cpp
${SOURCES_DIR}/catch_assertionresult.cpp
- ${SOURCES_DIR}/catch_capture_matchers.cpp
+ ${SOURCES_DIR}/internal/catch_capture_matchers.cpp
${SOURCES_DIR}/catch_commandline.cpp
${SOURCES_DIR}/catch_common.cpp
${SOURCES_DIR}/catch_config.cpp
@@ -155,12 +155,12 @@ set(IMPL_SOURCES
${SOURCES_DIR}/catch_interfaces_testcase.cpp
${SOURCES_DIR}/catch_list.cpp
${SOURCES_DIR}/catch_leak_detector.cpp
- ${SOURCES_DIR}/catch_matchers.cpp
- ${SOURCES_DIR}/catch_matchers_exception.cpp
- ${SOURCES_DIR}/catch_matchers_floating.cpp
- ${SOURCES_DIR}/catch_matchers_generic.cpp
- ${SOURCES_DIR}/catch_matchers_string.cpp
- ${SOURCES_DIR}/catch_matchers_templates.cpp
+ ${SOURCES_DIR}/matchers/catch_matchers.cpp
+ ${SOURCES_DIR}/matchers/catch_matchers_exception.cpp
+ ${SOURCES_DIR}/matchers/catch_matchers_floating.cpp
+ ${SOURCES_DIR}/matchers/catch_matchers_generic.cpp
+ ${SOURCES_DIR}/matchers/catch_matchers_string.cpp
+ ${SOURCES_DIR}/matchers/catch_matchers_templates.cpp
${SOURCES_DIR}/catch_message.cpp
${SOURCES_DIR}/catch_output_redirect.cpp
${SOURCES_DIR}/catch_registry_hub.cpp
diff --git a/src/catch2/catch_assertionhandler.cpp b/src/catch2/catch_assertionhandler.cpp
index 03834f1e..cf102ae7 100644
--- a/src/catch2/catch_assertionhandler.cpp
+++ b/src/catch2/catch_assertionhandler.cpp
@@ -14,9 +14,9 @@
#include <catch2/catch_enforce.h>
#include <catch2/catch_debugger.h>
#include <catch2/catch_interfaces_registry_hub.h>
-#include <catch2/catch_capture_matchers.h>
+#include <catch2/internal/catch_capture_matchers.h>
#include <catch2/catch_run_context.h>
-#include <catch2/catch_matchers_string.h>
+#include <catch2/matchers/catch_matchers_string.h>
namespace Catch {
diff --git a/src/catch2/catch_capture_matchers.cpp b/src/catch2/internal/catch_capture_matchers.cpp
index 809da66d..c13d0543 100644
--- a/src/catch2/catch_capture_matchers.cpp
+++ b/src/catch2/internal/catch_capture_matchers.cpp
@@ -2,8 +2,8 @@
* 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_capture_matchers.h>
-#include <catch2/catch_matchers.h>
+#include <catch2/internal/catch_capture_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
#include <catch2/catch_interfaces_registry_hub.h>
namespace Catch {
diff --git a/src/catch2/catch_capture_matchers.h b/src/catch2/internal/catch_capture_matchers.h
index 1b622413..1b622413 100644
--- a/src/catch2/catch_capture_matchers.h
+++ b/src/catch2/internal/catch_capture_matchers.h
diff --git a/src/catch2/catch_matchers.cpp b/src/catch2/matchers/catch_matchers.cpp
index af32b6cb..a8737497 100644
--- a/src/catch2/catch_matchers.cpp
+++ b/src/catch2/matchers/catch_matchers.cpp
@@ -3,7 +3,7 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
namespace Catch {
diff --git a/src/catch2/catch_matchers.h b/src/catch2/matchers/catch_matchers.h
index 102917a3..3e0f2083 100644
--- a/src/catch2/catch_matchers.h
+++ b/src/catch2/matchers/catch_matchers.h
@@ -6,7 +6,7 @@
#define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
#include <catch2/catch_common.h>
-#include <catch2/catch_capture_matchers.h>
+#include <catch2/internal/catch_capture_matchers.h>
#include <string>
#include <vector>
diff --git a/src/catch2/catch_matchers_exception.cpp b/src/catch2/matchers/catch_matchers_exception.cpp
index 2623193d..eec08f88 100644
--- a/src/catch2/catch_matchers_exception.cpp
+++ b/src/catch2/matchers/catch_matchers_exception.cpp
@@ -5,7 +5,7 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/
-#include <catch2/catch_matchers_exception.hpp>
+#include <catch2/matchers/catch_matchers_exception.hpp>
namespace Catch {
diff --git a/src/catch2/catch_matchers_exception.hpp b/src/catch2/matchers/catch_matchers_exception.hpp
index b0f3d32d..fabc26ea 100644
--- a/src/catch2/catch_matchers_exception.hpp
+++ b/src/catch2/matchers/catch_matchers_exception.hpp
@@ -7,7 +7,7 @@
#ifndef TWOBLUECUBES_CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
namespace Catch {
namespace Matchers {
diff --git a/src/catch2/catch_matchers_floating.cpp b/src/catch2/matchers/catch_matchers_floating.cpp
index 961a82fd..77684458 100644
--- a/src/catch2/catch_matchers_floating.cpp
+++ b/src/catch2/matchers/catch_matchers_floating.cpp
@@ -5,7 +5,7 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/
-#include <catch2/catch_matchers_floating.h>
+#include <catch2/matchers/catch_matchers_floating.h>
#include <catch2/catch_enforce.h>
#include <catch2/catch_polyfills.hpp>
#include <catch2/catch_to_string.hpp>
diff --git a/src/catch2/catch_matchers_floating.h b/src/catch2/matchers/catch_matchers_floating.h
index dc1bebe0..a935b570 100644
--- a/src/catch2/catch_matchers_floating.h
+++ b/src/catch2/matchers/catch_matchers_floating.h
@@ -7,7 +7,7 @@
#ifndef TWOBLUECUBES_CATCH_MATCHERS_FLOATING_H_INCLUDED
#define TWOBLUECUBES_CATCH_MATCHERS_FLOATING_H_INCLUDED
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
namespace Catch {
namespace Matchers {
diff --git a/src/catch2/catch_matchers_generic.cpp b/src/catch2/matchers/catch_matchers_generic.cpp
index de262ae8..15b7fc9d 100644
--- a/src/catch2/catch_matchers_generic.cpp
+++ b/src/catch2/matchers/catch_matchers_generic.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch_matchers_generic.hpp>
+#include <catch2/matchers/catch_matchers_generic.hpp>
std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
if (desc.empty()) {
diff --git a/src/catch2/catch_matchers_generic.hpp b/src/catch2/matchers/catch_matchers_generic.hpp
index d39d1bbe..90f26d0c 100644
--- a/src/catch2/catch_matchers_generic.hpp
+++ b/src/catch2/matchers/catch_matchers_generic.hpp
@@ -8,7 +8,7 @@
#define TWOBLUECUBES_CATCH_MATCHERS_GENERIC_HPP_INCLUDED
#include <catch2/catch_common.h>
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
#include <catch2/catch_meta.hpp>
#include <string>
diff --git a/src/catch2/catch_matchers_string.cpp b/src/catch2/matchers/catch_matchers_string.cpp
index 024cf549..91282ddf 100644
--- a/src/catch2/catch_matchers_string.cpp
+++ b/src/catch2/matchers/catch_matchers_string.cpp
@@ -1,12 +1,9 @@
/*
- * Created by Phil Nash on 08/02/2017.
- * Copyright (c) 2017 Two Blue Cubes Ltd. All rights reserved.
- *
* 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_matchers_string.h>
+#include <catch2/matchers/catch_matchers_string.h>
#include <catch2/catch_string_manip.h>
#include <catch2/catch_tostring.h>
diff --git a/src/catch2/catch_matchers_string.h b/src/catch2/matchers/catch_matchers_string.h
index 075a7e94..c1096b14 100644
--- a/src/catch2/catch_matchers_string.h
+++ b/src/catch2/matchers/catch_matchers_string.h
@@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED
#define TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
#include <string>
diff --git a/src/catch2/catch_matchers_templates.cpp b/src/catch2/matchers/catch_matchers_templates.cpp
index 663173f2..f2d744f4 100644
--- a/src/catch2/catch_matchers_templates.cpp
+++ b/src/catch2/matchers/catch_matchers_templates.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch_matchers_templates.hpp>
+#include <catch2/matchers/catch_matchers_templates.hpp>
namespace Catch {
namespace Matchers {
diff --git a/src/catch2/catch_matchers_templates.hpp b/src/catch2/matchers/catch_matchers_templates.hpp
index 17ae0d62..918cba84 100644
--- a/src/catch2/catch_matchers_templates.hpp
+++ b/src/catch2/matchers/catch_matchers_templates.hpp
@@ -2,7 +2,7 @@
#define TWOBLUECUBES_CATCH_MATCHERS_TEMPLATES_HPP_INCLUDED
#include <catch2/catch_common.h>
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
#include <catch2/catch_stringref.h>
#include <array>
diff --git a/src/catch2/catch_matchers_vector.h b/src/catch2/matchers/catch_matchers_vector.h
index 86fb2214..620b7211 100644
--- a/src/catch2/catch_matchers_vector.h
+++ b/src/catch2/matchers/catch_matchers_vector.h
@@ -8,7 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
#define TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
#include <catch2/catch_approx.h>
#include <algorithm>