Improve pub_sub unit tests

Luos-io · May 5, 2023 · d3b935f · d3b935f
1 parent 69e0e3c
commit d3b935f
Show file tree

Hide file tree

Showing 8 changed files with 488 additions and 389 deletions.
diff --git a/engine/IO/src/filter.c b/engine/IO/src/filter.c
@@ -88,7 +88,7 @@ void Filter_AddServiceId(uint16_t service_id, uint16_t service_number)
  ******************************************************************************/
 void Filter_AddTopic(uint16_t topic_id)
 {
-    LUOS_ASSERT(topic_id <= LAST_TOPIC);
+    LUOS_ASSERT(topic_id < LAST_TOPIC);
     // Add 1 to the bit corresponding to the topic in multicast mask
     filter_ctx.TopicMask[(topic_id / 8)] |= 1 << (topic_id - ((int)(topic_id / 8)) * 8);
 }
@@ -100,7 +100,7 @@ void Filter_AddTopic(uint16_t topic_id)
  ******************************************************************************/
 void Filter_RmTopic(uint16_t topic_id)
 {
-    LUOS_ASSERT(topic_id <= LAST_TOPIC);
+    LUOS_ASSERT(topic_id < LAST_TOPIC);
     // Remove 1 to the bit corresponding to the topic in multicast mask
     filter_ctx.TopicMask[(topic_id / 8)] &= ~(1 << (topic_id - ((int)(topic_id / 8)) * 8));
 }
@@ -144,7 +144,7 @@ _CRITICAL bool Filter_Topic(uint16_t topic_id)
 {
     uint8_t compare = 0;
     // Make sure there is a topic that can be received by the node
-    if (topic_id <= LAST_TOPIC)
+    if (topic_id < LAST_TOPIC)
     {
         compare = topic_id - ((topic_id / 8) * 8);
         // Search if topic exists in mask

diff --git a/engine/core/src/pub_sub.c b/engine/core/src/pub_sub.c
@@ -30,6 +30,8 @@
  ******************************************************************************/
 uint8_t PubSub_IsTopicSubscribed(service_t *service, uint16_t topic_id)
 {
+    LUOS_ASSERT((topic_id < LAST_TOPIC)
+                && (service != NULL));
     unsigned char i;
     for (i = 0; i < service->last_topic_position; i++)
     {
@@ -48,8 +50,8 @@ uint8_t PubSub_IsTopicSubscribed(service_t *service, uint16_t topic_id)
 error_return_t Luos_Subscribe(service_t *service, uint16_t topic)
 {
     // Assert if we add a topic that is greater than the max topic value
-    LUOS_ASSERT(topic <= LAST_TOPIC);
-    LUOS_ASSERT(service != 0);
+    LUOS_ASSERT((topic < LAST_TOPIC)
+                && (service != 0));
 
     // Put this topic in the multicast bank
     Filter_AddTopic(topic);
@@ -72,19 +74,15 @@ error_return_t Luos_Subscribe(service_t *service, uint16_t topic)
  ******************************************************************************/
 error_return_t Luos_Unsubscribe(service_t *service, uint16_t topic)
 {
-    LUOS_ASSERT(topic <= LAST_TOPIC);
-    LUOS_ASSERT(service != 0);
+    LUOS_ASSERT((topic < LAST_TOPIC)
+                && (service != 0));
 
     error_return_t err = FAILED;
     // Delete topic from service list
     for (uint16_t i = 0; i < service->last_topic_position; i++)
     {
         if (service->topic_list[i] == topic)
         {
-            if (service->last_topic_position >= LAST_TOPIC)
-            {
-                break;
-            }
             memcpy(&service->topic_list[i], &service->topic_list[i + 1], service->last_topic_position - i);
             service->last_topic_position--;
             err = SUCCEED;

diff --git a/test/test_robus/main.c b/test/test_robus/main.c
diff --git a/test/test_robus/main.h b/test/test_robus/main.h