fix: inplace matchers shall never treat two raw-pointers as strings

DNKpp · Jan 27, 2025 · a248d7e · a248d7e
1 parent 5c48abb
commit a248d7e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/include/mimic++/ExpectationBuilder.hpp b/include/mimic++/ExpectationBuilder.hpp
@@ -205,7 +205,12 @@ namespace mimicpp::detail
         return std::forward<Arg>(arg);
     }
 
+    // if the param is a character-pointer, there is no evidence, whether it denotes a null-terminated string or just an
+    // actual pointer to a value.
+    // But, the Mock user shall know it, thus if `Arg` is not a character-pointer, we enable this matcher.
     template <string Param, string Arg>
+        requires(!std::is_pointer_v<std::remove_reference_t<Param>>)
+             || (!std::is_pointer_v<std::remove_reference_t<Arg>>)
     [[nodiscard]]
     constexpr auto make_arg_matcher(Arg&& arg, [[maybe_unused]] const priority_tag<1>)
     {

diff --git a/test/unit-tests/Mock.cpp b/test/unit-tests/Mock.cpp
@@ -907,6 +907,20 @@ TEST_CASE(
         Mock<void(const char*)> mock{};
         SCOPED_EXP mock.expect_call("Hello, World!");
         mock("Hello, World!");
+
+        SECTION("If both, param and argument, are character pointers, they are not treated as strings.")
+        {
+            constexpr std::array<char, 2> value1{42, 0};
+            constexpr std::array<char, 2> value2{42, 0};
+
+            // If the second expectation is matched, then we know, that the argument has been treated as a string.
+            // Therefore, the first expectation must be chosen, which compares the actual pointers.
+            SCOPED_EXP mock.expect_call(matches::eq(value2.data()));
+            SCOPED_EXP mock.expect_call(value1.data())
+                and expect::at_least(0u);
+
+            mock(value2.data());
+        }
     }
 
     SECTION("With explicit matchers.")
@@ -926,7 +940,7 @@ TEST_CASE(
         Mock<void()> mock{
             MockSettings{.name = "MyMock"}};
         const ScopedExpectation expectation = mock.expect_call()
-                                              and expect::never();
+                                          and expect::never();
 
         REQUIRE_THAT(
             expectation.mock_name(),
@@ -939,7 +953,7 @@ TEST_CASE(
         {
             Mock<void()> mock{};
             const ScopedExpectation expectation = mock.expect_call()
-                                                  and expect::never();
+                                              and expect::never();
 
             REQUIRE_THAT(
                 expectation.mock_name(),