fix: use std::equal_to and similar instead of std::ranges::equal_to i…

…n ordering matches
DNKpp · Sep 26, 2024 · 9caff9d · 9caff9d
1 parent 3c3d143
commit 9caff9d
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 6 deletions.
diff --git a/include/mimic++/Matcher.hpp b/include/mimic++/Matcher.hpp
@@ -212,7 +212,7 @@ namespace mimicpp::matches
 	constexpr auto eq(T&& value)
 	{
 		return PredicateMatcher{
-			std::ranges::equal_to{},
+			std::equal_to{},
 			"== {}",
 			"!= {}",
 			std::tuple{std::forward<T>(value)}
@@ -229,7 +229,7 @@ namespace mimicpp::matches
 	constexpr auto ne(T&& value)
 	{
 		return PredicateMatcher{
-			std::ranges::not_equal_to{},
+			std::not_equal_to{},
 			"!= {}",
 			"== {}",
 			std::tuple{std::forward<T>(value)}
@@ -246,7 +246,7 @@ namespace mimicpp::matches
 	constexpr auto lt(T&& value)
 	{
 		return PredicateMatcher{
-			std::ranges::less{},
+			std::less{},
 			"< {}",
 			">= {}",
 			std::tuple{std::forward<T>(value)}
@@ -263,7 +263,7 @@ namespace mimicpp::matches
 	constexpr auto le(T&& value)
 	{
 		return PredicateMatcher{
-			std::ranges::less_equal{},
+			std::less_equal{},
 			"<= {}",
 			"> {}",
 			std::tuple{std::forward<T>(value)}
@@ -280,7 +280,7 @@ namespace mimicpp::matches
 	constexpr auto gt(T&& value)
 	{
 		return PredicateMatcher{
-			std::ranges::greater{},
+			std::greater{},
 			"> {}",
 			"<= {}",
 			std::tuple{std::forward<T>(value)}
@@ -297,7 +297,7 @@ namespace mimicpp::matches
 	constexpr auto ge(T&& value)
 	{
 		return PredicateMatcher{
-			std::ranges::greater_equal{},
+			std::greater_equal{},
 			">= {}",
 			"< {}",
 			std::tuple{std::forward<T>(value)}

diff --git a/test/unit-tests/Matcher.cpp b/test/unit-tests/Matcher.cpp
@@ -443,6 +443,78 @@ TEST_CASE(
 	}
 }
 
+TEST_CASE(
+	"Ordering matches support different, but comparable types, on both sides.",
+	"[matcher]"
+)
+{
+	SECTION("matches::eq")
+	{
+		const auto matcher = matches::eq(std::nullopt);
+
+		std::optional<int> opt{};
+		REQUIRE(matcher.matches(opt));
+
+		opt = 42;
+		REQUIRE_FALSE(matcher.matches(opt));
+	}
+
+	SECTION("matches::ne")
+	{
+		const auto matcher = matches::ne(std::nullopt);
+
+		std::optional opt{42};
+		REQUIRE(matcher.matches(opt));
+
+		opt.reset();
+		REQUIRE_FALSE(matcher.matches(opt));
+	}
+
+	SECTION("matches::lt")
+	{
+		const auto matcher = matches::lt(std::nullopt);
+
+		std::optional opt{42};
+		REQUIRE_FALSE(matcher.matches(opt));
+
+		opt.reset();
+		REQUIRE_FALSE(matcher.matches(opt));
+	}
+
+	SECTION("matches::le")
+	{
+		const auto matcher = matches::le(std::nullopt);
+
+		std::optional opt{42};
+		REQUIRE_FALSE(matcher.matches(opt));
+
+		opt.reset();
+		REQUIRE(matcher.matches(opt));
+	}
+
+	SECTION("matches::gt")
+	{
+		const auto matcher = matches::gt(std::nullopt);
+
+		std::optional opt{42};
+		REQUIRE(matcher.matches(opt));
+
+		opt.reset();
+		REQUIRE_FALSE(matcher.matches(opt));
+	}
+
+	SECTION("matches::ge")
+	{
+		const auto matcher = matches::ge(std::nullopt);
+
+		std::optional opt{42};
+		REQUIRE(matcher.matches(opt));
+
+		opt.reset();
+		REQUIRE(matcher.matches(opt));
+	}
+}
+
 TEST_CASE(
 	"matches::predicate matches when the given predicate is satisfied.",
 	"[matcher]"