Merge pull request #701 from elbeno/better-callback-failure

Author: lukevalenty

include/msg/detail/indexed_handler_common.hpp

@@ -56,7 +56,9 @@ struct indexed_handler : handler_interface<MsgBase, ExtraCallbackArgs...> {
             std::logical_or{}, false, callback_candidates);
 
         if (not handled) {
-            CIB_ERROR("None of the registered callbacks claimed this message.");
+            CIB_ERROR(
+                "None of the registered callbacks ({}) claimed this message.",
+                sc::uint_<stdx::tuple_size_v<Callbacks>>);
         }
         return handled;
     }

include/msg/handler.hpp

@@ -2,6 +2,7 @@
 
 #include <log/log.hpp>
 #include <msg/handler_interface.hpp>
+#include <sc/fwd.hpp>
 
 #include <stdx/tuple_algorithms.hpp>
 
@@ -27,7 +28,9 @@ struct handler : handler_interface<MsgBase, ExtraCallbackArgs...> {
             },
             callbacks);
         if (!found_valid_callback) {
-            CIB_ERROR("None of the registered callbacks claimed this message:");
+            CIB_ERROR(
+                "None of the registered callbacks ({}) claimed this message:",
+                sc::uint_<stdx::tuple_size_v<Callbacks>>);
             stdx::for_each([&](auto &callback) { callback.log_mismatch(msg); },
                            callbacks);
         }

test/msg/handler.cpp

@@ -87,7 +87,7 @@ TEST_CASE("log mismatch when no match", "[handler]") {
     CHECK(not handler.handle(msg));
     CAPTURE(log_buffer);
     CHECK(log_buffer.find(
-              "None of the registered callbacks claimed this message") !=
+              "None of the registered callbacks (0) claimed this message") !=
           std::string::npos);
 }
 

test/msg/handler_builder.cpp

@@ -111,7 +111,7 @@ TEST_CASE("match output failure", "[handler_builder]") {
 
     CAPTURE(log_buffer);
     CHECK(log_buffer.find(
-              "None of the registered callbacks claimed this message") !=
+              "None of the registered callbacks (1) claimed this message") !=
           std::string::npos);
     CHECK(log_buffer.find("cb") != std::string::npos);
     CHECK(log_buffer.find("id (0x81) == 0x80") != std::string::npos);

test/msg/indexed_builder.cpp

@@ -113,8 +113,9 @@ TEST_CASE("match output failure", "[indexed_builder]") {
 
     CHECK(not cib::service<test_service>->handle(
         test_msg_t{"test_id_field"_field = 0x81}));
+    CAPTURE(log_buffer);
     CHECK(log_buffer.find(
-              "None of the registered callbacks claimed this message") !=
+              "None of the registered callbacks (1) claimed this message") !=
           std::string::npos);
 }