From d72984380d15d7726bc816aa3477bdf6a39182f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Fri, 4 Jun 2021 20:09:35 +0200 Subject: [PATCH] Replace Catch header by a xmake package --- tests/Engine/Audio/AlgorithmAudioTest.cpp | 2 +- tests/Engine/Audio/MusicTest.cpp | 2 +- tests/Engine/Audio/SoundBufferTest.cpp | 2 +- tests/Engine/Audio/SoundEmitterTest.cpp | 2 +- tests/Engine/Audio/SoundTest.cpp | 2 +- tests/Engine/Core/AbstractHashTest.cpp | 2 +- tests/Engine/Core/AlgorithmCoreTest.cpp | 2 +- tests/Engine/Core/BitsetTest.cpp | 2 +- tests/Engine/Core/ByteArrayTest.cpp | 2 +- tests/Engine/Core/ByteStreamTest.cpp | 2 +- tests/Engine/Core/ClockTest.cpp | 2 +- tests/Engine/Core/ColorTest.cpp | 2 +- tests/Engine/Core/ErrorTest.cpp | 2 +- tests/Engine/Core/FileTest.cpp | 2 +- tests/Engine/Core/MemoryPoolTest.cpp | 2 +- tests/Engine/Core/ObjectHandleTest.cpp | 2 +- tests/Engine/Core/ObjectRefTest.cpp | 2 +- tests/Engine/Core/ParameterListTest.cpp | 2 +- tests/Engine/Core/PrimitiveListTest.cpp | 2 +- tests/Engine/Core/RefCountedTest.cpp | 2 +- tests/Engine/Core/SerializationTest.cpp | 2 +- tests/Engine/Core/SignalTest.cpp | 2 +- tests/Engine/Core/SparsePtrTest.cpp | 2 +- tests/Engine/Core/StackVectorTest.cpp | 2 +- tests/Engine/Core/StringExtTest.cpp | 2 +- tests/Engine/Math/AlgorithmMathTest.cpp | 2 +- tests/Engine/Math/AngleTest.cpp | 2 +- tests/Engine/Math/BoundingVolumeTest.cpp | 2 +- tests/Engine/Math/BoxTest.cpp | 2 +- tests/Engine/Math/EulerAnglesTest.cpp | 2 +- tests/Engine/Math/FrustumTest.cpp | 2 +- tests/Engine/Math/Matrix4Test.cpp | 2 +- tests/Engine/Math/OrientedBoxTest.cpp | 2 +- tests/Engine/Math/PlaneTest.cpp | 2 +- tests/Engine/Math/QuaternionTest.cpp | 2 +- tests/Engine/Math/RayTest.cpp | 2 +- tests/Engine/Math/RectTest.cpp | 2 +- tests/Engine/Math/SphereTest.cpp | 2 +- tests/Engine/Math/Vector2Test.cpp | 2 +- tests/Engine/Math/Vector3Test.cpp | 2 +- tests/Engine/Math/Vector4Test.cpp | 2 +- tests/Engine/Network/IpAddressTest.cpp | 2 +- tests/Engine/Network/SocketPollerTest.cpp | 2 +- tests/Engine/Network/TCPTest.cpp | 2 +- tests/Engine/Network/UdpSocketTest.cpp | 2 +- tests/Engine/Physics2D/Collider2DTest.cpp | 2 +- tests/Engine/Physics2D/PhysWorld2DTest.cpp | 2 +- tests/Engine/Physics2D/RigidBody2DTest.cpp | 2 +- tests/Engine/Shader/AccessMemberTest.cpp | 2 +- tests/SDK/NDK/BaseSystem.cpp | 2 +- tests/SDK/NDK/Component.cpp | 2 +- tests/SDK/NDK/Entity.cpp | 2 +- tests/SDK/NDK/EntityList.cpp | 2 +- tests/SDK/NDK/EntityOwner.cpp | 2 +- tests/SDK/NDK/StateMachine.cpp | 2 +- tests/SDK/NDK/System.cpp | 2 +- tests/SDK/NDK/Systems/PhysicsSystem2D.cpp | 2 +- tests/SDK/NDK/Systems/PhysicsSystem3D.cpp | 2 +- tests/SDK/NDK/Systems/VelocitySystem.cpp | 2 +- tests/SDK/NDK/World.cpp | 2 +- tests/main.cpp | 2 +- tests/main_client.cpp | 2 +- tests/xmake.lua | 6 + thirdparty/include/Catch/catch.hpp | 17799 ------------------- 64 files changed, 68 insertions(+), 17861 deletions(-) delete mode 100644 thirdparty/include/Catch/catch.hpp diff --git a/tests/Engine/Audio/AlgorithmAudioTest.cpp b/tests/Engine/Audio/AlgorithmAudioTest.cpp index 1d6de09c3..5e175425a 100644 --- a/tests/Engine/Audio/AlgorithmAudioTest.cpp +++ b/tests/Engine/Audio/AlgorithmAudioTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include diff --git a/tests/Engine/Audio/MusicTest.cpp b/tests/Engine/Audio/MusicTest.cpp index a67d6d441..0ccd02452 100644 --- a/tests/Engine/Audio/MusicTest.cpp +++ b/tests/Engine/Audio/MusicTest.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include diff --git a/tests/Engine/Audio/SoundBufferTest.cpp b/tests/Engine/Audio/SoundBufferTest.cpp index 7fd75bc51..06cadd383 100644 --- a/tests/Engine/Audio/SoundBufferTest.cpp +++ b/tests/Engine/Audio/SoundBufferTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include std::filesystem::path GetResourceDir(); diff --git a/tests/Engine/Audio/SoundEmitterTest.cpp b/tests/Engine/Audio/SoundEmitterTest.cpp index ea2bdb47b..84dbc53d5 100644 --- a/tests/Engine/Audio/SoundEmitterTest.cpp +++ b/tests/Engine/Audio/SoundEmitterTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include std::filesystem::path GetResourceDir(); diff --git a/tests/Engine/Audio/SoundTest.cpp b/tests/Engine/Audio/SoundTest.cpp index 3ff62a732..998f9f249 100644 --- a/tests/Engine/Audio/SoundTest.cpp +++ b/tests/Engine/Audio/SoundTest.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include diff --git a/tests/Engine/Core/AbstractHashTest.cpp b/tests/Engine/Core/AbstractHashTest.cpp index 44533fd6f..1b3d40476 100644 --- a/tests/Engine/Core/AbstractHashTest.cpp +++ b/tests/Engine/Core/AbstractHashTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include diff --git a/tests/Engine/Core/AlgorithmCoreTest.cpp b/tests/Engine/Core/AlgorithmCoreTest.cpp index 249a46631..0e4561bf8 100644 --- a/tests/Engine/Core/AlgorithmCoreTest.cpp +++ b/tests/Engine/Core/AlgorithmCoreTest.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include TEST_CASE("Apply", "[CORE][ALGORITHM]") { diff --git a/tests/Engine/Core/BitsetTest.cpp b/tests/Engine/Core/BitsetTest.cpp index 7d5c17d6f..8c4984202 100644 --- a/tests/Engine/Core/BitsetTest.cpp +++ b/tests/Engine/Core/BitsetTest.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include diff --git a/tests/Engine/Core/ByteArrayTest.cpp b/tests/Engine/Core/ByteArrayTest.cpp index d7bf4cf3c..10f5eefdd 100644 --- a/tests/Engine/Core/ByteArrayTest.cpp +++ b/tests/Engine/Core/ByteArrayTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include diff --git a/tests/Engine/Core/ByteStreamTest.cpp b/tests/Engine/Core/ByteStreamTest.cpp index 744910cca..461054ec0 100644 --- a/tests/Engine/Core/ByteStreamTest.cpp +++ b/tests/Engine/Core/ByteStreamTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include diff --git a/tests/Engine/Core/ClockTest.cpp b/tests/Engine/Core/ClockTest.cpp index 4e62996f1..9bef540b6 100644 --- a/tests/Engine/Core/ClockTest.cpp +++ b/tests/Engine/Core/ClockTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/tests/Engine/Core/ColorTest.cpp b/tests/Engine/Core/ColorTest.cpp index 95669d382..ffb3854fa 100644 --- a/tests/Engine/Core/ColorTest.cpp +++ b/tests/Engine/Core/ColorTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include const float epsilon = 1.f; diff --git a/tests/Engine/Core/ErrorTest.cpp b/tests/Engine/Core/ErrorTest.cpp index 5e042d7b4..fb9cfd868 100644 --- a/tests/Engine/Core/ErrorTest.cpp +++ b/tests/Engine/Core/ErrorTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("Error", "[CORE][ERROR]") { diff --git a/tests/Engine/Core/FileTest.cpp b/tests/Engine/Core/FileTest.cpp index f3cc2714a..fb915b768 100644 --- a/tests/Engine/Core/FileTest.cpp +++ b/tests/Engine/Core/FileTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include std::filesystem::path GetResourceDir(); diff --git a/tests/Engine/Core/MemoryPoolTest.cpp b/tests/Engine/Core/MemoryPoolTest.cpp index 2cd90a9dc..41987e45b 100644 --- a/tests/Engine/Core/MemoryPoolTest.cpp +++ b/tests/Engine/Core/MemoryPoolTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include diff --git a/tests/Engine/Core/ObjectHandleTest.cpp b/tests/Engine/Core/ObjectHandleTest.cpp index cffce4ecd..90dda82f5 100644 --- a/tests/Engine/Core/ObjectHandleTest.cpp +++ b/tests/Engine/Core/ObjectHandleTest.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include struct ObjectHandle_Test : public Nz::HandledObject { diff --git a/tests/Engine/Core/ObjectRefTest.cpp b/tests/Engine/Core/ObjectRefTest.cpp index 87f1e3870..232af9075 100644 --- a/tests/Engine/Core/ObjectRefTest.cpp +++ b/tests/Engine/Core/ObjectRefTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include class Test : public Nz::RefCounted { diff --git a/tests/Engine/Core/ParameterListTest.cpp b/tests/Engine/Core/ParameterListTest.cpp index 557d4e3e1..3480308f1 100644 --- a/tests/Engine/Core/ParameterListTest.cpp +++ b/tests/Engine/Core/ParameterListTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include void nullAction(void*) { diff --git a/tests/Engine/Core/PrimitiveListTest.cpp b/tests/Engine/Core/PrimitiveListTest.cpp index 4d6b7651f..062c16ba7 100644 --- a/tests/Engine/Core/PrimitiveListTest.cpp +++ b/tests/Engine/Core/PrimitiveListTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("PrimitiveList", "[CORE][PRIMITIVELIST]") { diff --git a/tests/Engine/Core/RefCountedTest.cpp b/tests/Engine/Core/RefCountedTest.cpp index 0201f0beb..3b0270d1b 100644 --- a/tests/Engine/Core/RefCountedTest.cpp +++ b/tests/Engine/Core/RefCountedTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("RefCounted", "[CORE][REFCOUNTED]") { diff --git a/tests/Engine/Core/SerializationTest.cpp b/tests/Engine/Core/SerializationTest.cpp index 3aa3f86af..d36226c09 100644 --- a/tests/Engine/Core/SerializationTest.cpp +++ b/tests/Engine/Core/SerializationTest.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include SCENARIO("Serialization", "[CORE][SERIALIZATION]") { diff --git a/tests/Engine/Core/SignalTest.cpp b/tests/Engine/Core/SignalTest.cpp index c5582d866..9c5726f91 100644 --- a/tests/Engine/Core/SignalTest.cpp +++ b/tests/Engine/Core/SignalTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include struct Incrementer { diff --git a/tests/Engine/Core/SparsePtrTest.cpp b/tests/Engine/Core/SparsePtrTest.cpp index e0a921129..d3c832a71 100644 --- a/tests/Engine/Core/SparsePtrTest.cpp +++ b/tests/Engine/Core/SparsePtrTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include diff --git a/tests/Engine/Core/StackVectorTest.cpp b/tests/Engine/Core/StackVectorTest.cpp index ff66116da..e6d7afede 100644 --- a/tests/Engine/Core/StackVectorTest.cpp +++ b/tests/Engine/Core/StackVectorTest.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include diff --git a/tests/Engine/Core/StringExtTest.cpp b/tests/Engine/Core/StringExtTest.cpp index b952c90df..2612f36ee 100644 --- a/tests/Engine/Core/StringExtTest.cpp +++ b/tests/Engine/Core/StringExtTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("String", "[CORE][STRING]") { diff --git a/tests/Engine/Math/AlgorithmMathTest.cpp b/tests/Engine/Math/AlgorithmMathTest.cpp index e93734605..7881acf9a 100644 --- a/tests/Engine/Math/AlgorithmMathTest.cpp +++ b/tests/Engine/Math/AlgorithmMathTest.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include TEST_CASE("Approach", "[MATH][ALGORITHM]") diff --git a/tests/Engine/Math/AngleTest.cpp b/tests/Engine/Math/AngleTest.cpp index 7eddb3d3e..b0df420ef 100644 --- a/tests/Engine/Math/AngleTest.cpp +++ b/tests/Engine/Math/AngleTest.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include SCENARIO("Angle", "[MATH][ANGLE]") { diff --git a/tests/Engine/Math/BoundingVolumeTest.cpp b/tests/Engine/Math/BoundingVolumeTest.cpp index a8213b09e..8762e9047 100644 --- a/tests/Engine/Math/BoundingVolumeTest.cpp +++ b/tests/Engine/Math/BoundingVolumeTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("BoundingVolume", "[MATH][BOUNDINGVOLUME]") { diff --git a/tests/Engine/Math/BoxTest.cpp b/tests/Engine/Math/BoxTest.cpp index ade117515..8052630e7 100644 --- a/tests/Engine/Math/BoxTest.cpp +++ b/tests/Engine/Math/BoxTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("Box", "[MATH][BOX]") { diff --git a/tests/Engine/Math/EulerAnglesTest.cpp b/tests/Engine/Math/EulerAnglesTest.cpp index a8a6bf35f..ede4a07b6 100644 --- a/tests/Engine/Math/EulerAnglesTest.cpp +++ b/tests/Engine/Math/EulerAnglesTest.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include SCENARIO("EulerAngles", "[MATH][EULERANGLES]") { diff --git a/tests/Engine/Math/FrustumTest.cpp b/tests/Engine/Math/FrustumTest.cpp index 3abd36723..1175b95a4 100644 --- a/tests/Engine/Math/FrustumTest.cpp +++ b/tests/Engine/Math/FrustumTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("Frustum", "[MATH][FRUSTUM]") { diff --git a/tests/Engine/Math/Matrix4Test.cpp b/tests/Engine/Math/Matrix4Test.cpp index 7030e68a6..a1e57e3ea 100644 --- a/tests/Engine/Math/Matrix4Test.cpp +++ b/tests/Engine/Math/Matrix4Test.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include diff --git a/tests/Engine/Math/OrientedBoxTest.cpp b/tests/Engine/Math/OrientedBoxTest.cpp index 7a1035ee2..d5bb84268 100644 --- a/tests/Engine/Math/OrientedBoxTest.cpp +++ b/tests/Engine/Math/OrientedBoxTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("OrientedBox", "[MATH][ORIENTEDBOX]") { diff --git a/tests/Engine/Math/PlaneTest.cpp b/tests/Engine/Math/PlaneTest.cpp index 44377bf67..2ea12724e 100644 --- a/tests/Engine/Math/PlaneTest.cpp +++ b/tests/Engine/Math/PlaneTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("Plane", "[MATH][PLANE]") { diff --git a/tests/Engine/Math/QuaternionTest.cpp b/tests/Engine/Math/QuaternionTest.cpp index 0bf9d40e6..c43c9753a 100644 --- a/tests/Engine/Math/QuaternionTest.cpp +++ b/tests/Engine/Math/QuaternionTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("Quaternion", "[MATH][QUATERNION]") { diff --git a/tests/Engine/Math/RayTest.cpp b/tests/Engine/Math/RayTest.cpp index df1151f6d..6d39b936e 100644 --- a/tests/Engine/Math/RayTest.cpp +++ b/tests/Engine/Math/RayTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("Ray", "[MATH][RAY]") { diff --git a/tests/Engine/Math/RectTest.cpp b/tests/Engine/Math/RectTest.cpp index 7fe9d30fb..3aba4f41b 100644 --- a/tests/Engine/Math/RectTest.cpp +++ b/tests/Engine/Math/RectTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("Rect", "[MATH][RECT]") { diff --git a/tests/Engine/Math/SphereTest.cpp b/tests/Engine/Math/SphereTest.cpp index a6f23236d..e8c5d89a0 100644 --- a/tests/Engine/Math/SphereTest.cpp +++ b/tests/Engine/Math/SphereTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("Sphere", "[MATH][SPHERE]") { diff --git a/tests/Engine/Math/Vector2Test.cpp b/tests/Engine/Math/Vector2Test.cpp index 4927656f2..4c02b0f1d 100644 --- a/tests/Engine/Math/Vector2Test.cpp +++ b/tests/Engine/Math/Vector2Test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/tests/Engine/Math/Vector3Test.cpp b/tests/Engine/Math/Vector3Test.cpp index ff1cee85f..427ead064 100644 --- a/tests/Engine/Math/Vector3Test.cpp +++ b/tests/Engine/Math/Vector3Test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/tests/Engine/Math/Vector4Test.cpp b/tests/Engine/Math/Vector4Test.cpp index 85c321ac1..76554737b 100644 --- a/tests/Engine/Math/Vector4Test.cpp +++ b/tests/Engine/Math/Vector4Test.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include diff --git a/tests/Engine/Network/IpAddressTest.cpp b/tests/Engine/Network/IpAddressTest.cpp index 1c1dd042c..b8767ab2f 100644 --- a/tests/Engine/Network/IpAddressTest.cpp +++ b/tests/Engine/Network/IpAddressTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("IpAddress", "[NETWORK][IPADDRESS]") { diff --git a/tests/Engine/Network/SocketPollerTest.cpp b/tests/Engine/Network/SocketPollerTest.cpp index 851e7d85f..1ba14999c 100644 --- a/tests/Engine/Network/SocketPollerTest.cpp +++ b/tests/Engine/Network/SocketPollerTest.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include SCENARIO("SocketPoller", "[NETWORK][SOCKETPOLLER]") diff --git a/tests/Engine/Network/TCPTest.cpp b/tests/Engine/Network/TCPTest.cpp index 68ae6efc7..04ef2928a 100644 --- a/tests/Engine/Network/TCPTest.cpp +++ b/tests/Engine/Network/TCPTest.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/Engine/Network/UdpSocketTest.cpp b/tests/Engine/Network/UdpSocketTest.cpp index f4b8b8aa9..e078dd734 100644 --- a/tests/Engine/Network/UdpSocketTest.cpp +++ b/tests/Engine/Network/UdpSocketTest.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include SCENARIO("UdpSocket", "[NETWORK][UDPSOCKET]") diff --git a/tests/Engine/Physics2D/Collider2DTest.cpp b/tests/Engine/Physics2D/Collider2DTest.cpp index c4b65c761..4f0e115ca 100644 --- a/tests/Engine/Physics2D/Collider2DTest.cpp +++ b/tests/Engine/Physics2D/Collider2DTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include SCENARIO("Collider2D", "[PHYSICS2D][COLLIDER2D]") { diff --git a/tests/Engine/Physics2D/PhysWorld2DTest.cpp b/tests/Engine/Physics2D/PhysWorld2DTest.cpp index 58c4da8e9..f1772519a 100644 --- a/tests/Engine/Physics2D/PhysWorld2DTest.cpp +++ b/tests/Engine/Physics2D/PhysWorld2DTest.cpp @@ -1,5 +1,5 @@ #include -#include +#include Nz::RigidBody2D CreateBody(Nz::PhysWorld2D& world, const Nz::Vector2f& position, bool isMoving = true, const Nz::Vector2f& lengths = Nz::Vector2f::Unit()); diff --git a/tests/Engine/Physics2D/RigidBody2DTest.cpp b/tests/Engine/Physics2D/RigidBody2DTest.cpp index c8448f4bf..36b6f7323 100644 --- a/tests/Engine/Physics2D/RigidBody2DTest.cpp +++ b/tests/Engine/Physics2D/RigidBody2DTest.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include diff --git a/tests/Engine/Shader/AccessMemberTest.cpp b/tests/Engine/Shader/AccessMemberTest.cpp index d33412cee..96b7373d0 100644 --- a/tests/Engine/Shader/AccessMemberTest.cpp +++ b/tests/Engine/Shader/AccessMemberTest.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include void ExpectingGLSL(Nz::ShaderAst::StatementPtr& shader, std::string_view expectedOutput) diff --git a/tests/SDK/NDK/BaseSystem.cpp b/tests/SDK/NDK/BaseSystem.cpp index f488a6bd9..e8b3dae9d 100644 --- a/tests/SDK/NDK/BaseSystem.cpp +++ b/tests/SDK/NDK/BaseSystem.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include namespace { diff --git a/tests/SDK/NDK/Component.cpp b/tests/SDK/NDK/Component.cpp index 74244fda5..d9c68b26d 100644 --- a/tests/SDK/NDK/Component.cpp +++ b/tests/SDK/NDK/Component.cpp @@ -1,5 +1,5 @@ #include -#include +#include namespace { diff --git a/tests/SDK/NDK/Entity.cpp b/tests/SDK/NDK/Entity.cpp index 7de5789ee..df5f8e889 100644 --- a/tests/SDK/NDK/Entity.cpp +++ b/tests/SDK/NDK/Entity.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include namespace { diff --git a/tests/SDK/NDK/EntityList.cpp b/tests/SDK/NDK/EntityList.cpp index 5b464669c..bc5447e10 100644 --- a/tests/SDK/NDK/EntityList.cpp +++ b/tests/SDK/NDK/EntityList.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include SCENARIO("EntityList", "[NDK][ENTITYLIST]") { diff --git a/tests/SDK/NDK/EntityOwner.cpp b/tests/SDK/NDK/EntityOwner.cpp index 0a0549286..7c2f94987 100644 --- a/tests/SDK/NDK/EntityOwner.cpp +++ b/tests/SDK/NDK/EntityOwner.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include SCENARIO("EntityOwner", "[NDK][ENTITYOWNER]") { diff --git a/tests/SDK/NDK/StateMachine.cpp b/tests/SDK/NDK/StateMachine.cpp index 29a781e2c..0937d2b13 100644 --- a/tests/SDK/NDK/StateMachine.cpp +++ b/tests/SDK/NDK/StateMachine.cpp @@ -1,5 +1,5 @@ #include -#include +#include class TestState : public Ndk::State { diff --git a/tests/SDK/NDK/System.cpp b/tests/SDK/NDK/System.cpp index a6ef4e590..79f174a52 100644 --- a/tests/SDK/NDK/System.cpp +++ b/tests/SDK/NDK/System.cpp @@ -1,5 +1,5 @@ #include -#include +#include namespace { diff --git a/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp b/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp index 03d354903..49b62ac7c 100644 --- a/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp +++ b/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include Ndk::EntityHandle CreateBaseEntity(Ndk::World& world, const Nz::Vector2f& position, const Nz::Rectf& AABB); diff --git a/tests/SDK/NDK/Systems/PhysicsSystem3D.cpp b/tests/SDK/NDK/Systems/PhysicsSystem3D.cpp index 0273d59d3..f2a539b87 100644 --- a/tests/SDK/NDK/Systems/PhysicsSystem3D.cpp +++ b/tests/SDK/NDK/Systems/PhysicsSystem3D.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include SCENARIO("PhysicsSystem3D", "[NDK][PHYSICSSYSTEM3D]") { diff --git a/tests/SDK/NDK/Systems/VelocitySystem.cpp b/tests/SDK/NDK/Systems/VelocitySystem.cpp index d8bb0731f..63acf6c6c 100644 --- a/tests/SDK/NDK/Systems/VelocitySystem.cpp +++ b/tests/SDK/NDK/Systems/VelocitySystem.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include SCENARIO("VelocitySystem", "[NDK][VELOCITYSYSTEM]") { diff --git a/tests/SDK/NDK/World.cpp b/tests/SDK/NDK/World.cpp index 7c478fd77..6fbfcc96a 100644 --- a/tests/SDK/NDK/World.cpp +++ b/tests/SDK/NDK/World.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include namespace { diff --git a/tests/main.cpp b/tests/main.cpp index 9ca2bc9b1..5df9976a5 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,5 +1,5 @@ #define CATCH_CONFIG_RUNNER -#include +#include #include #include diff --git a/tests/main_client.cpp b/tests/main_client.cpp index a68bae484..ef92bf2d6 100644 --- a/tests/main_client.cpp +++ b/tests/main_client.cpp @@ -1,5 +1,5 @@ #define CATCH_CONFIG_RUNNER -#include +#include #include #include diff --git a/tests/xmake.lua b/tests/xmake.lua index edbf0facb..6e11c9542 100644 --- a/tests/xmake.lua +++ b/tests/xmake.lua @@ -3,11 +3,15 @@ if is_mode("asan") then add_defines("CATCH_CONFIG_NO_POSIX_SIGNALS") end +add_requires("catch2") + target("NazaraClientUnitTests") set_group("Tests") set_kind("binary") add_deps("NazaraClientSDK") + add_packages("catch2") + add_files("main_client.cpp") add_files("resources.cpp") add_files("Engine/**.cpp") @@ -17,6 +21,8 @@ target("NazaraUnitTests") set_kind("binary") add_deps("NazaraSDK") + add_packages("catch2") + add_files("main.cpp") add_files("resources.cpp") add_files("Engine/**.cpp") diff --git a/thirdparty/include/Catch/catch.hpp b/thirdparty/include/Catch/catch.hpp deleted file mode 100644 index cf1fae15a..000000000 --- a/thirdparty/include/Catch/catch.hpp +++ /dev/null @@ -1,17799 +0,0 @@ -/* - * Catch v2.13.0 - * Generated: 2020-07-12 20:07:49.015950 - * ---------------------------------------------------------- - * This file has been merged from multiple headers. Please don't edit it directly - * Copyright (c) 2020 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) - */ -#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED -#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED -// start catch.hpp - - -#define CATCH_VERSION_MAJOR 2 -#define CATCH_VERSION_MINOR 13 -#define CATCH_VERSION_PATCH 0 - -#ifdef __clang__ -# pragma clang system_header -#elif defined __GNUC__ -# pragma GCC system_header -#endif - -// start catch_suppress_warnings.h - -#ifdef __clang__ -# ifdef __ICC // icpc defines the __clang__ macro -# pragma warning(push) -# pragma warning(disable: 161 1682) -# else // __ICC -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wpadded" -# pragma clang diagnostic ignored "-Wswitch-enum" -# pragma clang diagnostic ignored "-Wcovered-switch-default" -# endif -#elif defined __GNUC__ - // Because REQUIREs trigger GCC's -Wparentheses, and because still - // supported version of g++ have only buggy support for _Pragmas, - // Wparentheses have to be suppressed globally. -# pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details - -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wunused-variable" -# pragma GCC diagnostic ignored "-Wpadded" -#endif -// end catch_suppress_warnings.h -#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER) -# define CATCH_IMPL -# define CATCH_CONFIG_ALL_PARTS -#endif - -// In the impl file, we want to have access to all parts of the headers -// Can also be used to sanely support PCHs -#if defined(CATCH_CONFIG_ALL_PARTS) -# define CATCH_CONFIG_EXTERNAL_INTERFACES -# if defined(CATCH_CONFIG_DISABLE_MATCHERS) -# undef CATCH_CONFIG_DISABLE_MATCHERS -# endif -# if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER) -# define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER -# endif -#endif - -#if !defined(CATCH_CONFIG_IMPL_ONLY) -// start catch_platform.h - -#ifdef __APPLE__ -# include -# if TARGET_OS_OSX == 1 -# define CATCH_PLATFORM_MAC -# elif TARGET_OS_IPHONE == 1 -# define CATCH_PLATFORM_IPHONE -# endif - -#elif defined(linux) || defined(__linux) || defined(__linux__) -# define CATCH_PLATFORM_LINUX - -#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__) -# define CATCH_PLATFORM_WINDOWS -#endif - -// end catch_platform.h - -#ifdef CATCH_IMPL -# ifndef CLARA_CONFIG_MAIN -# define CLARA_CONFIG_MAIN_NOT_DEFINED -# define CLARA_CONFIG_MAIN -# endif -#endif - -// start catch_user_interfaces.h - -namespace Catch { - unsigned int rngSeed(); -} - -// end catch_user_interfaces.h -// start catch_tag_alias_autoregistrar.h - -// start catch_common.h - -// start catch_compiler_capabilities.h - -// Detect a number of compiler features - by compiler -// The following features are defined: -// -// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported? -// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported? -// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported? -// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled? -// **************** -// Note to maintainers: if new toggles are added please document them -// in configuration.md, too -// **************** - -// In general each macro has a _NO_ form -// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature. -// Many features, at point of detection, define an _INTERNAL_ macro, so they -// can be combined, en-mass, with the _NO_ forms later. - -#ifdef __cplusplus - -# if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) -# define CATCH_CPP14_OR_GREATER -# endif - -# if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) -# define CATCH_CPP17_OR_GREATER -# endif - -#endif - -#if defined(__cpp_lib_uncaught_exceptions) -# define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS -#endif - -// We have to avoid both ICC and Clang, because they try to mask themselves -// as gcc, and we want only GCC in this block -#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) -# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" ) -# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic pop" ) - -# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) - -#endif - -#if defined(__clang__) - -# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" ) -# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic pop" ) - -// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug -// which results in calls to destructors being emitted for each temporary, -// without a matching initialization. In practice, this can result in something -// like `std::string::~string` being called on an uninitialized value. -// -// For example, this code will likely segfault under IBM XL: -// ``` -// REQUIRE(std::string("12") + "34" == "1234") -// ``` -// -// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented. -# if !defined(__ibmxl__) -# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */ -# endif - -# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \ - _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"") - -# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wparentheses\"" ) - -# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" ) - -# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" ) - -# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wunused-template\"" ) - -#endif // __clang__ - -//////////////////////////////////////////////////////////////////////////////// -// Assume that non-Windows platforms support posix signals by default -#if !defined(CATCH_PLATFORM_WINDOWS) - #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS -#endif - -//////////////////////////////////////////////////////////////////////////////// -// We know some environments not to support full POSIX signals -#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__) - #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS -#endif - -#ifdef __OS400__ -# define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS -# define CATCH_CONFIG_COLOUR_NONE -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Android somehow still does not support std::to_string -#if defined(__ANDROID__) -# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING -# define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Not all Windows environments support SEH properly -#if defined(__MINGW32__) -# define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH -#endif - -//////////////////////////////////////////////////////////////////////////////// -// PS4 -#if defined(__ORBIS__) -# define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Cygwin -#ifdef __CYGWIN__ - -// Required for some versions of Cygwin to declare gettimeofday -// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin -# define _BSD_SOURCE -// some versions of cygwin (most) do not support std::to_string. Use the libstd check. -// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813 -# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \ - && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) - -# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING - -# endif -#endif // __CYGWIN__ - -//////////////////////////////////////////////////////////////////////////////// -// Visual C++ -#if defined(_MSC_VER) - -# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) ) -# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION __pragma( warning(pop) ) - -# if _MSC_VER >= 1900 // Visual Studio 2015 or newer -# define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS -# endif - -// Universal Windows platform does not support SEH -// Or console colours (or console at all...) -# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) -# define CATCH_CONFIG_COLOUR_NONE -# else -# define CATCH_INTERNAL_CONFIG_WINDOWS_SEH -# endif - -// MSVC traditional preprocessor needs some workaround for __VA_ARGS__ -// _MSVC_TRADITIONAL == 0 means new conformant preprocessor -// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor -# if !defined(__clang__) // Handle Clang masquerading for msvc -# if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL) -# define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -# endif // MSVC_TRADITIONAL -# endif // __clang__ - -#endif // _MSC_VER - -#if defined(_REENTRANT) || defined(_MSC_VER) -// Enable async processing, as -pthread is specified or no additional linking is required -# define CATCH_INTERNAL_CONFIG_USE_ASYNC -#endif // _MSC_VER - -//////////////////////////////////////////////////////////////////////////////// -// Check if we are compiled with -fno-exceptions or equivalent -#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND) -# define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED -#endif - -//////////////////////////////////////////////////////////////////////////////// -// DJGPP -#ifdef __DJGPP__ -# define CATCH_INTERNAL_CONFIG_NO_WCHAR -#endif // __DJGPP__ - -//////////////////////////////////////////////////////////////////////////////// -// Embarcadero C++Build -#if defined(__BORLANDC__) - #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN -#endif - -//////////////////////////////////////////////////////////////////////////////// - -// Use of __COUNTER__ is suppressed during code analysis in -// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly -// handled by it. -// Otherwise all supported compilers support COUNTER macro, -// but user still might want to turn it off -#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L ) - #define CATCH_INTERNAL_CONFIG_COUNTER -#endif - -//////////////////////////////////////////////////////////////////////////////// - -// RTX is a special version of Windows that is real time. -// This means that it is detected as Windows, but does not provide -// the same set of capabilities as real Windows does. -#if defined(UNDER_RTSS) || defined(RTX64_BUILD) - #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH - #define CATCH_INTERNAL_CONFIG_NO_ASYNC - #define CATCH_CONFIG_COLOUR_NONE -#endif - -#if !defined(_GLIBCXX_USE_C99_MATH_TR1) -#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER -#endif - -// Various stdlib support checks that require __has_include -#if defined(__has_include) - // Check if string_view is available and usable - #if __has_include() && defined(CATCH_CPP17_OR_GREATER) - # define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW - #endif - - // Check if optional is available and usable - # if __has_include() && defined(CATCH_CPP17_OR_GREATER) - # define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL - # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) - - // Check if byte is available and usable - # if __has_include() && defined(CATCH_CPP17_OR_GREATER) - # define CATCH_INTERNAL_CONFIG_CPP17_BYTE - # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) - - // Check if variant is available and usable - # if __has_include() && defined(CATCH_CPP17_OR_GREATER) - # if defined(__clang__) && (__clang_major__ < 8) - // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852 - // fix should be in clang 8, workaround in libstdc++ 8.2 - # include - # if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) - # define CATCH_CONFIG_NO_CPP17_VARIANT - # else - # define CATCH_INTERNAL_CONFIG_CPP17_VARIANT - # endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) - # else - # define CATCH_INTERNAL_CONFIG_CPP17_VARIANT - # endif // defined(__clang__) && (__clang_major__ < 8) - # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) -#endif // defined(__has_include) - -#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER) -# define CATCH_CONFIG_COUNTER -#endif -#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH) -# define CATCH_CONFIG_WINDOWS_SEH -#endif -// This is set by default, because we assume that unix compilers are posix-signal-compatible by default. -#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS) -# define CATCH_CONFIG_POSIX_SIGNALS -#endif -// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions. -#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR) -# define CATCH_CONFIG_WCHAR -#endif - -#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING) -# define CATCH_CONFIG_CPP11_TO_STRING -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL) -# define CATCH_CONFIG_CPP17_OPTIONAL -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) -# define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW) -# define CATCH_CONFIG_CPP17_STRING_VIEW -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT) -# define CATCH_CONFIG_CPP17_VARIANT -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE) -# define CATCH_CONFIG_CPP17_BYTE -#endif - -#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT) -# define CATCH_INTERNAL_CONFIG_NEW_CAPTURE -#endif - -#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE) -# define CATCH_CONFIG_NEW_CAPTURE -#endif - -#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) -# define CATCH_CONFIG_DISABLE_EXCEPTIONS -#endif - -#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN) -# define CATCH_CONFIG_POLYFILL_ISNAN -#endif - -#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC) && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC) -# define CATCH_CONFIG_USE_ASYNC -#endif - -#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE) -# define CATCH_CONFIG_ANDROID_LOGWRITE -#endif - -#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER) -# define CATCH_CONFIG_GLOBAL_NEXTAFTER -#endif - -// Even if we do not think the compiler has that warning, we still have -// to provide a macro that can be used by the code. -#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION) -# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION -#endif -#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION) -# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS -#endif - -// The goal of this macro is to avoid evaluation of the arguments, but -// still have the compiler warn on problems inside... -#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN) -# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) -#endif - -#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10) -# undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS -#elif defined(__clang__) && (__clang_major__ < 5) -# undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS -#endif - -#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS -#endif - -#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) -#define CATCH_TRY if ((true)) -#define CATCH_CATCH_ALL if ((false)) -#define CATCH_CATCH_ANON(type) if ((false)) -#else -#define CATCH_TRY try -#define CATCH_CATCH_ALL catch (...) -#define CATCH_CATCH_ANON(type) catch (type) -#endif - -#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) -#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#endif - -// end catch_compiler_capabilities.h -#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line -#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) -#ifdef CATCH_CONFIG_COUNTER -# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ ) -#else -# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ ) -#endif - -#include -#include -#include - -// We need a dummy global operator<< so we can bring it into Catch namespace later -struct Catch_global_namespace_dummy {}; -std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy); - -namespace Catch { - - struct CaseSensitive { enum Choice { - Yes, - No - }; }; - - class NonCopyable { - NonCopyable( NonCopyable const& ) = delete; - NonCopyable( NonCopyable && ) = delete; - NonCopyable& operator = ( NonCopyable const& ) = delete; - NonCopyable& operator = ( NonCopyable && ) = delete; - - protected: - NonCopyable(); - virtual ~NonCopyable(); - }; - - struct SourceLineInfo { - - SourceLineInfo() = delete; - SourceLineInfo( char const* _file, std::size_t _line ) noexcept - : file( _file ), - line( _line ) - {} - - SourceLineInfo( SourceLineInfo const& other ) = default; - SourceLineInfo& operator = ( SourceLineInfo const& ) = default; - SourceLineInfo( SourceLineInfo&& ) noexcept = default; - SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default; - - bool empty() const noexcept { return file[0] == '\0'; } - bool operator == ( SourceLineInfo const& other ) const noexcept; - bool operator < ( SourceLineInfo const& other ) const noexcept; - - char const* file; - std::size_t line; - }; - - std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ); - - // Bring in operator<< from global namespace into Catch namespace - // This is necessary because the overload of operator<< above makes - // lookup stop at namespace Catch - using ::operator<<; - - // Use this in variadic streaming macros to allow - // >> +StreamEndStop - // as well as - // >> stuff +StreamEndStop - struct StreamEndStop { - std::string operator+() const; - }; - template - T const& operator + ( T const& value, StreamEndStop ) { - return value; - } -} - -#define CATCH_INTERNAL_LINEINFO \ - ::Catch::SourceLineInfo( __FILE__, static_cast( __LINE__ ) ) - -// end catch_common.h -namespace Catch { - - struct RegistrarForTagAliases { - RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ); - }; - -} // end namespace Catch - -#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \ - CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \ - CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ - namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \ - CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION - -// end catch_tag_alias_autoregistrar.h -// start catch_test_registry.h - -// start catch_interfaces_testcase.h - -#include - -namespace Catch { - - class TestSpec; - - struct ITestInvoker { - virtual void invoke () const = 0; - virtual ~ITestInvoker(); - }; - - class TestCase; - struct IConfig; - - struct ITestCaseRegistry { - virtual ~ITestCaseRegistry(); - virtual std::vector const& getAllTests() const = 0; - virtual std::vector const& getAllTestsSorted( IConfig const& config ) const = 0; - }; - - bool isThrowSafe( TestCase const& testCase, IConfig const& config ); - bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ); - std::vector filterTests( std::vector const& testCases, TestSpec const& testSpec, IConfig const& config ); - std::vector const& getAllTestCasesSorted( IConfig const& config ); - -} - -// end catch_interfaces_testcase.h -// start catch_stringref.h - -#include -#include -#include -#include - -namespace Catch { - - /// A non-owning string class (similar to the forthcoming std::string_view) - /// Note that, because a StringRef may be a substring of another string, - /// it may not be null terminated. - class StringRef { - public: - using size_type = std::size_t; - using const_iterator = const char*; - - private: - static constexpr char const* const s_empty = ""; - - char const* m_start = s_empty; - size_type m_size = 0; - - public: // construction - constexpr StringRef() noexcept = default; - - StringRef( char const* rawChars ) noexcept; - - constexpr StringRef( char const* rawChars, size_type size ) noexcept - : m_start( rawChars ), - m_size( size ) - {} - - StringRef( std::string const& stdString ) noexcept - : m_start( stdString.c_str() ), - m_size( stdString.size() ) - {} - - explicit operator std::string() const { - return std::string(m_start, m_size); - } - - public: // operators - auto operator == ( StringRef const& other ) const noexcept -> bool; - auto operator != (StringRef const& other) const noexcept -> bool { - return !(*this == other); - } - - auto operator[] ( size_type index ) const noexcept -> char { - assert(index < m_size); - return m_start[index]; - } - - public: // named queries - constexpr auto empty() const noexcept -> bool { - return m_size == 0; - } - constexpr auto size() const noexcept -> size_type { - return m_size; - } - - // Returns the current start pointer. If the StringRef is not - // null-terminated, throws std::domain_exception - auto c_str() const -> char const*; - - public: // substrings and searches - // Returns a substring of [start, start + length). - // If start + length > size(), then the substring is [start, size()). - // If start > size(), then the substring is empty. - auto substr( size_type start, size_type length ) const noexcept -> StringRef; - - // Returns the current start pointer. May not be null-terminated. - auto data() const noexcept -> char const*; - - constexpr auto isNullTerminated() const noexcept -> bool { - return m_start[m_size] == '\0'; - } - - public: // iterators - constexpr const_iterator begin() const { return m_start; } - constexpr const_iterator end() const { return m_start + m_size; } - }; - - auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&; - auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&; - - constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef { - return StringRef( rawChars, size ); - } -} // namespace Catch - -constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef { - return Catch::StringRef( rawChars, size ); -} - -// end catch_stringref.h -// start catch_preprocessor.hpp - - -#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__ -#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__))) - -#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__ -// MSVC needs more evaluations -#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__))) -#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__)) -#else -#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL5(__VA_ARGS__) -#endif - -#define CATCH_REC_END(...) -#define CATCH_REC_OUT - -#define CATCH_EMPTY() -#define CATCH_DEFER(id) id CATCH_EMPTY() - -#define CATCH_REC_GET_END2() 0, CATCH_REC_END -#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2 -#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1 -#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT -#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0) -#define CATCH_REC_NEXT(test, next) CATCH_REC_NEXT1(CATCH_REC_GET_END test, next) - -#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST2(f, x, peek, ...) f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) - -#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...) f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) - -// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results, -// and passes userdata as the first parameter to each invocation, -// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c) -#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) - -#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) - -#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param) -#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__ -#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__ -#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF -#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__) -#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__ -#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) -#else -// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF -#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__) -#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__ -#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1) -#endif - -#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__ -#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name) - -#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__) - -#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper()) -#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)) -#else -#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper())) -#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))) -#endif - -#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\ - CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__) - -#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0) -#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1) -#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2) -#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3) -#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4) -#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5) -#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6) -#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7) -#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8) -#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9) -#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10) - -#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N - -#define INTERNAL_CATCH_TYPE_GEN\ - template struct TypeList {};\ - template\ - constexpr auto get_wrapper() noexcept -> TypeList { return {}; }\ - template class...> struct TemplateTypeList{};\ - template class...Cs>\ - constexpr auto get_wrapper() noexcept -> TemplateTypeList { return {}; }\ - template\ - struct append;\ - template\ - struct rewrap;\ - template class, typename...>\ - struct create;\ - template class, typename>\ - struct convert;\ - \ - template \ - struct append { using type = T; };\ - template< template class L1, typename...E1, template class L2, typename...E2, typename...Rest>\ - struct append, L2, Rest...> { using type = typename append, Rest...>::type; };\ - template< template class L1, typename...E1, typename...Rest>\ - struct append, TypeList, Rest...> { using type = L1; };\ - \ - template< template class Container, template class List, typename...elems>\ - struct rewrap, List> { using type = TypeList>; };\ - template< template class Container, template class List, class...Elems, typename...Elements>\ - struct rewrap, List, Elements...> { using type = typename append>, typename rewrap, Elements...>::type>::type; };\ - \ - template