Refactor and clean up HK and Local Pool Modules
This commit is contained in:
@ -3,18 +3,18 @@
|
||||
#include "fsfw/ipc/QueueFactory.h"
|
||||
#include "fsfw/storagemanager/LocalPool.h"
|
||||
#include "fsfw/storagemanager/PoolManager.h"
|
||||
#include "mocks/AcceptsTmMock.h"
|
||||
#include "mocks/CdsShortTimestamperMock.h"
|
||||
#include "mocks/InternalErrorReporterMock.h"
|
||||
#include "mocks/MessageQueueMock.h"
|
||||
#include "mocks/PusDistributorMock.h"
|
||||
#include "mocks/PusServiceBaseMock.h"
|
||||
#include "mocks/PusVerificationReporterMock.h"
|
||||
#include "mock/AcceptsTmMock.h"
|
||||
#include "mock/CdsShortTimestamperMock.h"
|
||||
#include "mock/InternalErrorReporterMock.h"
|
||||
#include "mock/MessageQueueMock.h"
|
||||
#include "mock/PusDistributorMock.h"
|
||||
#include "mock/PusServiceBaseMock.h"
|
||||
#include "mock/PusVerificationReporterMock.h"
|
||||
|
||||
TEST_CASE("Pus Service Base", "[pus-service-base]") {
|
||||
uint16_t apid = 2;
|
||||
auto verificationReporter = PusVerificationReporterMock();
|
||||
auto msgQueue = MessageQueueMock(1);
|
||||
auto msgQueue = MessageQueueMock(1, MessageQueueIF::NO_QUEUE);
|
||||
auto tmReceiver = AcceptsTmMock(2);
|
||||
auto psbParams = PsbParams(0, apid, 17);
|
||||
|
||||
@ -117,7 +117,7 @@ TEST_CASE("Pus Service Base", "[pus-service-base]") {
|
||||
}
|
||||
|
||||
SECTION("Set Request Queue") {
|
||||
auto msgQueueMock = MessageQueueMock(2);
|
||||
auto msgQueueMock = MessageQueueMock(2, MessageQueueIF::NO_QUEUE);
|
||||
psb.setRequestQueue(msgQueueMock);
|
||||
auto& p = psb.getParams();
|
||||
REQUIRE(p.reqQueue == &msgQueueMock);
|
||||
|
@ -3,15 +3,14 @@
|
||||
#include "fsfw/storagemanager/LocalPool.h"
|
||||
#include "fsfw/tmtcservices/TmSendHelper.h"
|
||||
#include "fsfw/tmtcservices/TmStoreHelper.h"
|
||||
#include "mocks/CdsShortTimestamperMock.h"
|
||||
#include "mocks/InternalErrorReporterMock.h"
|
||||
#include "mocks/MessageQueueMock.h"
|
||||
#include "mock/CdsShortTimestamperMock.h"
|
||||
#include "mock/InternalErrorReporterMock.h"
|
||||
#include "mock/MessageQueueMock.h"
|
||||
|
||||
TEST_CASE("TM Send Helper", "[tm-send-helper]") {
|
||||
MessageQueueId_t destId = 2;
|
||||
auto errReporter = InternalErrorReporterMock();
|
||||
auto msgQueue = MessageQueueMock(1);
|
||||
msgQueue.setDefaultDestination(destId);
|
||||
auto msgQueue = MessageQueueMock(1, destId);
|
||||
TmSendHelper sendHelper(msgQueue, errReporter, destId);
|
||||
auto timeStamper = CdsShortTimestamperMock();
|
||||
LocalPool::LocalPoolConfig cfg = {{5, 32}, {2, 64}};
|
||||
|
@ -4,10 +4,10 @@
|
||||
#include "fsfw/tmtcservices/TmSendHelper.h"
|
||||
#include "fsfw/tmtcservices/TmStoreAndSendHelper.h"
|
||||
#include "fsfw/tmtcservices/TmStoreHelper.h"
|
||||
#include "mocks/CdsShortTimestamperMock.h"
|
||||
#include "mocks/InternalErrorReporterMock.h"
|
||||
#include "mocks/MessageQueueMock.h"
|
||||
#include "mocks/SimpleSerializable.h"
|
||||
#include "mock/CdsShortTimestamperMock.h"
|
||||
#include "mock/InternalErrorReporterMock.h"
|
||||
#include "mock/MessageQueueMock.h"
|
||||
#include "mock/SimpleSerializable.h"
|
||||
|
||||
TEST_CASE("TM Store And Send Helper", "[tm-store-send-helper]") {
|
||||
auto timeStamper = CdsShortTimestamperMock();
|
||||
@ -17,8 +17,7 @@ TEST_CASE("TM Store And Send Helper", "[tm-store-send-helper]") {
|
||||
|
||||
MessageQueueId_t destId = 1;
|
||||
auto errReporter = InternalErrorReporterMock();
|
||||
auto msgQueue = MessageQueueMock(2);
|
||||
msgQueue.setDefaultDestination(destId);
|
||||
auto msgQueue = MessageQueueMock(2, destId);
|
||||
TmSendHelper sendHelper(msgQueue, errReporter, destId);
|
||||
TmStoreAndSendWrapper tmHelper(17, storeHelper, sendHelper);
|
||||
|
||||
|
@ -3,8 +3,8 @@
|
||||
#include "fsfw/storagemanager/LocalPool.h"
|
||||
#include "fsfw/tmtcservices/TmStoreHelper.h"
|
||||
#include "fsfw/tmtcservices/tmHelpers.h"
|
||||
#include "mocks/CdsShortTimestamperMock.h"
|
||||
#include "mocks/SimpleSerializable.h"
|
||||
#include "mock/CdsShortTimestamperMock.h"
|
||||
#include "mock/SimpleSerializable.h"
|
||||
|
||||
TEST_CASE("TM Store Helper", "[tm-store-helper]") {
|
||||
auto timeStamper = CdsShortTimestamperMock();
|
||||
|
Reference in New Issue
Block a user