From 04b4105ba959b82513dd88776b8e28ae13e873d0 Mon Sep 17 00:00:00 2001
From: Alex Hultman <alexhultman@gmail.com>
Date: Fri, 8 May 2020 14:46:49 +0200
Subject: [PATCH] Clean-up TopicTree test

---
 tests/TopicTree.cpp | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/tests/TopicTree.cpp b/tests/TopicTree.cpp
index de9b84e..1feb436 100644
--- a/tests/TopicTree.cpp
+++ b/tests/TopicTree.cpp
@@ -3,38 +3,53 @@
 #include <cassert>
 #include <iostream>
 
-uWS::TopicTree *topicTree;
-
 void testUnsubscribeInside() {
+    std::cout << "TestUnsubscribeInside" << std::endl;
 
-    topicTree = new uWS::TopicTree([](uWS::Subscriber *s, std::string_view data) {
-        std::cout << s << " got <" << data << ">" << std::endl;
+    uWS::TopicTree *topicTree;
+    std::map<void *, std::string> expectedResult;
 
-        if (s == (void *) UINTPTR_MAX) {
-            std::cout << "Error! Received UINTPTR_MAX as Subscriber!" << std::endl;
-            exit(-1);
-        }
+    topicTree = new uWS::TopicTree([&topicTree, &expectedResult](uWS::Subscriber *s, std::string_view data) {
+        /* Check for unexpected subscribers */
+        assert(expectedResult.find(s) != expectedResult.end());
 
-        /* This one causes the following cb to get UINTPTR_MAX */
+        /* Check for unexpected data */
+        assert(expectedResult[s] == data);
+
+        /* This one causes mess-up */
         topicTree->unsubscribeAll(s);
 
+        /* We actually don't use this one */
         return 0;
     });
 
     uWS::Subscriber *s1 = new uWS::Subscriber(nullptr);
     uWS::Subscriber *s2 = new uWS::Subscriber(nullptr);
 
-    std::cout << "s1 = " << s1 << std::endl;
-    std::cout << "s2 = " << s2 << std::endl;
+    /* Fill out expectedResult */
+    expectedResult = {
+        {s1, "Ett!"},
+        {s2, "Två!"}
+    };
 
-    topicTree->subscribe("1", s1);
+    /* Make sure s1 < s2 */
+    if (s2 < s1) {
+        uWS::Subscriber *tmp = s1;
+        s1 = s2;
+        s2 = tmp;
+    }
+
+    /* This order does not matter as it fills a tree */
     topicTree->subscribe("2", s2);
+    topicTree->subscribe("1", s1);
 
+    /* This order matters, as it fills triggeredTopics array in order */
     topicTree->publish("1", "Ett!");
     topicTree->publish("2", "Två!");
 
     topicTree->drain();
 
+    /* Release resources */
     topicTree->unsubscribeAll(s1);
     topicTree->unsubscribeAll(s2);