Remove most CommunicationManager tests

CommunicationManager is a class responsible for adding std::functions to
a std::vector, and calling all of them with an argument (this takes 4
lines of actual logic). However, it has 7 redundant tests, including a
randomized stress test and some interesting helper classes.

I have reduced this number to 2 simple tests, testing basic and
exception-related behavior.

Change-Id: Ie8ce196df1f0e2a1c280c7aad4bd36c5911a6ada

diff --git a/unit-tests/test_comm-manager.cpp b/unit-tests/test_comm-manager.cpp
index 961451c..138de34 100644 (file)
--- a/unit-tests/test_comm-manager.cpp
+++ b/unit-tests/test_comm-manager.cpp
@@ -19,195 +19,51 @@
  * @version    1.0
  */
 
-#include <boost_macros_wrapper.h>
-#include <boost/test/results_reporter.hpp>
 #include <communication-manager.h>
-#include <string>
-#include <random>
-#include <chrono>
-#include <stdexcept>
-
-namespace {
-struct MessageA {
-       explicit MessageA(int ai) : i(ai) {}
-       int i;
-};
-
-struct MessageB {
-       explicit MessageB(char ac) : c(ac) {}
-       char c;
-};
-
-struct MessageC {
-       explicit MessageC(const std::string &astr) : str(astr) {}
-       std::string str;
-};
 
-struct Listener {
-       Listener() : i(0) {}
-
-       void Handle(const MessageA &msg)
-       {
-               i = msg.i;
-       }
-
-       void Handle(const MessageC &msg)
-       {
-               str = msg.str;
-       }
-
-       int i;
-       std::string str;
-};
+#include <stdexcept>
 
-} // namespace anonymous
+#include <boost_macros_wrapper.h>
 
-BOOST_AUTO_TEST_SUITE(MESSAGE_MANAGER_TEST)
+BOOST_AUTO_TEST_SUITE(COMMUNICATION_MANAGER_TEST)
 
-POSITIVE_TEST_CASE(TMM_0010_NoListener)
+POSITIVE_TEST_CASE(basic)
 {
-       CKM::CommunicationManager<MessageA> mgr;
-       BOOST_REQUIRE_MESSAGE(0 == mgr.SendMessage(MessageA(22)),
-                                                 "There should be no listener.");
-}
+       CKM::CommunicationManager<int, char> mgr;
 
-POSITIVE_TEST_CASE(TMM_0020_Basic)
-{
-       CKM::CommunicationManager<MessageA> mgr;
-       int received = 0;
-       mgr.Register<MessageA>([&](const MessageA & msg) {
-               received = msg.i;
-       });
-       BOOST_REQUIRE_MESSAGE(1 == mgr.SendMessage(MessageA(4)), "No listener found");
-       BOOST_REQUIRE_MESSAGE(received != 0, "Message not received");
-       BOOST_REQUIRE_MESSAGE(received == 4, "Wrong message received i=" << received);
-}
+       BOOST_REQUIRE_MESSAGE(mgr.SendMessage(22) == 0, "There should be no listener.");
 
