Add PassthroughNot

slonopotamus · Aug 3, 2024 · 11622df · 11622df
1 parent 40cb356
commit 11622df
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/Source/UEST/Private/UESTTests.cpp b/Source/UEST/Private/UESTTests.cpp
@@ -19,7 +19,8 @@ TEST(UEST, SimpleTest)
 	ASSERT_THAT(&v2, Is::Not::Null);
 
 	ASSERT_THAT(42, Is::EqualTo(42));
-	ASSERT_THAT(42, Is::Not::EqualTo(43));
+	// TODO: Need explicit <int> for now because of clang bug: https://github.com/llvm/llvm-project/issues/73093
+	ASSERT_THAT(42, Is::Not::EqualTo<int>(43));
 }
 
 TEST_CLASS(UEST, SimpleTestClass)

diff --git a/Source/UEST/Public/UEST.h b/Source/UEST/Public/UEST.h
@@ -129,6 +129,23 @@ namespace Matchers
 			return FString::Printf(TEXT("not %s"), *Nested.Describe());
 		}
 	};
+
+	template <typename T, typename M, typename... P>
+	// TODO: Add requires
+	struct PassthroughNot
+	{
+		NotMatcher<T, M> Matcher;
+
+		explicit PassthroughNot(P... Args)
+			: Matcher{NotMatcher<T, M>{Args...}}
+		{}
+
+		template<typename U>
+		auto operator()() const
+		{
+			return Matcher;
+		}
+	};
 }
 
 namespace Is
@@ -184,20 +201,7 @@ namespace Is
 		} False;
 
 		template<typename T>
-		struct EqualTo
-		{
-			T Expected;
-
-			EqualTo(T Expected)
-				: Expected(Expected)
-			{}
-
-			template<typename U>
-			auto operator()() const
-			{
-				return Matchers::NotMatcher<T, Matchers::EqualTo<T>>{Matchers::EqualTo<T>(Expected)};
-			}
-		};
+		using EqualTo = Matchers::PassthroughNot<T, Matchers::EqualTo<T>, T>;
 	}
 }