From 62c9f79d589197efdb093b9ed590be3c40ce715f Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Wed, 11 Apr 2018 19:02:47 +0200
Subject: [PATCH] Fix tests
---
common/cpp/include/json_parser/json_parser.h | 2 +-
receiver/src/main.cpp | 2 +-
receiver/src/receiver_config.cpp | 2 +-
receiver/unittests/test_config.cpp | 2 +-
.../producer_receiver/check_monitoring/CMakeLists.txt | 1 +
.../producer_receiver/transfer_single_file/CMakeLists.txt | 1 +
tests/automatic/settings/receiver.json | 3 +++
7 files changed, 9 insertions(+), 4 deletions(-)
create mode 100644 tests/automatic/settings/receiver.json
diff --git a/common/cpp/include/json_parser/json_parser.h b/common/cpp/include/json_parser/json_parser.h
index 077c23bb2..65302b7ef 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 61a1d2b71..eaff8cb54 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 faf6fdb0a..e6652cb97 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 22ed806d1..a059b8ba8 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 d783ebe25..298b81ed2 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 83a9f5958..f745213b8 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 000000000..dd2e322e8
--- /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
--
GitLab