From 22cd2713ffbefd0fc48cf941122fd02e635cf653 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Fri, 11 Jun 2021 15:39:41 +0200
Subject: [PATCH] fix build and test
---
common/cpp/include/asapo/preprocessor/definitions.h | 2 +-
producer/api/cpp/include/asapo/producer/producer.h | 4 ++--
producer/api/cpp/unittests/test_producer_impl.cpp | 3 ++-
tests/automatic/mongo_db/upsert/upsert_mongodb.cpp | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/cpp/include/asapo/preprocessor/definitions.h b/common/cpp/include/asapo/preprocessor/definitions.h
index 8d78c2b01..1f6b9fd8b 100644
--- a/common/cpp/include/asapo/preprocessor/definitions.h
+++ b/common/cpp/include/asapo/preprocessor/definitions.h
@@ -12,7 +12,7 @@
#if defined(__GNUC__) || defined(__clang__)
#define DEPRECATED(msg) __attribute__((deprecated(msg)))
#elif defined(_MSC_VER)
-#define DEPRECATED __declspec(deprecated(msg))
+#define DEPRECATED(msg) __declspec(deprecated(msg))
#else
#pragma message("WARNING: You need to implement DEPRECATED for this compiler")
#define DEPRECATED(msg)
diff --git a/producer/api/cpp/include/asapo/producer/producer.h b/producer/api/cpp/include/asapo/producer/producer.h
index 217fe7039..6d2a9535c 100644
--- a/producer/api/cpp/include/asapo/producer/producer.h
+++ b/producer/api/cpp/include/asapo/producer/producer.h
@@ -112,8 +112,8 @@ class Producer {
\param callback - callback function
\return Error - will be nullptr on success
*/
- virtual Error SendMetadata(const std::string& metadata,
- RequestCallback callback) DEPRECATED("obsolates 01.07.2022, use SendBeamtimeMetadata instead") = 0;
+ virtual Error DEPRECATED("obsolates 01.07.2022, use SendBeamtimeMetadata instead") SendMetadata(const std::string& metadata,
+ RequestCallback callback) = 0;
//! Sends beamtime metadata to the receiver
/*!
diff --git a/producer/api/cpp/unittests/test_producer_impl.cpp b/producer/api/cpp/unittests/test_producer_impl.cpp
index 44ff6e4b9..0eeea7f69 100644
--- a/producer/api/cpp/unittests/test_producer_impl.cpp
+++ b/producer/api/cpp/unittests/test_producer_impl.cpp
@@ -347,13 +347,14 @@ TEST_F(ProducerImplTests, OKAddingSendStreamDataRequest) {
expected_size = expected_metadata.size();
expected_ingest_mode = asapo::IngestModeFlags::kTransferData | asapo::IngestModeFlags::kStoreInDatabase ;
+ std::string expected_message = (std::string(expected_stream) + ".meta");
producer.SetCredentials(expected_credentials);
EXPECT_CALL(mock_pull, AddRequest_t(M_CheckSendRequest(asapo::kOpcodeTransferMetaData,
expected_credentials_str,
"",
expected_id,
expected_size,
- (std::string(expected_stream) + ".meta").c_str(),
+ expected_message.c_str(),
expected_stream,
expected_ingest_mode,
1,
diff --git a/tests/automatic/mongo_db/upsert/upsert_mongodb.cpp b/tests/automatic/mongo_db/upsert/upsert_mongodb.cpp
index addb0f0d1..9b14210d0 100644
--- a/tests/automatic/mongo_db/upsert/upsert_mongodb.cpp
+++ b/tests/automatic/mongo_db/upsert/upsert_mongodb.cpp
@@ -46,14 +46,14 @@ int main(int argc, char* argv[]) {
}
auto mode = asapo::MetaIngestMode{asapo::MetaIngestOp::kReplace, true};
- auto err = db.Insert("meta", 0, reinterpret_cast<const uint8_t*>(json.c_str()), json.size(), mode);
+ auto err = db.Insert("meta", "0", reinterpret_cast<const uint8_t*>(json.c_str()), json.size(), mode);
if (err) {
std::cout << err->Explain() << std::endl;
}
Assert(err, args.keyword);
- err = db.Insert("meta", 0, reinterpret_cast<const uint8_t*>(json.c_str()), json.size(), mode);
+ err = db.Insert("meta", "0", reinterpret_cast<const uint8_t*>(json.c_str()), json.size(), mode);
if (err) {
std::cout << err->Explain() << std::endl;
}
--
GitLab