From f51a67d7049234908555664a19c06c31db97f16b Mon Sep 17 00:00:00 2001
From: Carsten Patzke <carsten.patzke@desy.de>
Date: Wed, 8 Sep 2021 20:03:43 +0200
Subject: [PATCH] Fixed rds unittest build
---
.../net_server/test_rds_fabric_server.cpp | 4 ++--
.../receiver_data_server/net_server/test_rds_tcp_server.cpp | 4 ++--
.../request_handler/test_request_handler.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/receiver/unittests/receiver_data_server/net_server/test_rds_fabric_server.cpp b/receiver/unittests/receiver_data_server/net_server/test_rds_fabric_server.cpp
index 01c1d90ed..50aaaff23 100644
--- a/receiver/unittests/receiver_data_server/net_server/test_rds_fabric_server.cpp
+++ b/receiver/unittests/receiver_data_server/net_server/test_rds_fabric_server.cpp
@@ -26,7 +26,7 @@ std::string expected_address = "somehost:123";
TEST(RdsFabricServer, Constructor) {
NiceMock<MockLogger> mock_logger;
- std::shared_ptr<StrictMock<MockReceiverMonitoringClient>> mock_monitoring{new StrictMock<MockReceiverMonitoringClient>{nullptr}};
+ std::shared_ptr<StrictMock<MockReceiverMonitoringClient>> mock_monitoring{new StrictMock<MockReceiverMonitoringClient>};
RdsFabricServer fabric_server("", &mock_logger, mock_monitoring);
ASSERT_THAT(dynamic_cast<SystemIO*>(fabric_server.io__.get()), Ne(nullptr));
ASSERT_THAT(dynamic_cast<fabric::FabricFactory*>(fabric_server.factory__.get()), Ne(nullptr));
@@ -46,7 +46,7 @@ class RdsFabricServerTests : public Test {
void SetUp() override {
mock_instanced_statistics.reset(new NiceMock<MockInstancedStatistics>);
- mock_monitoring.reset(new StrictMock<MockReceiverMonitoringClient>{nullptr});
+ mock_monitoring.reset(new StrictMock<MockReceiverMonitoringClient>);
RdsFabricServer XX{expected_address, &mock_logger, mock_monitoring};
rds_server_ptr.reset(new RdsFabricServer {expected_address, &mock_logger, mock_monitoring});
diff --git a/receiver/unittests/receiver_data_server/net_server/test_rds_tcp_server.cpp b/receiver/unittests/receiver_data_server/net_server/test_rds_tcp_server.cpp
index db7a94813..ed02933d8 100644
--- a/receiver/unittests/receiver_data_server/net_server/test_rds_tcp_server.cpp
+++ b/receiver/unittests/receiver_data_server/net_server/test_rds_tcp_server.cpp
@@ -38,7 +38,7 @@ namespace {
TEST(RdsTCPServer, Constructor) {
NiceMock<MockLogger> mock_logger;
- std::shared_ptr<StrictMock<MockReceiverMonitoringClient>> mock_monitoring{new StrictMock<MockReceiverMonitoringClient>{nullptr}};
+ std::shared_ptr<StrictMock<MockReceiverMonitoringClient>> mock_monitoring{new StrictMock<MockReceiverMonitoringClient>};
RdsTcpServer tcp_server("", &mock_logger, mock_monitoring);
ASSERT_THAT(dynamic_cast<asapo::IO*>(tcp_server.io__.get()), Ne(nullptr));
ASSERT_THAT(tcp_server.log__, Eq(&mock_logger));
@@ -64,7 +64,7 @@ class RdsTCPServerTests : public Test {
void SetUp() override {
mock_instanced_statistics.reset(new NiceMock<asapo::MockInstancedStatistics>);
- mock_monitoring.reset(new StrictMock<asapo::MockReceiverMonitoringClient>{nullptr});
+ mock_monitoring.reset(new StrictMock<asapo::MockReceiverMonitoringClient>);
tcp_server_ptr.reset(new RdsTcpServer{expected_address, &mock_logger, mock_monitoring});
tcp_server_ptr->io__ = std::unique_ptr<asapo::IO> {&mock_io};
diff --git a/receiver/unittests/receiver_data_server/request_handler/test_request_handler.cpp b/receiver/unittests/receiver_data_server/request_handler/test_request_handler.cpp
index bd84729b1..bb2ad3985 100644
--- a/receiver/unittests/receiver_data_server/request_handler/test_request_handler.cpp
+++ b/receiver/unittests/receiver_data_server/request_handler/test_request_handler.cpp
@@ -70,7 +70,7 @@ class RequestHandlerTests : public Test {
uint8_t tmp;
void SetUp() override {
mock_net_ptr.reset(new StrictMock<asapo::MockNetServer>);
- mock_monitoring_ptr.reset(new StrictMock<asapo::MockReceiverMonitoringClient>{nullptr});
+ mock_monitoring_ptr.reset(new StrictMock<asapo::MockReceiverMonitoringClient>);
ON_CALL(*mock_net_ptr, Monitoring()).WillByDefault(Return(mock_monitoring_ptr));
--
GitLab