diff --git a/implementations/inmemory/InMemoryBlock.cpp b/implementations/inmemory/InMemoryBlock.cpp index 78e4b22d..f86ecac8 100644 --- a/implementations/inmemory/InMemoryBlock.cpp +++ b/implementations/inmemory/InMemoryBlock.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "InMemoryBlock.h" +#include "InMemoryBlockStore.h" #include using std::unique_ptr; diff --git a/implementations/inmemory/InMemoryBlock.h b/implementations/inmemory/InMemoryBlock.h index bc805401..4790c08d 100644 --- a/implementations/inmemory/InMemoryBlock.h +++ b/implementations/inmemory/InMemoryBlock.h @@ -2,8 +2,8 @@ #ifndef BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCK_H_ #define BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCK_H_ -#include -#include +#include "../../interface/Block.h" +#include "../../utils/Data.h" namespace blockstore { namespace inmemory { diff --git a/implementations/inmemory/InMemoryBlockStore.cpp b/implementations/inmemory/InMemoryBlockStore.cpp index 439a4636..650283ca 100644 --- a/implementations/inmemory/InMemoryBlockStore.cpp +++ b/implementations/inmemory/InMemoryBlockStore.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "InMemoryBlock.h" +#include "InMemoryBlockStore.h" #include using std::unique_ptr; diff --git a/implementations/inmemory/InMemoryBlockStore.h b/implementations/inmemory/InMemoryBlockStore.h index 1913c725..f73c7686 100644 --- a/implementations/inmemory/InMemoryBlockStore.h +++ b/implementations/inmemory/InMemoryBlockStore.h @@ -2,7 +2,7 @@ #ifndef BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCKSTORE_H_ #define BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCKSTORE_H_ -#include +#include "../../interface/helpers/BlockStoreWithRandomKeys.h" #include #include diff --git a/implementations/ondisk/FileAlreadyExistsException.cpp b/implementations/ondisk/FileAlreadyExistsException.cpp index 5040ec78..904b138c 100644 --- a/implementations/ondisk/FileAlreadyExistsException.cpp +++ b/implementations/ondisk/FileAlreadyExistsException.cpp @@ -1,4 +1,4 @@ -#include +#include "FileAlreadyExistsException.h" namespace bf = boost::filesystem; diff --git a/implementations/ondisk/OnDiskBlock.cpp b/implementations/ondisk/OnDiskBlock.cpp index 64947717..277a3a36 100644 --- a/implementations/ondisk/OnDiskBlock.cpp +++ b/implementations/ondisk/OnDiskBlock.cpp @@ -1,10 +1,10 @@ #include #include #include -#include -#include -#include -#include +#include "FileAlreadyExistsException.h" +#include "OnDiskBlock.h" +#include "OnDiskBlockStore.h" +#include "../../utils/FileDoesntExistException.h" using std::unique_ptr; using std::make_unique; diff --git a/implementations/ondisk/OnDiskBlock.h b/implementations/ondisk/OnDiskBlock.h index 101d0215..00573873 100644 --- a/implementations/ondisk/OnDiskBlock.h +++ b/implementations/ondisk/OnDiskBlock.h @@ -3,8 +3,8 @@ #define BLOCKSTORE_IMPLEMENTATIONS_ONDISK_ONDISKBLOCK_H_ #include -#include -#include +#include "../../interface/Block.h" +#include "../../utils/Data.h" #include #include "messmer/cpp-utils/macros.h" diff --git a/implementations/ondisk/OnDiskBlockStore.cpp b/implementations/ondisk/OnDiskBlockStore.cpp index 0f45b082..6dbbdbd2 100644 --- a/implementations/ondisk/OnDiskBlockStore.cpp +++ b/implementations/ondisk/OnDiskBlockStore.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "OnDiskBlock.h" +#include "OnDiskBlockStore.h" using std::unique_ptr; using std::make_unique; diff --git a/implementations/ondisk/OnDiskBlockStore.h b/implementations/ondisk/OnDiskBlockStore.h index 3f0fc92d..0b774ffa 100644 --- a/implementations/ondisk/OnDiskBlockStore.h +++ b/implementations/ondisk/OnDiskBlockStore.h @@ -3,7 +3,7 @@ #define BLOCKSTORE_IMPLEMENTATIONS_ONDISK_ONDISKBLOCKSTORE_H_ #include -#include +#include "../../interface/helpers/BlockStoreWithRandomKeys.h" #include "messmer/cpp-utils/macros.h" diff --git a/implementations/testfake/FakeBlock.cpp b/implementations/testfake/FakeBlock.cpp index 6bdc37f3..5f1285e8 100644 --- a/implementations/testfake/FakeBlock.cpp +++ b/implementations/testfake/FakeBlock.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "FakeBlock.h" +#include "FakeBlockStore.h" #include using std::unique_ptr; diff --git a/implementations/testfake/FakeBlock.h b/implementations/testfake/FakeBlock.h index 04842a12..c667b5a6 100644 --- a/implementations/testfake/FakeBlock.h +++ b/implementations/testfake/FakeBlock.h @@ -2,7 +2,7 @@ #ifndef BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCK_H_ #define BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCK_H_ -#include +#include "../../interface/Block.h" #include "../../utils/Data.h" #include "messmer/cpp-utils/macros.h" diff --git a/implementations/testfake/FakeBlockStore.cpp b/implementations/testfake/FakeBlockStore.cpp index e15e9d7a..d10be72f 100644 --- a/implementations/testfake/FakeBlockStore.cpp +++ b/implementations/testfake/FakeBlockStore.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "FakeBlock.h" +#include "FakeBlockStore.h" using std::unique_ptr; using std::make_unique; diff --git a/implementations/testfake/FakeBlockStore.h b/implementations/testfake/FakeBlockStore.h index e59b6cbf..bef47ed9 100644 --- a/implementations/testfake/FakeBlockStore.h +++ b/implementations/testfake/FakeBlockStore.h @@ -2,7 +2,7 @@ #ifndef BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCKSTORE_H_ #define BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCKSTORE_H_ -#include +#include "../../interface/helpers/BlockStoreWithRandomKeys.h" #include "../../utils/Data.h" #include "messmer/cpp-utils/macros.h" diff --git a/interface/Block.h b/interface/Block.h index 8ffe1224..031d7a67 100644 --- a/interface/Block.h +++ b/interface/Block.h @@ -2,7 +2,7 @@ #ifndef BLOCKSTORE_INTERFACE_BLOCK_H_ #define BLOCKSTORE_INTERFACE_BLOCK_H_ -#include +#include "../utils/Key.h" #include namespace blockstore { diff --git a/interface/BlockStore.h b/interface/BlockStore.h index 3ba6007a..b81a99cd 100644 --- a/interface/BlockStore.h +++ b/interface/BlockStore.h @@ -2,7 +2,7 @@ #ifndef FSPP_BLOCKSTORE_BLOCKSTORE_H_ #define FSPP_BLOCKSTORE_BLOCKSTORE_H_ -#include +#include "Block.h" #include #include diff --git a/interface/helpers/BlockStoreWithRandomKeys.cpp b/interface/helpers/BlockStoreWithRandomKeys.cpp index d056bcd5..14fa6a19 100644 --- a/interface/helpers/BlockStoreWithRandomKeys.cpp +++ b/interface/helpers/BlockStoreWithRandomKeys.cpp @@ -1,4 +1,4 @@ -#include +#include "BlockStoreWithRandomKeys.h" using namespace blockstore; diff --git a/interface/helpers/BlockStoreWithRandomKeys.h b/interface/helpers/BlockStoreWithRandomKeys.h index 9e414aec..e781ed0c 100644 --- a/interface/helpers/BlockStoreWithRandomKeys.h +++ b/interface/helpers/BlockStoreWithRandomKeys.h @@ -2,7 +2,7 @@ #ifndef FSPP_BLOCKSTORE_BLOCKSTOREWITHRANDOMKEYS_H_ #define FSPP_BLOCKSTORE_BLOCKSTOREWITHRANDOMKEYS_H_ -#include +#include "../BlockStore.h" #include "../Block.h" namespace blockstore { diff --git a/test/implementations/inmemory/InMemoryBlockStoreTest.cpp b/test/implementations/inmemory/InMemoryBlockStoreTest.cpp index 0d6e8db8..8cf12258 100644 --- a/test/implementations/inmemory/InMemoryBlockStoreTest.cpp +++ b/test/implementations/inmemory/InMemoryBlockStoreTest.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "../../../implementations/inmemory/InMemoryBlock.h" +#include "../../../implementations/inmemory/InMemoryBlockStore.h" +#include "../../testutils/BlockStoreTest.h" +#include "../../testutils/BlockStoreWithRandomKeysTest.h" #include "google/gtest/gtest.h" diff --git a/test/implementations/ondisk/OnDiskBlockStoreTest.cpp b/test/implementations/ondisk/OnDiskBlockStoreTest.cpp index 48343f9d..1ee64b0e 100644 --- a/test/implementations/ondisk/OnDiskBlockStoreTest.cpp +++ b/test/implementations/ondisk/OnDiskBlockStoreTest.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "../../../implementations/ondisk/OnDiskBlock.h" +#include "../../../implementations/ondisk/OnDiskBlockStore.h" +#include "../../testutils/BlockStoreTest.h" +#include "../../testutils/BlockStoreWithRandomKeysTest.h" #include "google/gtest/gtest.h" #include "messmer/tempfile/src/TempDir.h" diff --git a/test/implementations/ondisk/OnDiskBlockTest/OnDiskBlockCreateTest.cpp b/test/implementations/ondisk/OnDiskBlockTest/OnDiskBlockCreateTest.cpp index b6a69b5a..5ff681a6 100644 --- a/test/implementations/ondisk/OnDiskBlockTest/OnDiskBlockCreateTest.cpp +++ b/test/implementations/ondisk/OnDiskBlockTest/OnDiskBlockCreateTest.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "../../../../implementations/ondisk/FileAlreadyExistsException.h" +#include "../../../../implementations/ondisk/OnDiskBlock.h" #include "google/gtest/gtest.h" #include "messmer/tempfile/src/TempFile.h" diff --git a/test/implementations/ondisk/OnDiskBlockTest/OnDiskBlockFlushTest.cpp b/test/implementations/ondisk/OnDiskBlockTest/OnDiskBlockFlushTest.cpp index d2641e7d..d11b0936 100644 --- a/test/implementations/ondisk/OnDiskBlockTest/OnDiskBlockFlushTest.cpp +++ b/test/implementations/ondisk/OnDiskBlockTest/OnDiskBlockFlushTest.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "../../../../implementations/ondisk/FileAlreadyExistsException.h" +#include "../../../../implementations/ondisk/OnDiskBlock.h" +#include "../../../testutils/DataBlockFixture.h" #include "google/gtest/gtest.h" #include "messmer/tempfile/src/TempFile.h" diff --git a/test/implementations/ondisk/OnDiskBlockTest/OnDiskBlockLoadTest.cpp b/test/implementations/ondisk/OnDiskBlockTest/OnDiskBlockLoadTest.cpp index a97c905b..8a32794b 100644 --- a/test/implementations/ondisk/OnDiskBlockTest/OnDiskBlockLoadTest.cpp +++ b/test/implementations/ondisk/OnDiskBlockTest/OnDiskBlockLoadTest.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "../../../../implementations/ondisk/OnDiskBlock.h" +#include "../../../testutils/DataBlockFixture.h" +#include "../../../../utils/FileDoesntExistException.h" #include "google/gtest/gtest.h" #include "../../../../utils/Data.h" diff --git a/test/implementations/testfake/TestFakeBlockStoreTest.cpp b/test/implementations/testfake/TestFakeBlockStoreTest.cpp index c160e75c..f671bed5 100644 --- a/test/implementations/testfake/TestFakeBlockStoreTest.cpp +++ b/test/implementations/testfake/TestFakeBlockStoreTest.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "../../../implementations/testfake/FakeBlock.h" +#include "../../../implementations/testfake/FakeBlockStore.h" +#include "../../testutils/BlockStoreTest.h" +#include "../../testutils/BlockStoreWithRandomKeysTest.h" #include "google/gtest/gtest.h" diff --git a/test/interface/BlockStoreTest.cpp b/test/interface/BlockStoreTest.cpp index fd069e97..c452c306 100644 --- a/test/interface/BlockStoreTest.cpp +++ b/test/interface/BlockStoreTest.cpp @@ -1,4 +1,4 @@ /* * Tests that the header can be included without needing additional header includes as dependencies. */ -#include +#include "../../interface/BlockStore.h" diff --git a/test/interface/BlockTest.cpp b/test/interface/BlockTest.cpp index 8a546609..a2d0f322 100644 --- a/test/interface/BlockTest.cpp +++ b/test/interface/BlockTest.cpp @@ -1,4 +1,4 @@ /* * Tests that the header can be included without needing additional header includes as dependencies. */ -#include +#include "../../interface/Block.h" diff --git a/test/interface/helpers/BlockStoreWithRandomKeysTest.cpp b/test/interface/helpers/BlockStoreWithRandomKeysTest.cpp index f4cffc89..5e7a5c76 100644 --- a/test/interface/helpers/BlockStoreWithRandomKeysTest.cpp +++ b/test/interface/helpers/BlockStoreWithRandomKeysTest.cpp @@ -1,4 +1,4 @@ -#include +#include "../../../interface/helpers/BlockStoreWithRandomKeys.h" #include "google/gtest/gtest.h" #include "google/gmock/gmock.h" diff --git a/test/testutils/BlockStoreWithRandomKeysTest.h b/test/testutils/BlockStoreWithRandomKeysTest.h index 23301aaf..a69c8a74 100644 --- a/test/testutils/BlockStoreWithRandomKeysTest.h +++ b/test/testutils/BlockStoreWithRandomKeysTest.h @@ -3,7 +3,7 @@ #define TEST_BLOCKSTORE_IMPLEMENTATIONS_TESTUTILS_BLOCKSTOREWITHRANDOMKEYSTEST_H_ #include -#include +#include "DataBlockFixture.h" #include "../../interface/BlockStore.h" diff --git a/test/utils/BlockStoreUtilsTest.cpp b/test/utils/BlockStoreUtilsTest.cpp index 83b9d155..d4681854 100644 --- a/test/utils/BlockStoreUtilsTest.cpp +++ b/test/utils/BlockStoreUtilsTest.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "../../implementations/testfake/FakeBlockStore.h" +#include "../testutils/DataBlockFixture.h" +#include "../../utils/BlockStoreUtils.h" #include "google/gtest/gtest.h" #include diff --git a/test/utils/DataTest.cpp b/test/utils/DataTest.cpp index 1c5b4542..d6d75091 100644 --- a/test/utils/DataTest.cpp +++ b/test/utils/DataTest.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "../testutils/DataBlockFixture.h" +#include "../../utils/Data.h" +#include "../../utils/FileDoesntExistException.h" #include "google/gtest/gtest.h" #include "messmer/tempfile/src/TempFile.h" diff --git a/test/utils/KeyTest.cpp b/test/utils/KeyTest.cpp index a5a5f3cc..e54f4157 100644 --- a/test/utils/KeyTest.cpp +++ b/test/utils/KeyTest.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "../testutils/DataBlockFixture.h" +#include "../../utils/Data.h" +#include "../../utils/Key.h" #include "google/gtest/gtest.h" diff --git a/utils/Data.cpp b/utils/Data.cpp index 12ef4907..2750c20f 100644 --- a/utils/Data.cpp +++ b/utils/Data.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "Data.h" +#include "FileDoesntExistException.h" #include #include diff --git a/utils/FileDoesntExistException.cpp b/utils/FileDoesntExistException.cpp index 7cca8312..d8479e6b 100644 --- a/utils/FileDoesntExistException.cpp +++ b/utils/FileDoesntExistException.cpp @@ -1,4 +1,4 @@ -#include +#include "FileDoesntExistException.h" namespace bf = boost::filesystem; diff --git a/utils/Key.cpp b/utils/Key.cpp index 03a024ee..6d636269 100644 --- a/utils/Key.cpp +++ b/utils/Key.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include "Key.h" #include