From 0e4e0a1c9c6c3064222a2ad1d253ff6098566aaf Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 30 Jul 2019 16:45:20 +0200
Subject: [PATCH] fix tests
---
tests/automatic/worker/worker_api/check_windows.bat | 2 +-
tests/automatic/worker/worker_api/worker_api.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/automatic/worker/worker_api/check_windows.bat b/tests/automatic/worker/worker_api/check_windows.bat
index cd2012938..b189f66b4 100644
--- a/tests/automatic/worker/worker_api/check_windows.bat
+++ b/tests/automatic/worker/worker_api/check_windows.bat
@@ -19,7 +19,7 @@ echo hello1 > 1
echo db.dropDatabase() | %mongo_exe% %database_name%
-for /l %%x in (1, 1, 10) do echo db.data.insert({"_id":%%x,"size":3,"images":[{"_id":1, "size":6,"name":"%%x_1","lastchange":1,"source":"none","buf_id":0,"meta":{"test":10}},{"_id":2, "size":100,"name":"%%x_2","lastchange":1,"source":"none","buf_id":0,"meta":{"test":10}},{"_id":3, "size":100,"name":"%%x_3","lastchange":1,"source":"none","buf_id":0,"meta":{"test":10}}]}) | %mongo_exe% %database_name% || goto :error
+for /l %%x in (1, 1, 10) do echo db.data.insert({"_id":%%x,"size":3,"images":[{"_id":1, "size":6,"name":"%%x_1","lastchange":1,"source":"none","buf_id":0,"meta":{"test":10}},{"_id":2, "size":6,"name":"%%x_2","lastchange":1,"source":"none","buf_id":0,"meta":{"test":10}},{"_id":3, "size":6,"name":"%%x_3","lastchange":1,"source":"none","buf_id":0,"meta":{"test":10}}]}) | %mongo_exe% %database_name% || goto :error
echo hello1 > 1_1
diff --git a/tests/automatic/worker/worker_api/worker_api.cpp b/tests/automatic/worker/worker_api/worker_api.cpp
index 227e98791..3d873d266 100644
--- a/tests/automatic/worker/worker_api/worker_api.cpp
+++ b/tests/automatic/worker/worker_api/worker_api.cpp
@@ -45,7 +45,7 @@ void TestSingle(const std::unique_ptr<asapo::DataBroker>& broker, const std::str
asapo::FileData data;
err = broker->RetrieveData(&fi,&data);
M_AssertTrue(err == nullptr, "RetrieveData no error");
- M_AssertEq("hello1",std::string(reinterpret_cast<char*>(data.get())));
+ M_AssertEq("hello1",std::string(data.get(),data.get()+fi.size));
err = broker->GetLast(&fi, group_id, nullptr);
@@ -124,7 +124,7 @@ void TestDataset(const std::unique_ptr<asapo::DataBroker>& broker, const std::st
asapo::FileData data;
err = broker->RetrieveData(&dataset.content[0],&data);
M_AssertTrue(err == nullptr, "RetrieveData no error");
- M_AssertEq("hello1",std::string(reinterpret_cast<char*>(data.get())));
+ M_AssertEq("hello1",std::string(data.get(),data.get()+dataset.content[0].size));
dataset = broker->GetLastDataset(group_id, &err);
--
GitLab