-POSITIVE_TEST_CASE(TMM_0030_MultipleMessages)
-{
-       CKM::CommunicationManager<MessageA, MessageB> mgr;
        int reci = 0;
        char recc = 0;
-       mgr.Register<MessageA>([&](const MessageA & msg) {
-               reci = msg.i;
+       mgr.Register<int>([&](const int& msg) {
+               reci = msg;
        });
-       mgr.Register<MessageB>([&](const MessageB & msg) {
-               recc = msg.c;
+       mgr.Register<char>([&](const char& msg) {
+               recc = msg;
        });
-       BOOST_REQUIRE_MESSAGE(1 == mgr.SendMessage(MessageB('c')), "No listener found");
+
+       BOOST_REQUIRE_MESSAGE(mgr.SendMessage('c') == 1, "No listener found");
        BOOST_REQUIRE_MESSAGE(reci == 0, "Unexpected message received");
        BOOST_REQUIRE_MESSAGE(recc != 0, "Message not received");
        BOOST_REQUIRE_MESSAGE(recc == 'c', "Wrong message received c=" << recc);
 
-       BOOST_REQUIRE_MESSAGE(1 == mgr.SendMessage(MessageA(42)), "No listener found");
+       BOOST_REQUIRE_MESSAGE(mgr.SendMessage(42) == 1, "No listener found");
        BOOST_REQUIRE_MESSAGE(reci != 0, "Message not received");
        BOOST_REQUIRE_MESSAGE(reci == 42, "Wrong message received i=" << reci);
        BOOST_REQUIRE_MESSAGE(recc == 'c', "Previous message overwritten c=" << recc);
-}
 
-POSITIVE_TEST_CASE(TMM_0040_Listener)
-{
-       CKM::CommunicationManager<MessageA, MessageB, MessageC> mgr;
-       Listener l;
-       mgr.Register<MessageC>([&](const MessageC & msg) {
-               l.Handle(msg);
-       });
-       mgr.Register<MessageA>([&](const MessageA & msg) {
-               l.Handle(msg);
-       });
-
-       BOOST_REQUIRE_MESSAGE(1 == mgr.SendMessage(MessageC("lorem ipsum")),
-                                                 "No listener found");
-       BOOST_REQUIRE_MESSAGE(l.i == 0, "Unexpected message received");
-       BOOST_REQUIRE_MESSAGE(!l.str.empty(), "Message not received");
-       BOOST_REQUIRE_MESSAGE(l.str == "lorem ipsum",
-                                                 "Wrong message received c=" << l.str);
-
-       BOOST_REQUIRE_MESSAGE(1 == mgr.SendMessage(MessageA(3)), "No listener found");
-       BOOST_REQUIRE_MESSAGE(l.i != 0, "Message not received");
-       BOOST_REQUIRE_MESSAGE(l.i == 3, "Wrong message received i=" << l.i);
-       BOOST_REQUIRE_MESSAGE(l.str == "lorem ipsum",
-                                                 "Previous message overwritten str=" << l.str);
-}
-
-POSITIVE_TEST_CASE(TMM_0050_2Listeners)
-{
-       CKM::CommunicationManager<MessageA> mgr;
-       bool called[2];
-       called[0] = false;
-       called[1] = false;
-       mgr.Register<MessageA>([&](const MessageA & msg) {
-               BOOST_REQUIRE_MESSAGE(msg.i == 5, "Unexpected message received i=" << msg.i);
-               called[0] = true;
-       });
-       mgr.Register<MessageA>([&](const MessageA & msg) {
-               BOOST_REQUIRE_MESSAGE(msg.i == 5, "Unexpected message received i=" << msg.i);
-               called[1] = true;
+       int reci2 = 0;
+       mgr.Register<int>([&](const int& msg) {
+               reci2 = msg;
        });
 
-       BOOST_REQUIRE_MESSAGE(2 == mgr.SendMessage(MessageA(5)), "No listener found");
-       BOOST_REQUIRE_MESSAGE(called[0], "First listener not called");
-       BOOST_REQUIRE_MESSAGE(called[1], "Second listener not called");
-}
-
-POSITIVE_TEST_CASE(TMM_0060_Stress)
-{
-       CKM::CommunicationManager<MessageA, MessageB, MessageC> mgr;
-
-       std::default_random_engine generator(
-               std::chrono::system_clock::now().time_since_epoch().count());
-       std::uniform_int_distribution<size_t> message_dist(0, 2);
-       std::uniform_int_distribution<size_t> count_dist(1, 10);
-
-       size_t a = 0;
-       size_t b = 0;
-       size_t c = 0;
-       mgr.Register<MessageA>([&](const MessageA & msg) {
-               BOOST_REQUIRE_MESSAGE(msg.i == 42, "Wrong message: " << msg.i);
-               a++;
-       });
-       mgr.Register<MessageB>([&](const MessageB & msg) {
-               BOOST_REQUIRE_MESSAGE(msg.c == 'c', "Wrong message: " << msg.c);
-               b++;
-       });
-       mgr.Register<MessageC>([&](const MessageC & msg) {
-               BOOST_REQUIRE_MESSAGE(msg.str == "lorem ipsum", "Wrong message: " << msg.str);
-               c++;
-       });
-
-       for (size_t i = 0; i < 1000; i++) {
-               size_t cnt = count_dist(generator);
-
-               for (size_t s = 0; s < cnt; s++) {
-                       switch (message_dist(generator)) {
-                       case 0:
-                               BOOST_REQUIRE_MESSAGE(1 == mgr.SendMessage(MessageA(42)), "No listener found");
-                               a--;
-                               break;
-
-                       case 1:
-                               BOOST_REQUIRE_MESSAGE(1 == mgr.SendMessage(MessageB('c')), "No listener found");
-                               b--;
-                               break;
-
-                       case 2:
-                               BOOST_REQUIRE_MESSAGE(1 == mgr.SendMessage(MessageC("lorem ipsum")),
-                                                                         "No listener found");
-                               c--;
-                               break;
-
-                       default:
-                               BOOST_FAIL("Unexpected message type");
-                       }
-               }
-       }
-
-       BOOST_REQUIRE_MESSAGE(a == 0, "Unexpected number of MessageA: " << a);
-       BOOST_REQUIRE_MESSAGE(b == 0, "Unexpected number of MessageB: " << b);
-       BOOST_REQUIRE_MESSAGE(c == 0, "Unexpected number of MessageC: " << c);
+       BOOST_REQUIRE_MESSAGE(mgr.SendMessage(1234) == 2, "Some listeners not found");
+       BOOST_REQUIRE_MESSAGE(reci == 1234, "First receiver not called");
+       BOOST_REQUIRE_MESSAGE(reci2 == 1234, "Second receiver not called");
+       BOOST_REQUIRE_MESSAGE(recc == 'c', "Previous message overwritten c=" << recc);
 }
 
-NEGATIVE_TEST_CASE(TMM_0070_ThrowingListener)
+NEGATIVE_TEST_CASE(throwing_listener)
 {
        CKM::CommunicationManager<char> mgr;