From 1f8cf553526ca0deaa977399bbfe77e8e5fadbb1 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Fri, 31 Aug 2018 17:21:47 +0200
Subject: [PATCH] get rid of bin file extension in tests
---
.../dummy-data-producer/check_linux.sh | 8 ++++----
.../dummy-data-producer/check_windows.bat | 8 ++++----
.../unittests/test_request_handler_tcp.cpp | 2 +-
.../src/inotify_event.cpp | 3 ---
.../test_system_folder_watch_linux.cpp | 20 ++++++++++---------
receiver/src/request.cpp | 2 +-
receiver/unittests/test_request.cpp | 2 +-
.../test_request_handler_db_writer.cpp | 2 +-
.../test_request_handler_file_write.cpp | 2 +-
.../transfer_single_file/check_linux.sh | 2 +-
.../transfer_single_file/check_windows.bat | 2 +-
11 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/examples/producer/dummy-data-producer/check_linux.sh b/examples/producer/dummy-data-producer/check_linux.sh
index f6a290300..38531cece 100644
--- a/examples/producer/dummy-data-producer/check_linux.sh
+++ b/examples/producer/dummy-data-producer/check_linux.sh
@@ -14,7 +14,7 @@ mkdir files
$@ files beamtime_id 11 4 4 1 10 2>&1 | grep Rate
-ls -ln files/0.bin | awk '{ print $5 }'| grep 11000
-ls -ln files/1.bin | awk '{ print $5 }'| grep 11000
-ls -ln files/2.bin | awk '{ print $5 }'| grep 11000
-ls -ln files/3.bin | awk '{ print $5 }'| grep 11000
+ls -ln files/0 | awk '{ print $5 }'| grep 11000
+ls -ln files/1 | awk '{ print $5 }'| grep 11000
+ls -ln files/2 | awk '{ print $5 }'| grep 11000
+ls -ln files/3 | awk '{ print $5 }'| grep 11000
diff --git a/examples/producer/dummy-data-producer/check_windows.bat b/examples/producer/dummy-data-producer/check_windows.bat
index 016a34346..0b7b133ba 100644
--- a/examples/producer/dummy-data-producer/check_windows.bat
+++ b/examples/producer/dummy-data-producer/check_windows.bat
@@ -4,16 +4,16 @@ mkdir %folder%
"%1" %folder% beamtime_id 11 4 4 1 10 2>&1 | findstr "Rate" || goto :error
-FOR /F "usebackq" %%A IN ('%folder%\0.bin') DO set size=%%~zA
+FOR /F "usebackq" %%A IN ('%folder%\0') DO set size=%%~zA
if %size% NEQ 11000 goto :error
-FOR /F "usebackq" %%A IN ('%folder%\1.bin') DO set size=%%~zA
+FOR /F "usebackq" %%A IN ('%folder%\1') DO set size=%%~zA
if %size% NEQ 11000 goto :error
-FOR /F "usebackq" %%A IN ('%folder%\2.bin') DO set size=%%~zA
+FOR /F "usebackq" %%A IN ('%folder%\2') DO set size=%%~zA
if %size% NEQ 11000 goto :error
-FOR /F "usebackq" %%A IN ('%folder%\3.bin') DO set size=%%~zA
+FOR /F "usebackq" %%A IN ('%folder%\3') DO set size=%%~zA
if %size% NEQ 11000 goto :error
goto :clean
diff --git a/producer/api/unittests/test_request_handler_tcp.cpp b/producer/api/unittests/test_request_handler_tcp.cpp
index e3df453b9..0b241c7e6 100644
--- a/producer/api/unittests/test_request_handler_tcp.cpp
+++ b/producer/api/unittests/test_request_handler_tcp.cpp
@@ -67,7 +67,7 @@ class RequestHandlerTcpTests : public testing::Test {
callback_header = header;
}};
- std::string expected_origin_fullpath = std::string("origin/") + expected_file_name + ".bin";
+ std::string expected_origin_fullpath = std::string("origin/") + expected_file_name;
asapo::Request request_filesend{expected_beamtime_id, header, nullptr, expected_origin_fullpath, nullptr};
diff --git a/producer/event_monitor_producer/src/inotify_event.cpp b/producer/event_monitor_producer/src/inotify_event.cpp
index bcc89e358..2ac098769 100644
--- a/producer/event_monitor_producer/src/inotify_event.cpp
+++ b/producer/event_monitor_producer/src/inotify_event.cpp
@@ -39,9 +39,6 @@ bool InotifyEvent::IsDeleteDirectoryInFolderEventByMove() const {
}
void InotifyEvent::Print() const {
printf(" wd =%2d; ", inotify_event_->wd);
- if (inotify_event_->cookie > 0)
- printf("cookie =%4d; ", inotify_event_->cookie);
-
printf("mask = ");
if (inotify_event_->mask & IN_ACCESS) printf("IN_ACCESS ");
if (inotify_event_->mask & IN_ATTRIB) printf("IN_ATTRIB ");
diff --git a/producer/event_monitor_producer/unittests/test_system_folder_watch_linux.cpp b/producer/event_monitor_producer/unittests/test_system_folder_watch_linux.cpp
index 971418809..a5d22d6c3 100644
--- a/producer/event_monitor_producer/unittests/test_system_folder_watch_linux.cpp
+++ b/producer/event_monitor_producer/unittests/test_system_folder_watch_linux.cpp
@@ -108,14 +108,16 @@ ACTION_P(A_CopyBuf, buffer) {
ssize_t SystemFolderWatchTests::AddEventToBuffer(std::string filename, uint32_t mask, int fd) {
- struct inotify_event event;
- event.mask = mask;
- event.wd = fd;
- strcpy(event.name, filename.c_str());
- event.len = strlen(event.name) + 1;
- ssize_t size = sizeof(struct inotify_event) + event.len;
- memcpy(buffer + cur_buffer_pointer, &event, size);
+ ssize_t size = sizeof(struct inotify_event) + filename.size()+1;
+ char* buf = (char*) malloc(size);
+ struct inotify_event* event=(struct inotify_event*) buf;
+ event->mask = mask;
+ event->wd = fd;
+ strcpy(event->name, filename.c_str());
+ event->len = strlen(event->name) + 1;
+ memcpy(buffer + cur_buffer_pointer, event, size);
cur_buffer_pointer += size;
+ free(buf);
return size;
}
@@ -225,8 +227,8 @@ TEST_F(SystemFolderWatchTests, ProcessFileEvents) {
auto events = watch.GetFileList(&err);
ASSERT_THAT(events.size(), Eq(2));
- ASSERT_THAT(events[0], StrEq("test1/file1"));
- ASSERT_THAT(events[1], StrEq("test2/file2"));
+ ASSERT_THAT(events[0].c_str(), StrEq("test1/file1"));
+ ASSERT_THAT(events[1].c_str(), StrEq("test2/file2"));
ASSERT_THAT(err, Eq(nullptr));
}
diff --git a/receiver/src/request.cpp b/receiver/src/request.cpp
index 8c10e991f..b5a7b89a5 100644
--- a/receiver/src/request.cpp
+++ b/receiver/src/request.cpp
@@ -75,7 +75,7 @@ const FileData& Request::GetData() const {
}
std::string Request::GetFileName() const {
- return std::to_string(request_header_.data_id) + ".bin";
+ return std::to_string(request_header_.data_id);
}
const std::string& Request::GetOriginUri() const {
diff --git a/receiver/unittests/test_request.cpp b/receiver/unittests/test_request.cpp
index 429a5b8e5..c0bf0497c 100644
--- a/receiver/unittests/test_request.cpp
+++ b/receiver/unittests/test_request.cpp
@@ -212,7 +212,7 @@ TEST_F(RequestTests, GetDataSize) {
TEST_F(RequestTests, GetFileName) {
auto fname = request->GetFileName();
- auto s = std::to_string(data_id_) + ".bin";
+ auto s = std::to_string(data_id_);
ASSERT_THAT(fname, Eq(s));
}
diff --git a/receiver/unittests/test_request_handler_db_writer.cpp b/receiver/unittests/test_request_handler_db_writer.cpp
index db675f888..9dc53af0f 100644
--- a/receiver/unittests/test_request_handler_db_writer.cpp
+++ b/receiver/unittests/test_request_handler_db_writer.cpp
@@ -147,7 +147,7 @@ TEST_F(DbWriterHandlerTests, CallsInsert) {
EXPECT_CALL(mock_db, Connect_t(config.broker_db_uri, expected_beamtime_id, asapo::kDBCollectionName)).
WillOnce(testing::Return(nullptr));
- std::string expected_file_name = "2.bin";
+ std::string expected_file_name = "2";
uint64_t expected_file_size = 10;
uint64_t expected_id = 15;
EXPECT_CALL(*mock_request, GetDataSize())
diff --git a/receiver/unittests/test_request_handler_file_write.cpp b/receiver/unittests/test_request_handler_file_write.cpp
index 6c5bdce40..5977f1490 100644
--- a/receiver/unittests/test_request_handler_file_write.cpp
+++ b/receiver/unittests/test_request_handler_file_write.cpp
@@ -55,7 +55,7 @@ class FileWriteHandlerTests : public Test {
NiceMock<MockIO> mock_io;
std::unique_ptr<MockRequest> mock_request;
NiceMock<asapo::MockLogger> mock_logger;
- std::string expected_file_name = "2.bin";
+ std::string expected_file_name = "2";
std::string expected_beamtime_id = "beamtime_id";
std::string expected_beamline = "beamline";
uint64_t expected_file_size = 10;
diff --git a/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh b/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh
index 433d26bbe..cb98e5067 100644
--- a/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh
+++ b/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh
@@ -34,7 +34,7 @@ mkdir -p ${receiver_folder}
$1 localhost:8400 ${beamtime_id} 100 1 1 0 30
-ls -ln ${receiver_folder}/1.bin | awk '{ print $5 }'| grep 100000
+ls -ln ${receiver_folder}/1 | awk '{ print $5 }'| grep 100000
$1 localhost:8400 wrong_beamtime_id 100 1 1 0 1 2>1 | grep "authorization failed"
diff --git a/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat b/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
index c17b785ea..88297b840 100644
--- a/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
+++ b/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
@@ -21,7 +21,7 @@ mkdir %receiver_folder%
ping 1.0.0.0 -n 1 -w 100 > nul
-FOR /F "usebackq" %%A IN ('%receiver_folder%\1.bin') DO set size=%%~zA
+FOR /F "usebackq" %%A IN ('%receiver_folder%\1') DO set size=%%~zA
if %size% NEQ 100000 goto :error
"%1" localhost:8400 wrong_id 100 1 1 0 2 2>1 | findstr /c:"authorization failed" || goto :error
--
GitLab