From 4f89fc62abfc5587dd84ebde3e2d040f5cbd0ecf Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Wed, 10 Mar 2021 21:38:13 +0100
Subject: [PATCH] continued tests

---
 .../datapoollocal/LocalPoolManagerTest.cpp    | 30 +++++++++++++++++--
 .../tests/datapoollocal/LocalPoolOwnerBase.h  |  4 +--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/unittest/tests/datapoollocal/LocalPoolManagerTest.cpp b/unittest/tests/datapoollocal/LocalPoolManagerTest.cpp
index 1ab87151..4457e85b 100644
--- a/unittest/tests/datapoollocal/LocalPoolManagerTest.cpp
+++ b/unittest/tests/datapoollocal/LocalPoolManagerTest.cpp
@@ -219,14 +219,14 @@ TEST_CASE("LocalPoolManagerTest" , "[LocManTest]") {
         REQUIRE(mqMock->receiveMessage(&messageSent) == static_cast<int>(MessageQueueIF::EMPTY));
     }
 
-    SECTION("Periodic HK") {
+    SECTION("PeriodicHKAndMessaging") {
         /* Now we subcribe for a HK periodic generation. Even when it's difficult to simulate
         the temporal behaviour correctly the HK manager should generate a HK packet
         immediately and the periodic helper depends on HK op function calls anyway instead of
         using the clock, so we could also just call performHkOperation multiple times */
-        REQUIRE(poolOwner->subscribePeriodicHk() == retval::CATCH_OK);
+        REQUIRE(poolOwner->subscribePeriodicHk(true) == retval::CATCH_OK);
         REQUIRE(poolOwner->poolManager.performHkOperation() == retval::CATCH_OK);
-        /* Now HK packet should be sent as message. */
+        /* Now HK packet should be sent as message immediately. */
         REQUIRE(mqMock->wasMessageSent(&messagesSent) == true);
         CHECK(messagesSent == 1);
 
@@ -242,9 +242,19 @@ TEST_CASE("LocalPoolManagerTest" , "[LocManTest]") {
         HousekeepingMessage::setToggleReportingCommand(&hkCmd, lpool::testSid, false, false);
         CHECK(poolOwner->poolManager.handleHousekeepingMessage(&hkCmd) == retval::CATCH_OK);
         CHECK(setHandle->getReportingEnabled() == false);
+        REQUIRE(mqMock->wasMessageSent(&messagesSent) == true);
+        CHECK(messagesSent == 1);
         HousekeepingMessage::setToggleReportingCommand(&hkCmd, lpool::testSid, true, false);
         CHECK(poolOwner->poolManager.handleHousekeepingMessage(&hkCmd) == retval::CATCH_OK);
         CHECK(setHandle->getReportingEnabled() == true);
+        REQUIRE(mqMock->wasMessageSent(&messagesSent) == true);
+        CHECK(messagesSent == 1);
+
+        HousekeepingMessage::setToggleReportingCommand(&hkCmd, lpool::testSid, false, false);
+        CHECK(poolOwner->poolManager.handleHousekeepingMessage(&hkCmd) == retval::CATCH_OK);
+        CHECK(setHandle->getReportingEnabled() == false);
+        REQUIRE(mqMock->wasMessageSent(&messagesSent) == true);
+        CHECK(messagesSent == 1);
 
         HousekeepingMessage::setCollectionIntervalModificationCommand(&hkCmd,
                 lpool::testSid, 0.4, false);
@@ -252,6 +262,20 @@ TEST_CASE("LocalPoolManagerTest" , "[LocManTest]") {
         /* For non-diagnostics and a specified minimum frequency of 0.2 seconds, the
         resulting collection interval should be 1.0 second */
         CHECK(poolOwner->dataset.getCollectionInterval() == 1.0);
+        REQUIRE(mqMock->wasMessageSent(&messagesSent) == true);
+        CHECK(messagesSent == 1);
+
+        HousekeepingMessage::setStructureReportingCommand(&hkCmd, lpool::testSid, false);
+        REQUIRE(poolOwner->poolManager.performHkOperation() == retval::CATCH_OK);
+        CHECK(poolOwner->poolManager.handleHousekeepingMessage(&hkCmd) == retval::CATCH_OK);
+        /* Now HK packet should be sent as message. */
+        REQUIRE(mqMock->wasMessageSent(&messagesSent) == true);
+        CHECK(messagesSent == 1);
+
+        HousekeepingMessage::setOneShotReportCommand(&hkCmd, lpool::testSid, false);
+        CHECK(poolOwner->poolManager.handleHousekeepingMessage(&hkCmd) == retval::CATCH_OK);
+        REQUIRE(mqMock->wasMessageSent(&messagesSent) == true);
+        CHECK(messagesSent == 1);
     }
 
     /* we need to reset the subscription list because the pool owner
diff --git a/unittest/tests/datapoollocal/LocalPoolOwnerBase.h b/unittest/tests/datapoollocal/LocalPoolOwnerBase.h
index 20c565ff..eb6d8a5d 100644
--- a/unittest/tests/datapoollocal/LocalPoolOwnerBase.h
+++ b/unittest/tests/datapoollocal/LocalPoolOwnerBase.h
@@ -169,8 +169,8 @@ public:
         return dynamic_cast<MessageQueueMockBase*>(messageQueue);
     }
 
-    ReturnValue_t subscribePeriodicHk() {
-        return poolManager.subscribeForPeriodicPacket(lpool::testSid, true, 0.2, false);
+    ReturnValue_t subscribePeriodicHk(bool enableReporting) {
+        return poolManager.subscribeForPeriodicPacket(lpool::testSid, enableReporting, 0.2, false);
     }
 
     ReturnValue_t subscribeWrapperSetUpdate() {