Skip to content
Snippets Groups Projects
Commit 13fcff12 authored by Sergey Yakubov's avatar Sergey Yakubov
Browse files

fix for windows

parent 2c71f189
Branches
Tags
No related merge requests found
......@@ -53,8 +53,17 @@ class MockRequest: public Request {
MOCK_CONST_METHOD0(GetBeamtimeId, const std::string & ());
MOCK_CONST_METHOD0(GetMetaData, const std::string & ());
MOCK_CONST_METHOD0(GetBeamline, const std::string & ());
MOCK_CONST_METHOD0(GetOpCode, asapo::Opcode ());
MOCK_CONST_METHOD0(GetCustomData, const asapo::CustomRequestData & ());
MOCK_CONST_METHOD0(GetOpCode,
asapo::Opcode ());
mutable asapo::CustomRequestData t;
const asapo::CustomRequestData& GetCustomData() const override {
auto a = GetCustomData_t();
t[0]=a[0];
t[1]=a[1];
return t;
};
MOCK_CONST_METHOD0(GetCustomData_t, const uint64_t* ());
MOCK_CONST_METHOD0(GetMessage, const char* ());
MOCK_METHOD1(SetBeamtimeId, void (std::string));
MOCK_METHOD1(SetBeamline, void (std::string));
......
......@@ -71,7 +71,7 @@ class DbWriterHandlerTests : public Test {
uint64_t expected_id = 15;
uint64_t expected_subset_id = 15;
uint64_t expected_subset_size = 2;
asapo:: CustomRequestData expected_custom_data{expected_subset_id, expected_subset_size};
uint64_t expected_custom_data[2]{expected_subset_id, expected_subset_size};
void SetUp() override {
GenericRequestHeader request_header;
request_header.data_id = 2;
......@@ -140,8 +140,8 @@ void DbWriterHandlerTests::ExpectRequestParams(asapo::Opcode op_code) {
;
if (op_code == asapo::Opcode::kOpcodeTransferSubsetData) {
EXPECT_CALL(*mock_request, GetCustomData()).Times(2).
WillRepeatedly(ReturnRef(expected_custom_data))
EXPECT_CALL(*mock_request, GetCustomData_t()).Times(2).
WillRepeatedly(Return(expected_custom_data))
;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment