From: Ron Dempster (rdempste) <rdempste@cisco.com>
Date: Fri, 21 Jul 2023 17:29:49 +0000 (+0000)
Subject: Pull request #3924: flow: make sure cpputest mock objects are initialized
X-Git-Tag: 3.1.67.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b9eb3b6cf54509eb3808fb2bbe1c3fa8046d082;p=thirdparty%2Fsnort3.git

Pull request #3924: flow: make sure cpputest mock objects are initialized

Merge in SNORT/snort3 from ~RDEMPSTE/snort3:ha_test2 to master

Squashed commit of the following:

commit aebb18b1f50e3ba10b0050f171c4664486b4de43
Author: Ron Dempster (rdempste) <rdempste@cisco.com>
Date:   Fri Jul 21 12:30:20 2023 -0400

    flow: make sure cpputest mock objects are initialized
---

diff --git a/src/flow/test/ha_test.cc b/src/flow/test/ha_test.cc
index 7ce8a1a81..e94af042d 100644
--- a/src/flow/test/ha_test.cc
+++ b/src/flow/test/ha_test.cc
@@ -242,7 +242,7 @@ bool SideChannel::process(int)
 {
     SCMessage* msg = (SCMessage*)mock().getData("message_content").getObjectPointer();
     SCProcessMsgFunc* s_handler = (SCProcessMsgFunc*)mock().getData("s_handler").getObjectPointer();
-    if (*s_handler && msg && msg->content && msg->content_length != 0)
+    if (s_handler && nullptr != *s_handler && msg && msg->content && msg->content_length != 0)
     {
         SCMessage s_rec_sc_message = {};
         s_rec_sc_message.content = msg->content;
@@ -279,6 +279,11 @@ SCMessage* SideChannel::alloc_transmit_message(uint32_t len)
 
 TEST_GROUP(high_availability_manager_test)
 {
+    void setup() override
+    {
+        mock().setDataObject("s_handler", "SCProcessMsgFunc", nullptr);
+    }
+
     void teardown() override
     {
         HighAvailabilityManager::term();
@@ -321,6 +326,8 @@ TEST_GROUP(flow_ha_state_test)
     {
         s_packet_time = {};
         mock().setDataObject("packet_tv", "struct timeval", &s_packet_time);
+        mock().setDataObject("s_side_channel", "SideChannel", nullptr);
+        mock().setDataObject("s_handler", "SCProcessMsgFunc", nullptr);
     }
 
     void teardown() override