eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

TMTC Stack Refactoring #106

Merged
muellerr merged 123 commits from mueller/tmtc-stack-refactoring into develop 2022-08-16 17:30:17 +02:00
Conversation 0 Commits 123 Files Changed 287 +9 -2
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit db33f9cc7e - Show all commits

2
src/fsfw/objectmanager/ObjectManager.h
View File

@ -38,7 +38,7 @@ class ObjectManager : public ObjectManagerIF {
/** /**
* @brief In the class's destructor, all objects in the list are deleted. * @brief In the class's destructor, all objects in the list are deleted.
*/ */
virtual ~ObjectManager(); ~ObjectManager() override;
ReturnValue_t insert(object_id_t id, SystemObjectIF* object) override; ReturnValue_t insert(object_id_t id, SystemObjectIF* object) override;
ReturnValue_t remove(object_id_t id) override; ReturnValue_t remove(object_id_t id) override;
void initialize() override; void initialize() override;

1
unittests/CatchFactory.cpp
View File

@ -33,7 +33,6 @@ void Factory::produceFrameworkObjects(void* args) {
new EventManager(objects::EVENT_MANAGER); new EventManager(objects::EVENT_MANAGER);
new HealthTable(objects::HEALTH_TABLE); new HealthTable(objects::HEALTH_TABLE);
new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER); new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
new HkReceiverMock(objects::HK_RECEIVER_MOCK);
{ {
PoolManager::LocalPoolConfig poolCfg = {{100, 16}, {50, 32}, {25, 64}, {15, 128}, {5, 1024}}; PoolManager::LocalPoolConfig poolCfg = {{100, 16}, {50, 32}, {25, 64}, {15, 128}, {5, 1024}};

2
unittests/CatchRunner.cpp
View File

@ -13,6 +13,7 @@
#include <catch2/catch_session.hpp> #include <catch2/catch_session.hpp>
extern int customSetup(); extern int customSetup();
extern int customTeardown();
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
customSetup(); customSetup();
@ -21,5 +22,6 @@ int main(int argc, char* argv[]) {
int result = Catch::Session().run(argc, argv); int result = Catch::Session().run(argc, argv);
// global clean-up // global clean-up
customTeardown();
return result; return result;
} }

6
unittests/CatchSetup.cpp
View File

@ -29,3 +29,9 @@ int customSetup() {
objMan->initialize(); objMan->initialize();
return 0; return 0;
} }
int customTeardown() {
ObjectManager* objMan = ObjectManager::instance();
delete objMan;
return 0;
}