From 3cfaf09c96d9db7fcf0e40c5d8329093ba0dfff7 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 9 Nov 2021 17:52:53 +0100
Subject: [PATCH] fix tests&build
---
receiver/unittests/receiver_mocking.h | 2 +-
.../unittests/request_handler/test_authorization_client.cpp | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/receiver/unittests/receiver_mocking.h b/receiver/unittests/receiver_mocking.h
index a12551c7e..eb587199f 100644
--- a/receiver/unittests/receiver_mocking.h
+++ b/receiver/unittests/receiver_mocking.h
@@ -90,7 +90,7 @@ class MockRequest: public Request {
};
MOCK_METHOD(const uint64_t*, GetCustomData_t, (), (const));
- MOCK_METHOD(const char*, GetMessage, (), (const, override));
+ MOCK_METHOD(const char*, GetMessage, (), (const)); //override does not compile on windows, not clear why ()
MOCK_METHOD(void, SetBeamtimeId, (std::string), (override));
MOCK_METHOD(void, SetDataSource, (std::string), (override));
MOCK_METHOD(void, SetBeamline, (std::string), (override));
diff --git a/receiver/unittests/request_handler/test_authorization_client.cpp b/receiver/unittests/request_handler/test_authorization_client.cpp
index 7f3dad411..1bff5c3fc 100644
--- a/receiver/unittests/request_handler/test_authorization_client.cpp
+++ b/receiver/unittests/request_handler/test_authorization_client.cpp
@@ -65,8 +65,7 @@ class AuthorizerClientTests : public Test {
config.authorization_server = expected_authorization_server;
config.authorization_interval_ms = 0;
SetReceiverConfig(config, "none");
- ON_CALL(*mock_request, GetOriginHost()).WillByDefault(ReturnRef(""));
-
+ SetDefaultRequestCalls(mock_request.get(),expected_beamtime_id);
}
void TearDown() override {
client.http_client__.release();
--
GitLab