Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,16 @@ std::vector<structures::DeviceIdentification> ExternalConnection::getAllConnecte
std::vector<structures::DeviceIdentification> devices {};
for(const auto &moduleNumber: settings_.modules) {
std::list<structures::DeviceIdentification> unique_devices {};
const int ret = moduleLibrary_.statusAggregators.at(moduleNumber)->get_unique_devices(unique_devices);
auto statusAggregatorItr = moduleLibrary_.statusAggregators.find(moduleNumber);

if (statusAggregatorItr == moduleLibrary_.statusAggregators.end())
{
log::logWarning("Module {} is defined in external-connection endpoint but is not specified in module-paths",
moduleNumber);
continue;
}

const int ret = (*statusAggregatorItr).second->get_unique_devices(unique_devices);
if(ret <= 0) {
log::logWarning("Module {} does not have any connected devices", moduleNumber);
continue;
Expand Down
13 changes: 13 additions & 0 deletions source/bringauto/settings/SettingsParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include <iostream>
#include <fstream>
#include <ranges>



Expand Down Expand Up @@ -108,6 +109,18 @@ bool SettingsParser::areSettingsCorrect() const {
isCorrect = false;
}

isCorrect &= !std::ranges::any_of(settings_->externalConnectionSettingsList, [&](auto& externalConnectionSettings){
return std::ranges::any_of(externalConnectionSettings.modules, [&](auto const& externalModuleId) {
bool isMissing = !settings_->modulePaths.contains(externalModuleId);
if (isMissing)
{
std::cerr << "Module " << externalModuleId <<
" is defined in external-connection endpoint modules but is not specified in module-paths" << std::endl;
}
return isMissing;
});
});

return isCorrect;
}

Expand Down
18 changes: 18 additions & 0 deletions test/source/SettingsParserTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,3 +185,21 @@ TEST_F(SettingsParserTests, InvalidProtocol){
EXPECT_TRUE(result);
EXPECT_TRUE(settingsParser.getSettings()->externalConnectionSettingsList.empty());
}

/**
* @brief Test if modules specified in endpoint missing in module-paths are handled correctly
*/
TEST_F(SettingsParserTests, MissingModules){
testing_utils::ConfigMock::Config config {};
config.module_paths = { {1, "/path/to/lib1.so"}, {2, "/path/to/lib2.so"}, {3, "/path/to/lib3.so"} };
config.external_connection.endpoint.modules = { 1, 2, 3, 4};

bool failed = false;
try {
parseConfig(config);
}catch (std::invalid_argument &e){
EXPECT_STREQ(e.what(), "Arguments are not correct.");
failed = true;
}
EXPECT_TRUE(failed);
}