unit test fixes
This commit is contained in:
@ -431,16 +431,6 @@ TEST_F(file_manager_test,
|
|||||||
return api_error::success;
|
return api_error::success;
|
||||||
});
|
});
|
||||||
|
|
||||||
std::uint64_t handle{};
|
|
||||||
std::shared_ptr<i_open_file> open_file;
|
|
||||||
#if defined(_WIN32)
|
|
||||||
EXPECT_EQ(api_error::success, mgr.open("/test_write_partial_download.txt",
|
|
||||||
false, {}, handle, open_file));
|
|
||||||
#else
|
|
||||||
EXPECT_EQ(api_error::success, mgr.open("/test_write_partial_download.txt",
|
|
||||||
false, O_RDWR, handle, open_file));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
EXPECT_CALL(mp, read_file_bytes)
|
EXPECT_CALL(mp, read_file_bytes)
|
||||||
.WillRepeatedly([&file](const std::string & /* api_path */,
|
.WillRepeatedly([&file](const std::string & /* api_path */,
|
||||||
std::size_t size, std::uint64_t offset,
|
std::size_t size, std::uint64_t offset,
|
||||||
@ -465,6 +455,17 @@ TEST_F(file_manager_test,
|
|||||||
|
|
||||||
return api_error::download_stopped;
|
return api_error::download_stopped;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
std::uint64_t handle{};
|
||||||
|
std::shared_ptr<i_open_file> open_file;
|
||||||
|
#if defined(_WIN32)
|
||||||
|
EXPECT_EQ(api_error::success, mgr.open("/test_write_partial_download.txt",
|
||||||
|
false, {}, handle, open_file));
|
||||||
|
#else
|
||||||
|
EXPECT_EQ(api_error::success, mgr.open("/test_write_partial_download.txt",
|
||||||
|
false, O_RDWR, handle, open_file));
|
||||||
|
#endif
|
||||||
|
|
||||||
EXPECT_CALL(mp, set_item_meta("/test_write_partial_download.txt", _))
|
EXPECT_CALL(mp, set_item_meta("/test_write_partial_download.txt", _))
|
||||||
.WillOnce(
|
.WillOnce(
|
||||||
[](const std::string &, const api_meta_map &meta2) -> api_error {
|
[](const std::string &, const api_meta_map &meta2) -> api_error {
|
||||||
@ -588,16 +589,6 @@ TEST_F(file_manager_test, upload_occurs_after_write_if_fully_downloaded) {
|
|||||||
return api_error::success;
|
return api_error::success;
|
||||||
});
|
});
|
||||||
|
|
||||||
std::uint64_t handle{};
|
|
||||||
std::shared_ptr<i_open_file> open_file;
|
|
||||||
#if defined(_WIN32)
|
|
||||||
EXPECT_EQ(api_error::success, mgr.open("/test_write_full_download.txt", false,
|
|
||||||
{}, handle, open_file));
|
|
||||||
#else
|
|
||||||
EXPECT_EQ(api_error::success, mgr.open("/test_write_full_download.txt", false,
|
|
||||||
O_RDWR, handle, open_file));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
EXPECT_CALL(mp, read_file_bytes)
|
EXPECT_CALL(mp, read_file_bytes)
|
||||||
.WillRepeatedly([&file](const std::string & /* api_path */,
|
.WillRepeatedly([&file](const std::string & /* api_path */,
|
||||||
std::size_t size, std::uint64_t offset,
|
std::size_t size, std::uint64_t offset,
|
||||||
@ -610,6 +601,17 @@ TEST_F(file_manager_test, upload_occurs_after_write_if_fully_downloaded) {
|
|||||||
EXPECT_EQ(bytes_read, data.size());
|
EXPECT_EQ(bytes_read, data.size());
|
||||||
return ret;
|
return ret;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
std::uint64_t handle{};
|
||||||
|
std::shared_ptr<i_open_file> open_file;
|
||||||
|
#if defined(_WIN32)
|
||||||
|
EXPECT_EQ(api_error::success, mgr.open("/test_write_full_download.txt", false,
|
||||||
|
{}, handle, open_file));
|
||||||
|
#else
|
||||||
|
EXPECT_EQ(api_error::success, mgr.open("/test_write_full_download.txt", false,
|
||||||
|
O_RDWR, handle, open_file));
|
||||||
|
#endif
|
||||||
|
|
||||||
EXPECT_CALL(mp, set_item_meta("/test_write_full_download.txt", _))
|
EXPECT_CALL(mp, set_item_meta("/test_write_full_download.txt", _))
|
||||||
.WillOnce(
|
.WillOnce(
|
||||||
[](const std::string &, const api_meta_map &meta2) -> api_error {
|
[](const std::string &, const api_meta_map &meta2) -> api_error {
|
||||||
@ -1478,26 +1480,16 @@ TEST_F(file_manager_test, file_is_closed_after_download_timeout) {
|
|||||||
|
|
||||||
event_capture capture({"item_timeout"});
|
event_capture capture({"item_timeout"});
|
||||||
|
|
||||||
std::uint64_t handle{};
|
|
||||||
std::shared_ptr<i_open_file> open_file;
|
|
||||||
#if defined(_WIN32)
|
|
||||||
EXPECT_EQ(api_error::success, mgr.open("/test_download_timeout.txt", false,
|
|
||||||
{}, handle, open_file));
|
|
||||||
#else
|
|
||||||
EXPECT_EQ(api_error::success, mgr.open("/test_download_timeout.txt", false,
|
|
||||||
O_RDWR, handle, open_file));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
EXPECT_CALL(mp, read_file_bytes)
|
EXPECT_CALL(mp, read_file_bytes)
|
||||||
.WillRepeatedly([](const std::string & /* api_path */,
|
.WillRepeatedly([](const std::string & /* api_path */, std::size_t size,
|
||||||
std::size_t /*size*/, std::uint64_t offset,
|
std::uint64_t offset, data_buffer &data,
|
||||||
data_buffer & /*data*/,
|
|
||||||
stop_type &stop_requested) -> api_error {
|
stop_type &stop_requested) -> api_error {
|
||||||
if (stop_requested) {
|
if (stop_requested) {
|
||||||
return api_error::download_stopped;
|
return api_error::download_stopped;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (offset == 0U) {
|
if (offset == 0U) {
|
||||||
|
data.resize(size);
|
||||||
return api_error::success;
|
return api_error::success;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1508,13 +1500,25 @@ TEST_F(file_manager_test, file_is_closed_after_download_timeout) {
|
|||||||
return api_error::download_stopped;
|
return api_error::download_stopped;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
std::uint64_t handle{};
|
||||||
|
std::shared_ptr<i_open_file> open_file;
|
||||||
|
#if defined(_WIN32)
|
||||||
|
EXPECT_EQ(api_error::success, mgr.open("/test_download_timeout.txt", false,
|
||||||
|
{}, handle, open_file));
|
||||||
|
#else
|
||||||
|
EXPECT_EQ(api_error::success, mgr.open("/test_download_timeout.txt", false,
|
||||||
|
O_RDWR, handle, open_file));
|
||||||
|
#endif
|
||||||
|
|
||||||
data_buffer data{};
|
data_buffer data{};
|
||||||
EXPECT_EQ(api_error::success, open_file->read(1U, 0U, data));
|
EXPECT_EQ(api_error::success, open_file->read(1U, 0U, data));
|
||||||
|
|
||||||
mgr.close(handle);
|
mgr.close(handle);
|
||||||
|
|
||||||
|
if (open_file->is_write_supported()) {
|
||||||
EXPECT_CALL(mp, set_item_meta("/test_download_timeout.txt", META_SOURCE, _))
|
EXPECT_CALL(mp, set_item_meta("/test_download_timeout.txt", META_SOURCE, _))
|
||||||
.WillOnce(Return(api_error::success));
|
.WillOnce(Return(api_error::success));
|
||||||
|
}
|
||||||
|
|
||||||
EXPECT_EQ(std::size_t(1U), mgr.get_open_file_count());
|
EXPECT_EQ(std::size_t(1U), mgr.get_open_file_count());
|
||||||
capture.wait_for_empty();
|
capture.wait_for_empty();
|
||||||
|
Reference in New Issue
Block a user