Skip to content
Snippets Groups Projects
Commit f51a67d7 authored by Carsten Patzke's avatar Carsten Patzke
Browse files

Fixed rds unittest build

parent 5ad4a326
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ std::string expected_address = "somehost:123"; ...@@ -26,7 +26,7 @@ std::string expected_address = "somehost:123";
TEST(RdsFabricServer, Constructor) { TEST(RdsFabricServer, Constructor) {
NiceMock<MockLogger> mock_logger; 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); RdsFabricServer fabric_server("", &mock_logger, mock_monitoring);
ASSERT_THAT(dynamic_cast<SystemIO*>(fabric_server.io__.get()), Ne(nullptr)); ASSERT_THAT(dynamic_cast<SystemIO*>(fabric_server.io__.get()), Ne(nullptr));
ASSERT_THAT(dynamic_cast<fabric::FabricFactory*>(fabric_server.factory__.get()), Ne(nullptr)); ASSERT_THAT(dynamic_cast<fabric::FabricFactory*>(fabric_server.factory__.get()), Ne(nullptr));
...@@ -46,7 +46,7 @@ class RdsFabricServerTests : public Test { ...@@ -46,7 +46,7 @@ class RdsFabricServerTests : public Test {
void SetUp() override { void SetUp() override {
mock_instanced_statistics.reset(new NiceMock<MockInstancedStatistics>); 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}; RdsFabricServer XX{expected_address, &mock_logger, mock_monitoring};
rds_server_ptr.reset(new RdsFabricServer {expected_address, &mock_logger, mock_monitoring}); rds_server_ptr.reset(new RdsFabricServer {expected_address, &mock_logger, mock_monitoring});
......
...@@ -38,7 +38,7 @@ namespace { ...@@ -38,7 +38,7 @@ namespace {
TEST(RdsTCPServer, Constructor) { TEST(RdsTCPServer, Constructor) {
NiceMock<MockLogger> mock_logger; 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); RdsTcpServer tcp_server("", &mock_logger, mock_monitoring);
ASSERT_THAT(dynamic_cast<asapo::IO*>(tcp_server.io__.get()), Ne(nullptr)); ASSERT_THAT(dynamic_cast<asapo::IO*>(tcp_server.io__.get()), Ne(nullptr));
ASSERT_THAT(tcp_server.log__, Eq(&mock_logger)); ASSERT_THAT(tcp_server.log__, Eq(&mock_logger));
...@@ -64,7 +64,7 @@ class RdsTCPServerTests : public Test { ...@@ -64,7 +64,7 @@ class RdsTCPServerTests : public Test {
void SetUp() override { void SetUp() override {
mock_instanced_statistics.reset(new NiceMock<asapo::MockInstancedStatistics>); 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.reset(new RdsTcpServer{expected_address, &mock_logger, mock_monitoring});
tcp_server_ptr->io__ = std::unique_ptr<asapo::IO> {&mock_io}; tcp_server_ptr->io__ = std::unique_ptr<asapo::IO> {&mock_io};
......
...@@ -70,7 +70,7 @@ class RequestHandlerTests : public Test { ...@@ -70,7 +70,7 @@ class RequestHandlerTests : public Test {
uint8_t tmp; uint8_t tmp;
void SetUp() override { void SetUp() override {
mock_net_ptr.reset(new StrictMock<asapo::MockNetServer>); 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)); ON_CALL(*mock_net_ptr, Monitoring()).WillByDefault(Return(mock_monitoring_ptr));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment