From 53347e2a6324e84b44b2d8698edcfd41647aece6 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Fri, 16 Jul 2021 15:50:53 +0200
Subject: [PATCH] fix tests
---
producer/api/cpp/src/producer_c_glue.cpp | 2 +-
tests/automatic/consumer/consumer_api/consumer_api.c | 1 +
tests/automatic/producer/c_api/check_linux.sh | 3 +--
tests/automatic/producer/c_api/producer_api.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/producer/api/cpp/src/producer_c_glue.cpp b/producer/api/cpp/src/producer_c_glue.cpp
index ea7ed2158..abb22d35c 100644
--- a/producer/api/cpp/src/producer_c_glue.cpp
+++ b/producer/api/cpp/src/producer_c_glue.cpp
@@ -119,7 +119,7 @@ extern "C" {
dataset_size,
auto_id != 0));
}
-
+
#define BUILD_WRAPPER asapo::RequestCallback wrapper = [ = ](asapo::RequestCallbackPayload payload, asapo::Error err) -> void { \
void* data = (void*) payload.data.release(); \
auto payLoadHandle = new AsapoHandlerHolder<asapo::RequestCallbackPayload>(&payload, false); \
diff --git a/tests/automatic/consumer/consumer_api/consumer_api.c b/tests/automatic/consumer/consumer_api/consumer_api.c
index 0ec099002..25fdbc653 100644
--- a/tests/automatic/consumer/consumer_api/consumer_api.c
+++ b/tests/automatic/consumer/consumer_api/consumer_api.c
@@ -56,6 +56,7 @@ void test_datasets(AsapoConsumerHandle consumer, AsapoStringHandle group_id) {
AsapoDataSetHandle ds = asapo_consumer_get_last_dataset(consumer, 0, "incomplete", &err);
ASSERT_TRUE(ds == NULL,"returns null in case of error");
ASSERT_TRUE(asapo_error_get_type(err) == kEndOfStream,"incomplete dataset end of stream error");
+ asapo_free_handle(&ds);
// get dataset by id incomplete datasets without min_size
dataset = asapo_consumer_get_dataset_by_id(consumer,2, 0,"incomplete", &err);
diff --git a/tests/automatic/producer/c_api/check_linux.sh b/tests/automatic/producer/c_api/check_linux.sh
index 4fcd7f3c7..3830f771c 100644
--- a/tests/automatic/producer/c_api/check_linux.sh
+++ b/tests/automatic/producer/c_api/check_linux.sh
@@ -23,5 +23,4 @@ mkdir -p ${receiver_folder}
echo test > file1
-#$@ 127.0.0.1:8400 $data_source $beamtime_id
-/Users/yakubov/Projects/asapo/cmake-build-debug/tests/automatic/producer/c_api/producer_api_c 127.0.0.1:8400 c asapo_test
+$@ 127.0.0.1:8400 $data_source $beamtime_id
diff --git a/tests/automatic/producer/c_api/producer_api.c b/tests/automatic/producer/c_api/producer_api.c
index fe88def56..f5822e68d 100644
--- a/tests/automatic/producer/c_api/producer_api.c
+++ b/tests/automatic/producer/c_api/producer_api.c
@@ -7,14 +7,14 @@
void callback(void* original_data, AsapoRequestCallbackPayloadHandle payload, AsapoErrorHandle error) {
EXIT_IF_ERROR("error after callback", error);
- AsapoMessageDataHandle data_handle = asapo_request_callback_payload_get_data(payload);
AsapoStringHandle response = asapo_request_callback_payload_get_response(payload);
const struct AsapoGenericRequestHeader* header = asapo_request_callback_payload_get_original_header(payload);
ASSERT_EQ_INT(1,header->data_id,"data id");
ASSERT_EQ_STRING("hello",(const char*)original_data,"data in payload");
- asapo_free_handle(&data_handle);
+ free(original_data);
+
asapo_free_handle(&response);
}
--
GitLab