From e9a2e64734fc9b0875fee34f8d4d84937e1d02ac Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Wed, 17 Jan 2018 17:47:41 +0100
Subject: [PATCH] ioerror -> ioerrors
---
common/cpp/include/common/file_info.h | 2 +-
common/cpp/include/system_wrappers/io.h | 8 ++--
.../cpp/include/system_wrappers/system_io.h | 8 ++--
common/cpp/include/unittests/MockIO.h | 6 +--
common/cpp/src/system_io/system_io.cpp | 30 +++++++-------
common/cpp/src/system_io/system_io_linux.cpp | 16 ++++----
.../cpp/src/system_io/system_io_windows.cpp | 28 ++++++-------
.../read_file_content/read_file_content.cpp | 12 +++---
.../read_folder_content.cpp | 10 ++---
worker/api/cpp/src/folder_data_broker.cpp | 18 ++++-----
.../api/cpp/unittests/test_folder_broker.cpp | 40 +++++++++----------
.../folder_to_db/src/folder_db_importer.cpp | 6 +--
.../unittests/test_folder_to_db.cpp | 6 +--
13 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/common/cpp/include/common/file_info.h b/common/cpp/include/common/file_info.h
index 59fd134f7..c29d5e1b8 100644
--- a/common/cpp/include/common/file_info.h
+++ b/common/cpp/include/common/file_info.h
@@ -17,7 +17,7 @@ struct FileInfo {
uint64_t id{0};
std::string Json() const {
auto nanoseconds_from_epoch = std::chrono::time_point_cast<std::chrono::nanoseconds>(modify_date).
- time_since_epoch().count();
+ time_since_epoch().count();
std::string s = "{\"_id\":" + std::to_string(id) + ","
"\"size\":" + std::to_string(size) + ","
"\"base_name\":\"" + base_name + "\","
diff --git a/common/cpp/include/system_wrappers/io.h b/common/cpp/include/system_wrappers/io.h
index fb180f961..8d581ce3b 100644
--- a/common/cpp/include/system_wrappers/io.h
+++ b/common/cpp/include/system_wrappers/io.h
@@ -11,7 +11,7 @@
namespace hidra2 {
-enum class IOError {
+enum class IOErrors {
kNoError,
kFileNotFound,
kReadError,
@@ -20,13 +20,13 @@ enum class IOError {
kMemoryAllocationError
};
-IOError IOErrorFromErrno();
+IOErrors IOErrorFromErrno();
class IO {
public:
- virtual FileData GetDataFromFile(const std::string& fname, uint64_t fsize, IOError* err) const noexcept = 0;
+ virtual FileData GetDataFromFile(const std::string& fname, uint64_t fsize, IOErrors* err) const noexcept = 0;
virtual int open(const char* __file, int __oflag) const noexcept = 0;
virtual int close(int __fd) const noexcept = 0;
@@ -34,7 +34,7 @@ class IO {
virtual int64_t write(int __fd, const void* __buf, size_t __n) const noexcept = 0;
// this is not standard function - to be implemented differently in windows and linux
- virtual FileInfos FilesInFolder(const std::string& folder, IOError* err) const = 0;
+ virtual FileInfos FilesInFolder(const std::string& folder, IOErrors* err) const = 0;
};
}
diff --git a/common/cpp/include/system_wrappers/system_io.h b/common/cpp/include/system_wrappers/system_io.h
index 7a326abe2..5ad61883c 100644
--- a/common/cpp/include/system_wrappers/system_io.h
+++ b/common/cpp/include/system_wrappers/system_io.h
@@ -7,16 +7,16 @@ namespace hidra2 {
class SystemIO final : public IO {
public:
- FileData GetDataFromFile(const std::string& fname, uint64_t fsize, IOError* err) const noexcept override;
+ FileData GetDataFromFile(const std::string& fname, uint64_t fsize, IOErrors* err) const noexcept override;
int open(const char* __file, int __oflag) const noexcept override;
int close(int __fd) const noexcept override;
int64_t read(int __fd, void* buf, size_t count) const noexcept override;
int64_t write(int __fd, const void* __buf, size_t __n) const noexcept override;
- FileInfos FilesInFolder(const std::string& folder, IOError* err) const override;
+ FileInfos FilesInFolder(const std::string& folder, IOErrors* err) const override;
private:
- void ReadWholeFile(int fd, uint8_t* array, uint64_t fsize, IOError* err) const noexcept;
+ void ReadWholeFile(int fd, uint8_t* array, uint64_t fsize, IOErrors* err) const noexcept;
void CollectFileInformationRecursivly(const std::string& path,
- FileInfos* files, IOError* err) const;
+ FileInfos* files, IOErrors* err) const;
};
}
diff --git a/common/cpp/include/unittests/MockIO.h b/common/cpp/include/unittests/MockIO.h
index b639f773b..87de96648 100644
--- a/common/cpp/include/unittests/MockIO.h
+++ b/common/cpp/include/unittests/MockIO.h
@@ -10,7 +10,7 @@ namespace hidra2 {
class MockIO : public IO {
public:
- FileData GetDataFromFile(const std::string& fname, uint64_t fsize, IOError* err) const noexcept override {
+ FileData GetDataFromFile(const std::string& fname, uint64_t fsize, IOErrors* err) const noexcept override {
return GetDataFromFile_t(fname, fsize, err);
}
int open(const char* __file, int __oflag) const noexcept override {
@@ -26,10 +26,10 @@ class MockIO : public IO {
return write_t(__fd, __buf, __n);
}
MOCK_CONST_METHOD3(GetDataFromFile_t,
- FileData(const std::string& fname, uint64_t fsize, IOError* err));
+ FileData(const std::string& fname, uint64_t fsize, IOErrors* err));
MOCK_CONST_METHOD2(FilesInFolder,
FileInfos(
- const std::string& folder, IOError
+ const std::string& folder, IOErrors
*err));
MOCK_CONST_METHOD3(read_t,
diff --git a/common/cpp/src/system_io/system_io.cpp b/common/cpp/src/system_io/system_io.cpp
index ec4c7f8ba..875a945fc 100644
--- a/common/cpp/src/system_io/system_io.cpp
+++ b/common/cpp/src/system_io/system_io.cpp
@@ -9,27 +9,27 @@
namespace hidra2 {
-IOError IOErrorFromErrno() {
- IOError err;
+IOErrors IOErrorFromErrno() {
+ IOErrors err;
switch (errno) {
case 0:
- err = IOError::kNoError;
+ err = IOErrors::kNoError;
break;
case ENOENT:
case ENOTDIR:
- err = IOError::kFileNotFound;
+ err = IOErrors::kFileNotFound;
break;
case EACCES:
- err = IOError::kPermissionDenied;
+ err = IOErrors::kPermissionDenied;
break;
default:
- err = IOError::kUnknownError;
+ err = IOErrors::kUnknownError;
break;
}
return err;
}
-void SystemIO::ReadWholeFile(int fd, uint8_t* array, uint64_t fsize, IOError* err) const noexcept {
+void SystemIO::ReadWholeFile(int fd, uint8_t* array, uint64_t fsize, IOErrors* err) const noexcept {
uint64_t totalbytes = 0;
int64_t readbytes = 0;
do {
@@ -38,35 +38,35 @@ void SystemIO::ReadWholeFile(int fd, uint8_t* array, uint64_t fsize, IOError* er
} while (readbytes > 0 && totalbytes < fsize);
if (totalbytes != fsize) {
- *err = IOError::kReadError;
+ *err = IOErrors::kReadError;
}
}
-FileData SystemIO::GetDataFromFile(const std::string& fname, uint64_t fsize, IOError* err) const noexcept {
+FileData SystemIO::GetDataFromFile(const std::string& fname, uint64_t fsize, IOErrors* err) const noexcept {
errno = 0;
int fd = open(fname.c_str(), O_RDONLY);
*err = IOErrorFromErrno();
- if (*err != IOError::kNoError) {
+ if (*err != IOErrors::kNoError) {
return nullptr;
}
uint8_t* data_array = nullptr;
try {
data_array = new uint8_t[fsize];
} catch (...) {
- *err = IOError::kMemoryAllocationError;
+ *err = IOErrors::kMemoryAllocationError;
return nullptr;
}
ReadWholeFile(fd, data_array, fsize, err);
FileData data{data_array};
- if (*err != IOError::kNoError) {
+ if (*err != IOErrors::kNoError) {
close(fd);
return nullptr;
}
errno = 0;
close(fd);
*err = IOErrorFromErrno();
- if (*err != IOError::kNoError) {
+ if (*err != IOErrors::kNoError) {
return nullptr;
}
@@ -95,10 +95,10 @@ void AssignIDs(FileInfos* file_list) {
}
-FileInfos SystemIO::FilesInFolder(const std::string& folder, IOError* err) const {
+FileInfos SystemIO::FilesInFolder(const std::string& folder, IOErrors* err) const {
FileInfos files{};
CollectFileInformationRecursivly(folder, &files, err);
- if (*err != IOError::kNoError) {
+ if (*err != IOErrors::kNoError) {
return {};
}
StripBasePath(folder, &files);
diff --git a/common/cpp/src/system_io/system_io_linux.cpp b/common/cpp/src/system_io/system_io_linux.cpp
index 247c105aa..e86e08594 100644
--- a/common/cpp/src/system_io/system_io_linux.cpp
+++ b/common/cpp/src/system_io/system_io_linux.cpp
@@ -46,7 +46,7 @@ void SetFileName(const string& path, const string& name, FileInfo* file_info) {
file_info->base_name = name;
}
-struct stat FileStat(const string& fname, IOError* err) {
+struct stat FileStat(const string& fname, IOErrors* err) {
struct stat t_stat {};
errno = 0;
int res = stat(fname.c_str(), &t_stat);
@@ -56,13 +56,13 @@ struct stat FileStat(const string& fname, IOError* err) {
return t_stat;
}
-FileInfo GetFileInfo(const string& path, const string& name, IOError* err) {
+FileInfo GetFileInfo(const string& path, const string& name, IOErrors* err) {
FileInfo file_info;
SetFileName(path, name, &file_info);
auto t_stat = FileStat(path + "/" + name, err);
- if (*err != IOError::kNoError) {
+ if (*err != IOErrors::kNoError) {
return FileInfo{};
}
@@ -74,22 +74,22 @@ FileInfo GetFileInfo(const string& path, const string& name, IOError* err) {
}
void ProcessFileEntity(const struct dirent* entity, const std::string& path,
- FileInfos* files, IOError* err) {
+ FileInfos* files, IOErrors* err) {
- *err = IOError::kNoError;
+ *err = IOErrors::kNoError;
if (entity->d_type != DT_REG) {
return;
}
FileInfo file_info = GetFileInfo(path, entity->d_name, err);
- if (*err != IOError::kNoError) {
+ if (*err != IOErrors::kNoError) {
return;
}
files->push_back(file_info);
}
void SystemIO::CollectFileInformationRecursivly(const std::string& path,
- FileInfos* files, IOError* err) const {
+ FileInfos* files, IOErrors* err) const {
errno = 0;
auto dir = opendir((path).c_str());
if (dir == nullptr) {
@@ -108,7 +108,7 @@ void SystemIO::CollectFileInformationRecursivly(const std::string& path,
} else {
ProcessFileEntity(current_entity, path, files, err);
}
- if (*err != IOError::kNoError) {
+ if (*err != IOErrors::kNoError) {
errno = 0;
closedir(dir);
return;
diff --git a/common/cpp/src/system_io/system_io_windows.cpp b/common/cpp/src/system_io/system_io_windows.cpp
index f1ee0a563..acb23e381 100644
--- a/common/cpp/src/system_io/system_io_windows.cpp
+++ b/common/cpp/src/system_io/system_io_windows.cpp
@@ -12,27 +12,27 @@ using std::chrono::system_clock;
namespace hidra2 {
-IOError IOErrorFromGetLastError() {
- IOError err;
+IOErrors IOErrorFromGetLastError() {
+ IOErrors err;
switch (GetLastError()) {
case ERROR_SUCCESS :
- err = IOError::kNoError;
+ err = IOErrors::kNoError;
break;
case ERROR_PATH_NOT_FOUND:
case ERROR_FILE_NOT_FOUND:
- err = IOError::kFileNotFound;
+ err = IOErrors::kFileNotFound;
break;
case ERROR_ACCESS_DENIED:
- err = IOError::kPermissionDenied;
+ err = IOErrors::kPermissionDenied;
break;
default:
- err = IOError::kUnknownError;
+ err = IOErrors::kUnknownError;
break;
}
return err;
}
-std::chrono::system_clock::time_point FileTime2TimePoint(const FILETIME& ft, IOError* err) {
+std::chrono::system_clock::time_point FileTime2TimePoint(const FILETIME& ft, IOErrors* err) {
SYSTEMTIME st = {0};
if (!FileTimeToSystemTime(&ft, &st)) {
*err = IOErrorFromGetLastError();
@@ -48,7 +48,7 @@ std::chrono::system_clock::time_point FileTime2TimePoint(const FILETIME& ft, IOE
auto tp = std::chrono::system_clock::from_time_t(secs);
tp += ms;
- *err = IOError::kNoError;
+ *err = IOErrors::kNoError;
return tp;
}
@@ -59,16 +59,16 @@ bool IsDirectory(const WIN32_FIND_DATA f) {
}
void ProcessFileEntity(const WIN32_FIND_DATA f, const std::string& path,
- FileInfos* files, IOError* err) {
+ FileInfos* files, IOErrors* err) {
- *err = IOError::kNoError;
+ *err = IOErrors::kNoError;
if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
return;
}
FileInfo file_info;
file_info.modify_date = FileTime2TimePoint(f.ftLastWriteTime, err);
- if (*err != IOError::kNoError) {
+ if (*err != IOErrors::kNoError) {
return;
}
@@ -79,7 +79,7 @@ void ProcessFileEntity(const WIN32_FIND_DATA f, const std::string& path,
void SystemIO::CollectFileInformationRecursivly(const std::string& path,
- FileInfos* files, IOError* err) const {
+ FileInfos* files, IOErrors* err) const {
WIN32_FIND_DATA find_data;
HANDLE handle = FindFirstFile((path + "\\*.*").c_str(), &find_data);
if (handle == INVALID_HANDLE_VALUE) {
@@ -93,14 +93,14 @@ void SystemIO::CollectFileInformationRecursivly(const std::string& path,
} else {
ProcessFileEntity(find_data, path, files, err);
}
- if (*err != IOError::kNoError) {
+ if (*err != IOErrors::kNoError) {
FindClose(handle);
return;
}
} while (FindNextFile(handle, &find_data));
if (FindClose(handle)) {
- *err = IOError ::kNoError;
+ *err = IOErrors ::kNoError;
} else {
*err = IOErrorFromGetLastError();
}
diff --git a/tests/system_io/read_file_content/read_file_content.cpp b/tests/system_io/read_file_content/read_file_content.cpp
index ab0ecc130..7853299e7 100644
--- a/tests/system_io/read_file_content/read_file_content.cpp
+++ b/tests/system_io/read_file_content/read_file_content.cpp
@@ -4,7 +4,7 @@
#include "testing.h"
using hidra2::SystemIO;
-using hidra2::IOError;
+using hidra2::IOErrors;
using hidra2::M_AssertEq;
int main(int argc, char* argv[]) {
@@ -14,24 +14,24 @@ int main(int argc, char* argv[]) {
}
std::string expect{argv[2]};
- IOError err;
+ IOErrors err;
auto io = std::unique_ptr<SystemIO> {new SystemIO};
auto data = io->GetDataFromFile(argv[1], expect.size(), &err);
std::string result;
switch (err) {
- case IOError::kFileNotFound:
+ case IOErrors::kFileNotFound:
result = "notfound";
break;
- case IOError::kNoError:
+ case IOErrors::kNoError:
for(int i = 0; i < expect.size(); i++)
result += data[i];
break;
- case IOError::kPermissionDenied:
+ case IOErrors::kPermissionDenied:
result = "noaccess";
break;
- case IOError::kReadError:
+ case IOErrors::kReadError:
result = "readerror";
break;
diff --git a/tests/system_io/read_files_in_folder/read_folder_content.cpp b/tests/system_io/read_files_in_folder/read_folder_content.cpp
index 9c0e58ea8..71cdc303e 100644
--- a/tests/system_io/read_files_in_folder/read_folder_content.cpp
+++ b/tests/system_io/read_files_in_folder/read_folder_content.cpp
@@ -4,7 +4,7 @@
#include "testing.h"
using hidra2::SystemIO;
-using hidra2::IOError;
+using hidra2::IOErrors;
using hidra2::M_AssertEq;
@@ -15,23 +15,23 @@ int main(int argc, char* argv[]) {
}
std::string expect{argv[2]};
- IOError err;
+ IOErrors err;
auto io = std::unique_ptr<SystemIO> {new SystemIO};
auto files = io->FilesInFolder(argv[1], &err);
std::string result;
int64_t id = 0;
switch (err) {
- case IOError::kFileNotFound:
+ case IOErrors::kFileNotFound:
result = "notfound";
break;
- case IOError::kNoError:
+ case IOErrors::kNoError:
for(auto file_info : files) {
M_AssertEq(file_info.id, ++id);
result += file_info.relative_path + file_info.base_name;
}
break;
- case IOError::kPermissionDenied:
+ case IOErrors::kPermissionDenied:
result = "noaccess";
break;
default:
diff --git a/worker/api/cpp/src/folder_data_broker.cpp b/worker/api/cpp/src/folder_data_broker.cpp
index bcb6eafd1..a6c263c44 100644
--- a/worker/api/cpp/src/folder_data_broker.cpp
+++ b/worker/api/cpp/src/folder_data_broker.cpp
@@ -4,22 +4,22 @@
namespace hidra2 {
-WorkerErrorCode MapIOError(IOError io_err) {
+WorkerErrorCode MapIOError(IOErrors io_err) {
WorkerErrorCode err;
switch (io_err) { // we do not use map due to performance reasons
- case IOError::kNoError:
+ case IOErrors::kNoError:
err = WorkerErrorCode::kOK;
break;
- case IOError::kFileNotFound:
+ case IOErrors::kFileNotFound:
err = WorkerErrorCode::kSourceNotFound;
break;
- case IOError::kPermissionDenied:
+ case IOErrors::kPermissionDenied:
err = WorkerErrorCode::kPermissionDenied;
break;
- case IOError::kReadError:
+ case IOErrors::kReadError:
err = WorkerErrorCode::kErrorReadingSource;
break;
- case IOError::kMemoryAllocationError:
+ case IOErrors::kMemoryAllocationError:
err = WorkerErrorCode::kMemoryError;
break;
default:
@@ -43,10 +43,10 @@ WorkerErrorCode FolderDataBroker::Connect() {
return WorkerErrorCode::kSourceAlreadyConnected;
}
- IOError io_err;
+ IOErrors io_err;
filelist_ = io__->FilesInFolder(base_path_, &io_err);
- if (io_err == IOError::kNoError) {
+ if (io_err == IOErrors::kNoError) {
is_connected_ = true;
}
return MapIOError(io_err);
@@ -88,7 +88,7 @@ WorkerErrorCode FolderDataBroker::GetNext(FileInfo* info, FileData* data) {
return WorkerErrorCode::kOK;
}
- IOError ioerr;
+ IOErrors ioerr;
*data = io__->GetDataFromFile(base_path_ + "/" + file_info.relative_path +
(file_info.relative_path.empty() ? "" : "/") +
file_info.base_name, file_info.size, &ioerr);
diff --git a/worker/api/cpp/unittests/test_folder_broker.cpp b/worker/api/cpp/unittests/test_folder_broker.cpp
index 6cc57cef8..20589a2db 100644
--- a/worker/api/cpp/unittests/test_folder_broker.cpp
+++ b/worker/api/cpp/unittests/test_folder_broker.cpp
@@ -11,7 +11,7 @@ using hidra2::DataBroker;
using hidra2::FolderDataBroker;
using hidra2::WorkerErrorCode;
using hidra2::IO;
-using hidra2::IOError;
+using hidra2::IOErrors;
using hidra2::FileInfos;
using hidra2::FileInfo;
using hidra2::FileData;
@@ -37,12 +37,12 @@ TEST(FolderDataBroker, SetCorrectIO) {
class FakeIO: public IO {
public:
- virtual uint8_t* GetDataFromFileProxy(const std::string& fname, uint64_t fsize, IOError* err) const {
- *err = IOError::kNoError;
+ virtual uint8_t* GetDataFromFileProxy(const std::string& fname, uint64_t fsize, IOErrors* err) const {
+ *err = IOErrors::kNoError;
return nullptr;
};
- FileData GetDataFromFile(const std::string& fname, uint64_t fsize, IOError* err) const noexcept override {
+ FileData GetDataFromFile(const std::string& fname, uint64_t fsize, IOErrors* err) const noexcept override {
return FileData(GetDataFromFileProxy(fname, fsize, err));
};
@@ -59,8 +59,8 @@ class FakeIO: public IO {
int64_t write(int __fd, const void* __buf, size_t __n) const noexcept override {
return 0;
};
- FileInfos FilesInFolder(const std::string& folder, IOError* err) const override {
- *err = IOError::kNoError;
+ FileInfos FilesInFolder(const std::string& folder, IOErrors* err) const override {
+ *err = IOErrors::kNoError;
FileInfos file_infos;
FileInfo fi;
fi.size = 100;
@@ -77,32 +77,32 @@ class FakeIO: public IO {
class IOFolderNotFound: public FakeIO {
public:
- FileInfos FilesInFolder(const std::string& folder, IOError* err) const override {
- *err = IOError::kFileNotFound;
+ FileInfos FilesInFolder(const std::string& folder, IOErrors* err) const override {
+ *err = IOErrors::kFileNotFound;
return {};
}
};
class IOFodlerUnknownError: public FakeIO {
public:
- FileInfos FilesInFolder(const std::string& folder, IOError* err) const override {
- *err = IOError::kUnknownError;
+ FileInfos FilesInFolder(const std::string& folder, IOErrors* err) const override {
+ *err = IOErrors::kUnknownError;
return {};
}
};
class IOEmptyFodler: public FakeIO {
public:
- FileInfos FilesInFolder(const std::string& folder, IOError* err) const override {
- *err = IOError::kNoError;
+ FileInfos FilesInFolder(const std::string& folder, IOErrors* err) const override {
+ *err = IOErrors::kNoError;
return {};
}
};
class IOCannotOpenFile: public FakeIO {
public:
- FileData GetDataFromFile(const std::string& fname, uint64_t fsize, IOError* err) const noexcept override {
- *err = IOError::kPermissionDenied;
+ FileData GetDataFromFile(const std::string& fname, uint64_t fsize, IOErrors* err) const noexcept override {
+ *err = IOErrors::kPermissionDenied;
return {};
};
};
@@ -212,7 +212,7 @@ TEST_F(FolderDataBrokerTests, GetNextReturnsErrorWhenFilePermissionsDenied) {
class OpenFileMock : public FakeIO {
public:
- MOCK_CONST_METHOD3(GetDataFromFileProxy, uint8_t* (const std::string&, uint64_t, IOError*));
+ MOCK_CONST_METHOD3(GetDataFromFileProxy, uint8_t* (const std::string&, uint64_t, IOErrors*));
};
@@ -234,7 +234,7 @@ class GetDataFromFileTests : public Test {
TEST_F(GetDataFromFileTests, GetNextCallsGetDataFileWithFileName) {
EXPECT_CALL(mock, GetDataFromFileProxy("/path/to/file/1", _, _)).
- WillOnce(DoAll(testing::SetArgPointee<2>(IOError::kNoError), testing::Return(nullptr)));
+ WillOnce(DoAll(testing::SetArgPointee<2>(IOErrors::kNoError), testing::Return(nullptr)));
data_broker->GetNext(&fi, &data);
}
@@ -243,7 +243,7 @@ TEST_F(GetDataFromFileTests, GetNextCallsGetDataFileWithFileName) {
TEST_F(GetDataFromFileTests, GetNextReturnsDataAndInfo) {
EXPECT_CALL(mock, GetDataFromFileProxy(_, _, _)).
- WillOnce(DoAll(testing::SetArgPointee<2>(IOError::kNoError), testing::Return(new uint8_t[1] {'1'})));
+ WillOnce(DoAll(testing::SetArgPointee<2>(IOErrors::kNoError), testing::Return(new uint8_t[1] {'1'})));
data_broker->GetNext(&fi, &data);
@@ -254,7 +254,7 @@ TEST_F(GetDataFromFileTests, GetNextReturnsDataAndInfo) {
TEST_F(GetDataFromFileTests, GetNextReturnsOnlyData) {
EXPECT_CALL(mock, GetDataFromFileProxy(_, _, _)).
- WillOnce(DoAll(testing::SetArgPointee<2>(IOError::kNoError), testing::Return(new uint8_t[1] {'1'})));
+ WillOnce(DoAll(testing::SetArgPointee<2>(IOErrors::kNoError), testing::Return(new uint8_t[1] {'1'})));
data_broker->GetNext(nullptr, &data);
@@ -264,7 +264,7 @@ TEST_F(GetDataFromFileTests, GetNextReturnsOnlyData) {
TEST_F(GetDataFromFileTests, GetNextReturnsErrorWhenCannotReadData) {
EXPECT_CALL(mock, GetDataFromFileProxy(_, _, _)).
- WillOnce(DoAll(testing::SetArgPointee<2>(IOError::kReadError), testing::Return(nullptr)));
+ WillOnce(DoAll(testing::SetArgPointee<2>(IOErrors::kReadError), testing::Return(nullptr)));
auto err = data_broker->GetNext(&fi, &data);
@@ -273,7 +273,7 @@ TEST_F(GetDataFromFileTests, GetNextReturnsErrorWhenCannotReadData) {
TEST_F(GetDataFromFileTests, GetNextReturnsErrorWhenCannotAllocateData) {
EXPECT_CALL(mock, GetDataFromFileProxy(_, _, _)).
- WillOnce(DoAll(testing::SetArgPointee<2>(IOError::kMemoryAllocationError), testing::Return(nullptr)));
+ WillOnce(DoAll(testing::SetArgPointee<2>(IOErrors::kMemoryAllocationError), testing::Return(nullptr)));
auto err = data_broker->GetNext(&fi, &data);
diff --git a/worker/tools/folder_to_db/src/folder_db_importer.cpp b/worker/tools/folder_to_db/src/folder_db_importer.cpp
index f7b5f1027..27cdab1e3 100644
--- a/worker/tools/folder_to_db/src/folder_db_importer.cpp
+++ b/worker/tools/folder_to_db/src/folder_db_importer.cpp
@@ -12,10 +12,10 @@ namespace hidra2 {
using std::chrono::high_resolution_clock;
-FolderToDbImportError MapIOError(IOError io_err) {
+FolderToDbImportError MapIOError(IOErrors io_err) {
FolderToDbImportError err;
switch (io_err) {
- case IOError::kNoError:
+ case IOErrors::kNoError:
err = FolderToDbImportError::kOK;
break;
default:
@@ -145,7 +145,7 @@ FolderToDbImportError FolderToDbImporter::ImportFilelist(const FileInfos& file_l
FileInfos FolderToDbImporter::GetFilesInFolder(const std::string& folder, FolderToDbImportError* err) const {
- IOError err_io;
+ IOErrors err_io;
auto file_list = io__->FilesInFolder(folder, &err_io);
*err = MapIOError(err_io);
return file_list;
diff --git a/worker/tools/folder_to_db/unittests/test_folder_to_db.cpp b/worker/tools/folder_to_db/unittests/test_folder_to_db.cpp
index a27abc2ff..2a25c9274 100644
--- a/worker/tools/folder_to_db/unittests/test_folder_to_db.cpp
+++ b/worker/tools/folder_to_db/unittests/test_folder_to_db.cpp
@@ -32,7 +32,7 @@ using hidra2::Database;
using hidra2::DatabaseFactory;
using hidra2::IO;
using hidra2::DBError;
-using hidra2::IOError;
+using hidra2::IOErrors;
using hidra2::kDBName;
using hidra2::FileInfos;
using hidra2::FileInfo;
@@ -141,7 +141,7 @@ class FolderDBConverterTests : public Test {
folder = "folder";
uri = "db_address";
ON_CALL(mock_io, FilesInFolder(_, _)).
- WillByDefault(DoAll(testing::SetArgPointee<1>(IOError::kNoError),
+ WillByDefault(DoAll(testing::SetArgPointee<1>(IOErrors::kNoError),
testing::Return(file_infos)));
}
void TearDown() override {
@@ -182,7 +182,7 @@ TEST_F(FolderDBConverterTests, ErrorWhenCannotGetFileList) {
EXPECT_CALL(mock_io, FilesInFolder(folder, _)).
- WillOnce(DoAll(testing::SetArgPointee<1>(IOError::kReadError),
+ WillOnce(DoAll(testing::SetArgPointee<1>(IOErrors::kReadError),
testing::Return(FileInfos {})));
auto error = converter.Convert(uri, folder);
--
GitLab