Migrate tests to Catch2

Signed-off-by: Cristian Le <[email protected]>

Author: LecrisUT

test/CMakeLists.txt

@@ -9,6 +9,10 @@ project(nlohmann_json_schema_validator_test
         LANGUAGES CXX
 )
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 #[==============================================================================================[
 #                                            Options                                            #
 ]==============================================================================================]
@@ -66,12 +70,12 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.24)
     FetchContent_Declare(Catch2
             GIT_REPOSITORY https://github.com/catchorg/Catch2
             GIT_TAG v3.4.0
-            FIND_PACKAGE_ARGS CONFIG
+            FIND_PACKAGE_ARGS 3.4.0 CONFIG
     )
     list(APPEND fetch_packages Catch2)
 else ()
     # Try to get system installed version
-    find_package(Catch2 QUIET)
+    find_package(Catch2 3.4.0 QUIET)
     if (NOT Catch2_FOUND)
         # If failed fetch the desired version
         FetchContent_Declare(Catch2
@@ -99,30 +103,27 @@ set_target_properties(json-schema-test-suite PROPERTIES
 target_link_libraries(json-schema-test-suite PRIVATE Catch2::Catch2WithMain nlohmann_json_schema_validator::validator)
 catch_discover_tests(json-schema-test-suite)
 
-set(PIPE_IN_TEST_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test-pipe-in.sh)
-
-# built-in tests
-function(add_test_simple_schema name schema instance)
-    add_test(
-        NAME ${name}
-        COMMAND ${PIPE_IN_TEST_SCRIPT}
-            $<TARGET_FILE:json-schema-validate>
-            ${schema}
-            ${instance}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-endfunction()
-
-file(GLOB TEST_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/*)
-
-foreach(DIR ${TEST_DIRS})
-    if(IS_DIRECTORY ${DIR})
-        add_subdirectory(${DIR})
-    endif()
-endforeach()
-
-add_executable(uri uri.cpp)
-target_link_libraries(uri nlohmann_json_schema_validator)
-add_test(NAME uri COMMAND uri)
+target_sources(json-schema-test-suite PRIVATE
+        test_uri.cpp
+        utils.cpp
+)
+target_include_directories(json-schema-test-suite PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+foreach (issue IN ITEMS
+        issue-9
+        issue-12
+        issue-27
+        issue-48
+        issue-54
+        issue-75
+        issue-93
+        issue-96
+        issue-100
+        issue-101
+        issue-143
+        issue-209
+)
+    target_sources(json-schema-test-suite PRIVATE ${issue}/test_issue.cpp)
+endforeach ()
 
 add_executable(errors errors.cpp)
 target_link_libraries(errors nlohmann_json_schema_validator)

test/issue-100/CMakeLists.txt

@@ -0,0 +1,19 @@
+#include <filesystem>
+#include <string_view>
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_all.hpp>
+
+#include "utils.h"
+
+using namespace std::literals;
+using Catch::Matchers::ContainsSubstring;
+using Catch::Matchers::MessageMatches;
+
+TEST_CASE_METHOD(JsonValidateFixture, "issue-100")
+{
+	// Change the working directory to the issue path
+	auto path = std::filesystem::path(__FILE__).parent_path();
+	REQUIRE_NOTHROW(std::filesystem::current_path(path));
+	REQUIRE_THROWS_MATCHES(validate("schema.json"sv, "instance.json"sv), std::invalid_argument, MessageMatches(ContainsSubstring("undefined references: [random_ref]")));
+}

test/issue-100/test_issue.cpp

@@ -0,0 +1,20 @@
+#include <filesystem>
+#include <string_view>
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_all.hpp>
+
+#include "utils.h"
+
+using namespace std::literals;
+using Catch::Matchers::Matches;
+using Catch::Matchers::MessageMatches;
+
+TEST_CASE_METHOD(JsonValidateFixture, "issue-101")
+{
+	// Change the working directory to the issue path
+	auto path = std::filesystem::path(__FILE__).parent_path();
+	REQUIRE_NOTHROW(std::filesystem::current_path(path));
+	REQUIRE_THROWS_MATCHES(validate("schema.json"sv, "instance.json"sv), std::invalid_argument,
+	                       MessageMatches(Matches("invalid JSON-type.*/properties/required.*expected: boolean or object.*")));
+}

test/issue-101/CMakeLists.txt

@@ -0,0 +1,16 @@
+#include <filesystem>
+#include <string_view>
+
+#include <catch2/catch_test_macros.hpp>
+
+#include "utils.h"
+
+using namespace std::literals;
+
+TEST_CASE_METHOD(JsonValidateFixture, "issue-12")
+{
+	// Change the working directory to the issue path
+	auto path = std::filesystem::path(__FILE__).parent_path();
+	REQUIRE_NOTHROW(std::filesystem::current_path(path));
+	REQUIRE_NOTHROW(validate("schema.json"sv, "instance.json"sv));
+}

test/issue-101/test_issue.cpp

@@ -0,0 +1,23 @@
+#include <filesystem>
+#include <string_view>
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_all.hpp>
+
+#include "utils.h"
+
+using namespace std::literals;
+using Catch::Matchers::ContainsSubstring;
+using Catch::Matchers::MessageMatches;
+
+TEST_CASE_METHOD(JsonValidateFixture, "issue-143")
+{
+	// Change the working directory to the issue path
+	auto path = std::filesystem::path(__FILE__).parent_path();
+	REQUIRE_NOTHROW(std::filesystem::current_path(path));
+	CHECK_THROWS_MATCHES(validate("schema.json"sv, "instance-fail-1.json"sv), std::invalid_argument,
+	                     MessageMatches(ContainsSubstring("At /ref1 of \"a\" - unexpected instance type")));
+	CHECK_THROWS_MATCHES(validate("schema.json"sv, "instance-fail-a.json"sv), std::invalid_argument,
+	                     MessageMatches(ContainsSubstring("At /refa of 12 - unexpected instance type")));
+	CHECK_NOTHROW(validate("schema.json"sv, "instance.json"sv));
+}

test/issue-12/CMakeLists.txt

@@ -0,0 +1,16 @@
+#include <filesystem>
+#include <string_view>
+
+#include <catch2/catch_test_macros.hpp>
+
+#include "utils.h"
+
+using namespace std::literals;
+
+TEST_CASE_METHOD(JsonValidateFixture, "issue-209")
+{
+	// Change the working directory to the issue path
+	auto path = std::filesystem::path(__FILE__).parent_path();
+	REQUIRE_NOTHROW(std::filesystem::current_path(path));
+	REQUIRE_NOTHROW(validate("entities.schema.json"sv, "instance.json"sv));
+}

test/issue-12/test_issue.cpp

@@ -0,0 +1,19 @@
+#include <filesystem>
+#include <string_view>
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_all.hpp>
+
+#include "utils.h"
+
+using namespace std::literals;
+using Catch::Matchers::ContainsSubstring;
+using Catch::Matchers::MessageMatches;
+
+TEST_CASE_METHOD(JsonValidateFixture, "issue-27")
+{
+	// Change the working directory to the issue path
+	auto path = std::filesystem::path(__FILE__).parent_path();
+	REQUIRE_NOTHROW(std::filesystem::current_path(path));
+	REQUIRE_THROWS_MATCHES(validate("schema.json"sv, "instance.json"sv), std::invalid_argument, MessageMatches(ContainsSubstring("instance exceeds maximum")));
+}

test/issue-143/CMakeLists.txt

@@ -0,0 +1,16 @@
+#include <filesystem>
+#include <string_view>
+
+#include <catch2/catch_test_macros.hpp>
+
+#include "utils.h"
+
+using namespace std::literals;
+
+TEST_CASE_METHOD(JsonValidateFixture, "issue-48")
+{
+	// Change the working directory to the issue path
+	auto path = std::filesystem::path(__FILE__).parent_path();
+	REQUIRE_NOTHROW(std::filesystem::current_path(path));
+	REQUIRE_NOTHROW(validate("schema.json"sv, "instance.json"sv));
+}

test/issue-143/test_issue.cpp

@@ -0,0 +1,16 @@
+#include <filesystem>
+#include <string_view>
+
+#include <catch2/catch_test_macros.hpp>
+
+#include "utils.h"
+
+using namespace std::literals;
+
+TEST_CASE_METHOD(JsonValidateFixture, "issue-54")
+{
+	// Change the working directory to the issue path
+	auto path = std::filesystem::path(__FILE__).parent_path();
+	REQUIRE_NOTHROW(std::filesystem::current_path(path));
+	REQUIRE_NOTHROW(validate("schema.json"sv, "instance.json"sv));
+}

test/issue-209/test_issue.cpp

@@ -0,0 +1,16 @@
+#include <filesystem>
+#include <string_view>
+
+#include <catch2/catch_test_macros.hpp>
+
+#include "utils.h"
+
+using namespace std::literals;
+
+TEST_CASE_METHOD(JsonValidateFixture, "issue-75")
+{
+	// Change the working directory to the issue path
+	auto path = std::filesystem::path(__FILE__).parent_path();
+	REQUIRE_NOTHROW(std::filesystem::current_path(path));
+	REQUIRE_NOTHROW(validate("schema.json"sv, "instance.json"sv));
+}

test/issue-27/CMakeLists.txt

@@ -0,0 +1,16 @@
+#include <filesystem>
+#include <string_view>
+
+#include <catch2/catch_test_macros.hpp>
+
+#include "utils.h"
+
+using namespace std::literals;
+
+TEST_CASE_METHOD(JsonValidateFixture, "issue-9")
+{
+	// Change the working directory to the issue path
+	auto path = std::filesystem::path(__FILE__).parent_path();
+	REQUIRE_NOTHROW(std::filesystem::current_path(path));
+	REQUIRE_NOTHROW(validate("base.json"sv, "instance.json"sv));
+}