From cd8dab491d3f78124be800252186a32a90c884b8 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Tue, 15 Jan 2019 19:57:38 -0800 Subject: stop installing manager header Stop installing the manager header as it is no longer meant to be exported, but rather used only internally within this repository. Change-Id: I2ab21a31fd745e1b3e36fc39ffea5e26d373ff51 Signed-off-by: Patrick Venture --- test/blob_mock.hpp | 29 ++++++++++++++++++++++ test/ipmi_close_unittest.cpp | 2 +- test/ipmi_commit_unittest.cpp | 2 +- test/ipmi_delete_unittest.cpp | 2 +- test/ipmi_enumerate_unittest.cpp | 2 +- test/ipmi_getcount_unittest.cpp | 2 +- test/ipmi_open_unittest.cpp | 2 +- test/ipmi_read_unittest.cpp | 2 +- test/ipmi_sessionstat_unittest.cpp | 2 +- test/ipmi_stat_unittest.cpp | 2 +- test/ipmi_validate_unittest.cpp | 2 +- test/ipmi_write_unittest.cpp | 2 +- test/ipmi_writemeta_unittest.cpp | 2 +- test/manager_close_unittest.cpp | 4 ++-- test/manager_commit_unittest.cpp | 5 ++-- test/manager_delete_unittest.cpp | 4 ++-- test/manager_getsession_unittest.cpp | 2 +- test/manager_mock.hpp | 45 +++++++++++++++++++++++++++++++++++ test/manager_open_unittest.cpp | 5 ++-- test/manager_read_unittest.cpp | 5 ++-- test/manager_sessionstat_unittest.cpp | 4 ++-- test/manager_stat_unittest.cpp | 4 ++-- test/manager_unittest.cpp | 5 ++-- test/manager_write_unittest.cpp | 4 ++-- test/manager_writemeta_unittest.cpp | 4 ++-- test/process_unittest.cpp | 2 +- test/utils_unittest.cpp | 4 ++-- 27 files changed, 114 insertions(+), 36 deletions(-) create mode 100644 test/blob_mock.hpp create mode 100644 test/manager_mock.hpp (limited to 'test') diff --git a/test/blob_mock.hpp b/test/blob_mock.hpp new file mode 100644 index 0000000..b70d3d1 --- /dev/null +++ b/test/blob_mock.hpp @@ -0,0 +1,29 @@ +#pragma once + +#include + +#include + +namespace blobs +{ + +class BlobMock : public GenericBlobInterface +{ + public: + virtual ~BlobMock() = default; + + MOCK_METHOD1(canHandleBlob, bool(const std::string&)); + MOCK_METHOD0(getBlobIds, std::vector()); + MOCK_METHOD1(deleteBlob, bool(const std::string&)); + MOCK_METHOD2(stat, bool(const std::string&, struct BlobMeta*)); + MOCK_METHOD3(open, bool(uint16_t, uint16_t, const std::string&)); + MOCK_METHOD3(read, std::vector(uint16_t, uint32_t, uint32_t)); + MOCK_METHOD3(write, bool(uint16_t, uint32_t, const std::vector&)); + MOCK_METHOD3(writeMeta, + bool(uint16_t, uint32_t, const std::vector&)); + MOCK_METHOD2(commit, bool(uint16_t, const std::vector&)); + MOCK_METHOD1(close, bool(uint16_t)); + MOCK_METHOD2(stat, bool(uint16_t, struct BlobMeta*)); + MOCK_METHOD1(expire, bool(uint16_t)); +}; +} // namespace blobs diff --git a/test/ipmi_close_unittest.cpp b/test/ipmi_close_unittest.cpp index edfddca..2fa22b2 100644 --- a/test/ipmi_close_unittest.cpp +++ b/test/ipmi_close_unittest.cpp @@ -1,6 +1,6 @@ #include "ipmi.hpp" +#include "manager_mock.hpp" -#include #include #include diff --git a/test/ipmi_commit_unittest.cpp b/test/ipmi_commit_unittest.cpp index 30f78bf..85bd8f3 100644 --- a/test/ipmi_commit_unittest.cpp +++ b/test/ipmi_commit_unittest.cpp @@ -1,6 +1,6 @@ #include "ipmi.hpp" +#include "manager_mock.hpp" -#include #include #include diff --git a/test/ipmi_delete_unittest.cpp b/test/ipmi_delete_unittest.cpp index 6985eb1..9145fe3 100644 --- a/test/ipmi_delete_unittest.cpp +++ b/test/ipmi_delete_unittest.cpp @@ -1,6 +1,6 @@ #include "ipmi.hpp" +#include "manager_mock.hpp" -#include #include #include diff --git a/test/ipmi_enumerate_unittest.cpp b/test/ipmi_enumerate_unittest.cpp index 184c686..3be56ba 100644 --- a/test/ipmi_enumerate_unittest.cpp +++ b/test/ipmi_enumerate_unittest.cpp @@ -1,6 +1,6 @@ #include "ipmi.hpp" +#include "manager_mock.hpp" -#include #include #include diff --git a/test/ipmi_getcount_unittest.cpp b/test/ipmi_getcount_unittest.cpp index 267ae43..c6d74e6 100644 --- a/test/ipmi_getcount_unittest.cpp +++ b/test/ipmi_getcount_unittest.cpp @@ -1,6 +1,6 @@ #include "ipmi.hpp" +#include "manager_mock.hpp" -#include #include #include diff --git a/test/ipmi_open_unittest.cpp b/test/ipmi_open_unittest.cpp index 704c144..9079df0 100644 --- a/test/ipmi_open_unittest.cpp +++ b/test/ipmi_open_unittest.cpp @@ -1,6 +1,6 @@ #include "ipmi.hpp" +#include "manager_mock.hpp" -#include #include #include diff --git a/test/ipmi_read_unittest.cpp b/test/ipmi_read_unittest.cpp index ef36646..b6dab55 100644 --- a/test/ipmi_read_unittest.cpp +++ b/test/ipmi_read_unittest.cpp @@ -1,6 +1,6 @@ #include "ipmi.hpp" +#include "manager_mock.hpp" -#include #include #include diff --git a/test/ipmi_sessionstat_unittest.cpp b/test/ipmi_sessionstat_unittest.cpp index a71252c..1e4005e 100644 --- a/test/ipmi_sessionstat_unittest.cpp +++ b/test/ipmi_sessionstat_unittest.cpp @@ -1,6 +1,6 @@ #include "ipmi.hpp" +#include "manager_mock.hpp" -#include #include #include diff --git a/test/ipmi_stat_unittest.cpp b/test/ipmi_stat_unittest.cpp index e7ff277..cbff23d 100644 --- a/test/ipmi_stat_unittest.cpp +++ b/test/ipmi_stat_unittest.cpp @@ -1,6 +1,6 @@ #include "ipmi.hpp" +#include "manager_mock.hpp" -#include #include #include diff --git a/test/ipmi_validate_unittest.cpp b/test/ipmi_validate_unittest.cpp index 5a1cbfe..6bf4200 100644 --- a/test/ipmi_validate_unittest.cpp +++ b/test/ipmi_validate_unittest.cpp @@ -1,6 +1,6 @@ #include "ipmi.hpp" +#include "manager_mock.hpp" -#include #include #include diff --git a/test/ipmi_write_unittest.cpp b/test/ipmi_write_unittest.cpp index 99615af..a42e266 100644 --- a/test/ipmi_write_unittest.cpp +++ b/test/ipmi_write_unittest.cpp @@ -1,6 +1,6 @@ #include "ipmi.hpp" +#include "manager_mock.hpp" -#include #include #include diff --git a/test/ipmi_writemeta_unittest.cpp b/test/ipmi_writemeta_unittest.cpp index 2d63452..3542b23 100644 --- a/test/ipmi_writemeta_unittest.cpp +++ b/test/ipmi_writemeta_unittest.cpp @@ -1,6 +1,6 @@ #include "ipmi.hpp" +#include "manager_mock.hpp" -#include #include #include diff --git a/test/manager_close_unittest.cpp b/test/manager_close_unittest.cpp index 02b5dfe..47c9264 100644 --- a/test/manager_close_unittest.cpp +++ b/test/manager_close_unittest.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "blob_mock.hpp" +#include "manager.hpp" #include diff --git a/test/manager_commit_unittest.cpp b/test/manager_commit_unittest.cpp index 48e6b67..b1b3c8c 100644 --- a/test/manager_commit_unittest.cpp +++ b/test/manager_commit_unittest.cpp @@ -1,5 +1,6 @@ -#include -#include +#include "blob_mock.hpp" +#include "manager.hpp" + #include #include diff --git a/test/manager_delete_unittest.cpp b/test/manager_delete_unittest.cpp index e35355d..9ad3afd 100644 --- a/test/manager_delete_unittest.cpp +++ b/test/manager_delete_unittest.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "blob_mock.hpp" +#include "manager.hpp" #include diff --git a/test/manager_getsession_unittest.cpp b/test/manager_getsession_unittest.cpp index 2022146..e66729a 100644 --- a/test/manager_getsession_unittest.cpp +++ b/test/manager_getsession_unittest.cpp @@ -1,4 +1,4 @@ -#include +#include "manager.hpp" #include diff --git a/test/manager_mock.hpp b/test/manager_mock.hpp new file mode 100644 index 0000000..73d4d07 --- /dev/null +++ b/test/manager_mock.hpp @@ -0,0 +1,45 @@ +#pragma once + +#include "manager.hpp" + +#include +#include +#include + +#include + +namespace blobs +{ + +class ManagerMock : public ManagerInterface +{ + public: + virtual ~ManagerMock() = default; + + MOCK_METHOD1(registerHandler, bool(std::unique_ptr)); + MOCK_METHOD0(buildBlobList, uint32_t()); + MOCK_METHOD1(getBlobId, std::string(uint32_t)); + MOCK_METHOD3(open, bool(uint16_t, const std::string&, uint16_t*)); + MOCK_METHOD2(stat, bool(const std::string&, struct BlobMeta*)); + MOCK_METHOD2(stat, bool(uint16_t, struct BlobMeta*)); + MOCK_METHOD2(commit, bool(uint16_t, const std::vector&)); + MOCK_METHOD1(close, bool(uint16_t)); + MOCK_METHOD3(read, std::vector(uint16_t, uint32_t, uint32_t)); + MOCK_METHOD3(write, bool(uint16_t, uint32_t, const std::vector&)); + MOCK_METHOD1(deleteBlob, bool(const std::string&)); + MOCK_METHOD3(writeMeta, + bool(uint16_t, uint32_t, const std::vector&)); +}; + +/* + * Provide a one-off implementation for now. + * To test this, set managerReturned as you need. + */ +ManagerInterface* managerReturned; + +ManagerInterface* getBlobManager() +{ + return managerReturned; +} + +} // namespace blobs diff --git a/test/manager_open_unittest.cpp b/test/manager_open_unittest.cpp index 72aff85..309d3f6 100644 --- a/test/manager_open_unittest.cpp +++ b/test/manager_open_unittest.cpp @@ -1,5 +1,6 @@ -#include -#include +#include "blob_mock.hpp" +#include "manager.hpp" + #include #include diff --git a/test/manager_read_unittest.cpp b/test/manager_read_unittest.cpp index 23df9d4..1d40f5d 100644 --- a/test/manager_read_unittest.cpp +++ b/test/manager_read_unittest.cpp @@ -1,5 +1,6 @@ -#include -#include +#include "blob_mock.hpp" +#include "manager.hpp" + #include #include diff --git a/test/manager_sessionstat_unittest.cpp b/test/manager_sessionstat_unittest.cpp index 019d95b..6ae27d3 100644 --- a/test/manager_sessionstat_unittest.cpp +++ b/test/manager_sessionstat_unittest.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "blob_mock.hpp" +#include "manager.hpp" #include diff --git a/test/manager_stat_unittest.cpp b/test/manager_stat_unittest.cpp index 0ae7822..a13a66d 100644 --- a/test/manager_stat_unittest.cpp +++ b/test/manager_stat_unittest.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "blob_mock.hpp" +#include "manager.hpp" #include diff --git a/test/manager_unittest.cpp b/test/manager_unittest.cpp index a4c7a8c..7d4d49e 100644 --- a/test/manager_unittest.cpp +++ b/test/manager_unittest.cpp @@ -1,6 +1,7 @@ +#include "blob_mock.hpp" +#include "manager.hpp" + #include -#include -#include #include #include diff --git a/test/manager_write_unittest.cpp b/test/manager_write_unittest.cpp index 84b3400..33c6d5a 100644 --- a/test/manager_write_unittest.cpp +++ b/test/manager_write_unittest.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "blob_mock.hpp" +#include "manager.hpp" #include diff --git a/test/manager_writemeta_unittest.cpp b/test/manager_writemeta_unittest.cpp index e83c904..919d259 100644 --- a/test/manager_writemeta_unittest.cpp +++ b/test/manager_writemeta_unittest.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "blob_mock.hpp" +#include "manager.hpp" #include diff --git a/test/process_unittest.cpp b/test/process_unittest.cpp index 0f683e5..bd1f886 100644 --- a/test/process_unittest.cpp +++ b/test/process_unittest.cpp @@ -1,9 +1,9 @@ #include "crc.hpp" #include "crc_mock.hpp" #include "ipmi.hpp" +#include "manager_mock.hpp" #include "process.hpp" -#include #include #include diff --git a/test/utils_unittest.cpp b/test/utils_unittest.cpp index 8a0cdca..b986bd8 100644 --- a/test/utils_unittest.cpp +++ b/test/utils_unittest.cpp @@ -1,9 +1,9 @@ +#include "blob_mock.hpp" #include "dlsys_mock.hpp" #include "fs.hpp" +#include "manager_mock.hpp" #include "utils.hpp" -#include -#include #include #include #include -- cgit v1.2.3