diff --git a/common/cpp/include/json_parser/json_parser.h b/common/cpp/include/json_parser/json_parser.h index 077c23bb2046ff3c2c9a2e35f3e5b6efc5cd441b..65302b7ef80b820bc42932ba282d28b1d5e723ed 100644 --- a/common/cpp/include/json_parser/json_parser.h +++ b/common/cpp/include/json_parser/json_parser.h @@ -15,7 +15,7 @@ class RapidJson; class JsonParser { public: - JsonParser(const std::string& json, const std::unique_ptr<IO>* io); + JsonParser(const std::string& json, const std::unique_ptr<IO>* io); // nullptr as second parameter will use default IO JsonParser(const std::string& json); ~JsonParser(); JsonParser(JsonParser&& other); diff --git a/receiver/src/main.cpp b/receiver/src/main.cpp index 61a1d2b71679def78e808a6722e7f9a14c05f0f8..eaff8cb54a06a29c3ba1702f1179fac8a3098d11 100644 --- a/receiver/src/main.cpp +++ b/receiver/src/main.cpp @@ -11,7 +11,7 @@ hidra2::Error ReadConfigFile(int argc, char* argv[]) { exit(EXIT_FAILURE); } hidra2::ReceiverConfigFactory factory; - return factory.SetConfigFromFile("fname"); + return factory.SetConfigFromFile(argv[1]); } int main (int argc, char* argv[]) { diff --git a/receiver/src/receiver_config.cpp b/receiver/src/receiver_config.cpp index faf6fdb0ac1f97884b42d67564e6fedf7cf63af2..e6652cb974b0dcb4a648b122a454193b48e8c734 100644 --- a/receiver/src/receiver_config.cpp +++ b/receiver/src/receiver_config.cpp @@ -13,7 +13,7 @@ ReceiverConfigFactory::ReceiverConfigFactory() : io__{GenerateDefaultIO()} { Error ReceiverConfigFactory::SetConfigFromFile(std::string file_name) { JsonParser parser(file_name, &io__); - return parser.GetString("uri",&config.influxdb_uri); + return parser.GetString("influxdb_uri", &config.influxdb_uri); } const ReceiverConfig* GetReceiverConfig() { diff --git a/receiver/unittests/test_config.cpp b/receiver/unittests/test_config.cpp index 22ed806d151333f3bb4cff32fa88bf34f14c47a4..a059b8ba8cc8c2b2e542a5eb782d330b3a863846 100644 --- a/receiver/unittests/test_config.cpp +++ b/receiver/unittests/test_config.cpp @@ -46,7 +46,7 @@ class ConfigTests : public Test { TEST_F(ConfigTests, ReadSettings) { - EXPECT_CALL(mock_io,ReadFileToString_t("fname",_)); + EXPECT_CALL(mock_io, ReadFileToString_t("fname", _)); config_factory.SetConfigFromFile("fname"); } diff --git a/tests/automatic/producer_receiver/check_monitoring/CMakeLists.txt b/tests/automatic/producer_receiver/check_monitoring/CMakeLists.txt index d783ebe25d5bf941cd3c94d7b112a24c5ed75e11..298b81ed25e3e9ef14c159b37e04c9a8a000d29f 100644 --- a/tests/automatic/producer_receiver/check_monitoring/CMakeLists.txt +++ b/tests/automatic/producer_receiver/check_monitoring/CMakeLists.txt @@ -3,5 +3,6 @@ set(TARGET_NAME receiver) ################################ # Testing ################################ +configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/receiver.json receiver.json COPYONLY) add_script_test("${TARGET_NAME}-monitoring" "$<TARGET_FILE:dummy-data-producer> $<TARGET_FILE:receiver-bin>" nomem ) diff --git a/tests/automatic/producer_receiver/transfer_single_file/CMakeLists.txt b/tests/automatic/producer_receiver/transfer_single_file/CMakeLists.txt index 83a9f59580c5427848720b28aea7353d86335d23..f745213b85ef22c898bce3130b1ae24dcfa33a13 100644 --- a/tests/automatic/producer_receiver/transfer_single_file/CMakeLists.txt +++ b/tests/automatic/producer_receiver/transfer_single_file/CMakeLists.txt @@ -3,4 +3,5 @@ set(TARGET_NAME transfer-single-file) ################################ # Testing ################################ +configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/receiver.json receiver.json COPYONLY) add_script_test("${TARGET_NAME}" "$<TARGET_FILE:dummy-data-producer> $<TARGET_FILE:receiver-bin>" nomem) diff --git a/tests/automatic/settings/receiver.json b/tests/automatic/settings/receiver.json new file mode 100644 index 0000000000000000000000000000000000000000..dd2e322e8a51ffbe972e9d9b63deec1fe6fdd3a6 --- /dev/null +++ b/tests/automatic/settings/receiver.json @@ -0,0 +1,3 @@ +{ + "influxdb_uri":"127.0.0.1:27017" +} \ No newline at end of file