diff --git a/src/blockstore/implementations/integrity/ClientIdAndBlockId.cpp b/src/blockstore/implementations/integrity/ClientIdAndBlockId.cpp index 11ab813f..82009f93 100644 --- a/src/blockstore/implementations/integrity/ClientIdAndBlockId.cpp +++ b/src/blockstore/implementations/integrity/ClientIdAndBlockId.cpp @@ -1 +1 @@ -#include "ClientIdAndBlockId.h" \ No newline at end of file +#include "ClientIdAndBlockId.h" diff --git a/src/blockstore/implementations/mock/MockBlockStore.cpp b/src/blockstore/implementations/mock/MockBlockStore.cpp index 448b5b50..190c3b88 100644 --- a/src/blockstore/implementations/mock/MockBlockStore.cpp +++ b/src/blockstore/implementations/mock/MockBlockStore.cpp @@ -1 +1 @@ -#include "MockBlockStore.h" \ No newline at end of file +#include "MockBlockStore.h" diff --git a/src/cpp-utils/data/DataUtils.cpp b/src/cpp-utils/data/DataUtils.cpp index 83c2be92..93510b39 100644 --- a/src/cpp-utils/data/DataUtils.cpp +++ b/src/cpp-utils/data/DataUtils.cpp @@ -9,4 +9,4 @@ namespace cpputils { return newData; } } -} \ No newline at end of file +} diff --git a/src/cpp-utils/lock/CombinedLock.h b/src/cpp-utils/lock/CombinedLock.h index 1883032c..79ed6aa1 100644 --- a/src/cpp-utils/lock/CombinedLock.h +++ b/src/cpp-utils/lock/CombinedLock.h @@ -33,4 +33,4 @@ namespace cpputils { }; } -#endif \ No newline at end of file +#endif diff --git a/src/cpp-utils/random/PseudoRandomPool.cpp b/src/cpp-utils/random/PseudoRandomPool.cpp index c7115685..6695acad 100644 --- a/src/cpp-utils/random/PseudoRandomPool.cpp +++ b/src/cpp-utils/random/PseudoRandomPool.cpp @@ -3,4 +3,4 @@ namespace cpputils { constexpr size_t PseudoRandomPool::MIN_BUFFER_SIZE; constexpr size_t PseudoRandomPool::MAX_BUFFER_SIZE; -} \ No newline at end of file +} diff --git a/src/cpp-utils/random/Random.cpp b/src/cpp-utils/random/Random.cpp index 85c98814..4d9cfba3 100644 --- a/src/cpp-utils/random/Random.cpp +++ b/src/cpp-utils/random/Random.cpp @@ -2,4 +2,4 @@ namespace cpputils { std::mutex Random::_mutex; -} \ No newline at end of file +} diff --git a/src/cpp-utils/random/RandomGenerator.cpp b/src/cpp-utils/random/RandomGenerator.cpp index d809d03b..5b2fb367 100644 --- a/src/cpp-utils/random/RandomGenerator.cpp +++ b/src/cpp-utils/random/RandomGenerator.cpp @@ -1 +1 @@ -#include "RandomGenerator.h" \ No newline at end of file +#include "RandomGenerator.h" diff --git a/src/fspp/fs_interface/FuseErrnoException.cpp b/src/fspp/fs_interface/FuseErrnoException.cpp index 96884240..f1144b30 100644 --- a/src/fspp/fs_interface/FuseErrnoException.cpp +++ b/src/fspp/fs_interface/FuseErrnoException.cpp @@ -1 +1 @@ -#include "FuseErrnoException.h" \ No newline at end of file +#include "FuseErrnoException.h" diff --git a/src/fspp/fs_interface/Node.cpp b/src/fspp/fs_interface/Node.cpp index 37456e58..0c2b14d7 100644 --- a/src/fspp/fs_interface/Node.cpp +++ b/src/fspp/fs_interface/Node.cpp @@ -1 +1 @@ -#include "Node.h" \ No newline at end of file +#include "Node.h" diff --git a/src/fspp/fstest/FsTest.h b/src/fspp/fstest/FsTest.h index 43e21c69..b1a3531d 100644 --- a/src/fspp/fstest/FsTest.h +++ b/src/fspp/fstest/FsTest.h @@ -18,24 +18,24 @@ #include "FsppOpenFileTest_Timestamps.h" #define FSPP_ADD_FILESYTEM_TESTS(FS_NAME, FIXTURE) \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, FsppDeviceTest_One, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, FsppDeviceTest_Two, FIXTURE); \ - INSTANTIATE_NODE_TEST_CASE( FS_NAME, FsppDeviceTest_Timestamps, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, FsppDirTest, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, FsppDirTest_Timestamps, FIXTURE); \ - INSTANTIATE_NODE_TEST_CASE( FS_NAME, FsppDirTest_Timestamps_Entries, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, FsppFileTest, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, FsppFileTest_Timestamps, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, FsppSymlinkTest, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, FsppSymlinkTest_Timestamps, FIXTURE); \ - INSTANTIATE_NODE_TEST_CASE( FS_NAME, FsppNodeTest_Rename, FIXTURE); \ - INSTANTIATE_NODE_TEST_CASE( FS_NAME, FsppNodeTest_Stat, FIXTURE); \ - INSTANTIATE_NODE_TEST_CASE( FS_NAME, FsppNodeTest_Timestamps, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, FsppNodeTest_Stat_FileOnly, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, FsppNodeTest_Stat_DirOnly, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, FsppNodeTest_Stat_SymlinkOnly, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, FsppOpenFileTest, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, FsppOpenFileTest_Timestamps, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, FsppDeviceTest_One, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, FsppDeviceTest_Two, FIXTURE); \ + INSTANTIATE_NODE_TEST_SUITE( FS_NAME, FsppDeviceTest_Timestamps, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, FsppDirTest, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, FsppDirTest_Timestamps, FIXTURE); \ + INSTANTIATE_NODE_TEST_SUITE( FS_NAME, FsppDirTest_Timestamps_Entries, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, FsppFileTest, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, FsppFileTest_Timestamps, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, FsppSymlinkTest, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, FsppSymlinkTest_Timestamps, FIXTURE); \ + INSTANTIATE_NODE_TEST_SUITE( FS_NAME, FsppNodeTest_Rename, FIXTURE); \ + INSTANTIATE_NODE_TEST_SUITE( FS_NAME, FsppNodeTest_Stat, FIXTURE); \ + INSTANTIATE_NODE_TEST_SUITE( FS_NAME, FsppNodeTest_Timestamps, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, FsppNodeTest_Stat_FileOnly, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, FsppNodeTest_Stat_DirOnly, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, FsppNodeTest_Stat_SymlinkOnly, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, FsppOpenFileTest, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, FsppOpenFileTest_Timestamps, FIXTURE); \ #endif diff --git a/src/fspp/fstest/FsppDeviceTest.h b/src/fspp/fstest/FsppDeviceTest.h index 11282e19..79de8f10 100644 --- a/src/fspp/fstest/FsppDeviceTest.h +++ b/src/fspp/fstest/FsppDeviceTest.h @@ -22,12 +22,12 @@ public: } }; -//Unfortunately, googletest only allows 50 test cases per REGISTER_TYPED_TEST_CASE_P, so we have to split it. +//Unfortunately, googletest only allows 50 test cases per REGISTER_TYPED_TEST_SUITE_P, so we have to split it. template class FsppDeviceTest_One: public FsppDeviceTest {}; template class FsppDeviceTest_Two: public FsppDeviceTest {}; -TYPED_TEST_CASE_P(FsppDeviceTest_One); -TYPED_TEST_CASE_P(FsppDeviceTest_Two); +TYPED_TEST_SUITE_P(FsppDeviceTest_One); +TYPED_TEST_SUITE_P(FsppDeviceTest_Two); TYPED_TEST_P(FsppDeviceTest_One, InitFilesystem) { //fixture->createDevice() is called in the FileSystemTest constructor @@ -410,7 +410,7 @@ TYPED_TEST_P(FsppDeviceTest_Two, LoadSymlinkFromDir_Nesting2_LoadDir) { //TODO Test statfs -REGISTER_TYPED_TEST_CASE_P(FsppDeviceTest_One, +REGISTER_TYPED_TEST_SUITE_P(FsppDeviceTest_One, InitFilesystem, LoadRootDir_Load, LoadRootDir_LoadDir, @@ -462,7 +462,7 @@ REGISTER_TYPED_TEST_CASE_P(FsppDeviceTest_One, LoadSymlinkFromDir_Nesting1_LoadDir ); -REGISTER_TYPED_TEST_CASE_P(FsppDeviceTest_Two, +REGISTER_TYPED_TEST_SUITE_P(FsppDeviceTest_Two, LoadFileFromDir_Nesting2_Load, LoadFileFromDir_Nesting2_LoadFile, LoadFileFromDir_Nesting2_LoadDir, diff --git a/src/fspp/fstest/FsppDeviceTest_Timestamps.h b/src/fspp/fstest/FsppDeviceTest_Timestamps.h index c03d1c99..f6d68393 100644 --- a/src/fspp/fstest/FsppDeviceTest_Timestamps.h +++ b/src/fspp/fstest/FsppDeviceTest_Timestamps.h @@ -35,7 +35,7 @@ public: } }; -REGISTER_NODE_TEST_CASE(FsppDeviceTest_Timestamps, +REGISTER_NODE_TEST_SUITE(FsppDeviceTest_Timestamps, Load_While_Loaded, Load_While_Not_Loaded ); diff --git a/src/fspp/fstest/FsppDirTest.h b/src/fspp/fstest/FsppDirTest.h index 390d1725..eeb973cb 100644 --- a/src/fspp/fstest/FsppDirTest.h +++ b/src/fspp/fstest/FsppDirTest.h @@ -46,7 +46,7 @@ public: EXPECT_TRUE(false); } }; -TYPED_TEST_CASE_P(FsppDirTest); +TYPED_TEST_SUITE_P(FsppDirTest); inline fspp::Dir::Entry DirEntry(const std::string &name) { return fspp::Dir::Entry(fspp::Dir::EntryType::DIR, name); @@ -267,7 +267,7 @@ TYPED_TEST_P(FsppDirTest, Remove_Nested) { EXPECT_EQ(boost::none, this->device->LoadDir("/mytestdir/mydir")); } -REGISTER_TYPED_TEST_CASE_P(FsppDirTest, +REGISTER_TYPED_TEST_SUITE_P(FsppDirTest, Children_RootDir_Empty, Children_RootDir_OneFile_Directly, Children_RootDir_OneFile_AfterReloadingDir, diff --git a/src/fspp/fstest/FsppDirTest_Timestamps.h b/src/fspp/fstest/FsppDirTest_Timestamps.h index 42a47fb7..67c0e6d1 100644 --- a/src/fspp/fstest/FsppDirTest_Timestamps.h +++ b/src/fspp/fstest/FsppDirTest_Timestamps.h @@ -8,7 +8,7 @@ template class FsppDirTest_Timestamps: public TimestampTestUtils { public: }; -TYPED_TEST_CASE_P(FsppDirTest_Timestamps); +TYPED_TEST_SUITE_P(FsppDirTest_Timestamps); TYPED_TEST_P(FsppDirTest_Timestamps, createAndOpenFile) { auto dir = this->CreateDir("/mydir"); @@ -232,7 +232,7 @@ public: }*/ }; -REGISTER_TYPED_TEST_CASE_P(FsppDirTest_Timestamps, +REGISTER_TYPED_TEST_SUITE_P(FsppDirTest_Timestamps, createAndOpenFile, createAndOpenFile_TimestampsOfCreatedFile, createDir, @@ -243,7 +243,7 @@ REGISTER_TYPED_TEST_CASE_P(FsppDirTest_Timestamps, children_nonempty ); -REGISTER_NODE_TEST_CASE(FsppDirTest_Timestamps_Entries, +REGISTER_NODE_TEST_SUITE(FsppDirTest_Timestamps_Entries, deleteChild, renameChild, moveChildIn, diff --git a/src/fspp/fstest/FsppFileTest.h b/src/fspp/fstest/FsppFileTest.h index 099e19c9..8785c70d 100644 --- a/src/fspp/fstest/FsppFileTest.h +++ b/src/fspp/fstest/FsppFileTest.h @@ -89,7 +89,7 @@ public: } }; -TYPED_TEST_CASE_P(FsppFileTest); +TYPED_TEST_SUITE_P(FsppFileTest); TYPED_TEST_P(FsppFileTest, Open_RDONLY) { this->Test_Open_RDONLY(this->file_root.get()); @@ -214,7 +214,7 @@ TYPED_TEST_P(FsppFileTest, Remove_Nested) { EXPECT_EQ(boost::none, this->device->LoadFile("/mytestdir/myfile")); } -REGISTER_TYPED_TEST_CASE_P(FsppFileTest, +REGISTER_TYPED_TEST_SUITE_P(FsppFileTest, Open_RDONLY, Open_RDONLY_Nested, Open_WRONLY, diff --git a/src/fspp/fstest/FsppFileTest_Timestamps.h b/src/fspp/fstest/FsppFileTest_Timestamps.h index 3746357a..f0488c6a 100644 --- a/src/fspp/fstest/FsppFileTest_Timestamps.h +++ b/src/fspp/fstest/FsppFileTest_Timestamps.h @@ -14,7 +14,7 @@ public: return file; } }; -TYPED_TEST_CASE_P(FsppFileTest_Timestamps); +TYPED_TEST_SUITE_P(FsppFileTest_Timestamps); TYPED_TEST_P(FsppFileTest_Timestamps, open_nomode) { auto file = this->CreateFile("/myfile"); @@ -88,7 +88,7 @@ TYPED_TEST_P(FsppFileTest_Timestamps, truncate_nonempty_to_nonempty_grow) { this->EXPECT_OPERATION_UPDATES_TIMESTAMPS_AS("/myfile", operation, {this->ExpectDoesntUpdateAccessTimestamp, this->ExpectUpdatesModificationTimestamp, this->ExpectUpdatesMetadataTimestamp}); } -REGISTER_TYPED_TEST_CASE_P(FsppFileTest_Timestamps, +REGISTER_TYPED_TEST_SUITE_P(FsppFileTest_Timestamps, open_nomode, open_rdonly, open_wronly, diff --git a/src/fspp/fstest/FsppNodeTest_Rename.h b/src/fspp/fstest/FsppNodeTest_Rename.h index 3c1fcf3e..26d1b476 100644 --- a/src/fspp/fstest/FsppNodeTest_Rename.h +++ b/src/fspp/fstest/FsppNodeTest_Rename.h @@ -210,7 +210,7 @@ public: } }; -REGISTER_NODE_TEST_CASE(FsppNodeTest_Rename, +REGISTER_NODE_TEST_SUITE(FsppNodeTest_Rename, Error_TargetParentDirDoesntExist, Error_TargetParentDirIsFile, Error_RootDir, diff --git a/src/fspp/fstest/FsppNodeTest_Stat.h b/src/fspp/fstest/FsppNodeTest_Stat.h index 811c3267..61721dd8 100644 --- a/src/fspp/fstest/FsppNodeTest_Stat.h +++ b/src/fspp/fstest/FsppNodeTest_Stat.h @@ -21,7 +21,7 @@ public: template class FsppNodeTest_Stat_FileOnly: public FileSystemTest, public FsppNodeTestHelper {}; -TYPED_TEST_CASE_P(FsppNodeTest_Stat_FileOnly); +TYPED_TEST_SUITE_P(FsppNodeTest_Stat_FileOnly); TYPED_TEST_P(FsppNodeTest_Stat_FileOnly, CreatedFileIsEmpty) { this->CreateFile("/myfile"); @@ -41,7 +41,7 @@ TYPED_TEST_P(FsppNodeTest_Stat_FileOnly, FileIsFile) { template class FsppNodeTest_Stat_DirOnly: public FileSystemTest, public FsppNodeTestHelper {}; -TYPED_TEST_CASE_P(FsppNodeTest_Stat_DirOnly); +TYPED_TEST_SUITE_P(FsppNodeTest_Stat_DirOnly); TYPED_TEST_P(FsppNodeTest_Stat_DirOnly, DirIsDir) { this->CreateDir("/mydir"); @@ -55,7 +55,7 @@ TYPED_TEST_P(FsppNodeTest_Stat_DirOnly, DirIsDir) { template class FsppNodeTest_Stat_SymlinkOnly: public FileSystemTest, public FsppNodeTestHelper {}; -TYPED_TEST_CASE_P(FsppNodeTest_Stat_SymlinkOnly); +TYPED_TEST_SUITE_P(FsppNodeTest_Stat_SymlinkOnly); TYPED_TEST_P(FsppNodeTest_Stat_SymlinkOnly, SymlinkIsSymlink) { this->CreateSymlink("/mysymlink"); @@ -65,20 +65,20 @@ TYPED_TEST_P(FsppNodeTest_Stat_SymlinkOnly, SymlinkIsSymlink) { }); } -REGISTER_NODE_TEST_CASE(FsppNodeTest_Stat, +REGISTER_NODE_TEST_SUITE(FsppNodeTest_Stat, Nlink ); -REGISTER_TYPED_TEST_CASE_P(FsppNodeTest_Stat_FileOnly, +REGISTER_TYPED_TEST_SUITE_P(FsppNodeTest_Stat_FileOnly, CreatedFileIsEmpty, FileIsFile ); -REGISTER_TYPED_TEST_CASE_P(FsppNodeTest_Stat_DirOnly, +REGISTER_TYPED_TEST_SUITE_P(FsppNodeTest_Stat_DirOnly, DirIsDir ); -REGISTER_TYPED_TEST_CASE_P(FsppNodeTest_Stat_SymlinkOnly, +REGISTER_TYPED_TEST_SUITE_P(FsppNodeTest_Stat_SymlinkOnly, SymlinkIsSymlink ); diff --git a/src/fspp/fstest/FsppNodeTest_Timestamps.h b/src/fspp/fstest/FsppNodeTest_Timestamps.h index ed820ce2..f21d2d9f 100644 --- a/src/fspp/fstest/FsppNodeTest_Timestamps.h +++ b/src/fspp/fstest/FsppNodeTest_Timestamps.h @@ -349,7 +349,7 @@ public: } }; -REGISTER_NODE_TEST_CASE(FsppNodeTest_Timestamps, +REGISTER_NODE_TEST_SUITE(FsppNodeTest_Timestamps, Create, Stat, Chmod, diff --git a/src/fspp/fstest/FsppOpenFileTest.h b/src/fspp/fstest/FsppOpenFileTest.h index 65ee5122..98950421 100644 --- a/src/fspp/fstest/FsppOpenFileTest.h +++ b/src/fspp/fstest/FsppOpenFileTest.h @@ -29,7 +29,7 @@ public: } }; -TYPED_TEST_CASE_P(FsppOpenFileTest); +TYPED_TEST_SUITE_P(FsppOpenFileTest); TYPED_TEST_P(FsppOpenFileTest, CreatedFileIsEmpty) { auto file = this->CreateFile("/myfile"); @@ -45,7 +45,7 @@ TYPED_TEST_P(FsppOpenFileTest, FileIsFile) { }); } -REGISTER_TYPED_TEST_CASE_P(FsppOpenFileTest, +REGISTER_TYPED_TEST_SUITE_P(FsppOpenFileTest, CreatedFileIsEmpty, FileIsFile ); diff --git a/src/fspp/fstest/FsppOpenFileTest_Timestamps.h b/src/fspp/fstest/FsppOpenFileTest_Timestamps.h index dd4f2d5f..7ade3455 100644 --- a/src/fspp/fstest/FsppOpenFileTest_Timestamps.h +++ b/src/fspp/fstest/FsppOpenFileTest_Timestamps.h @@ -19,7 +19,7 @@ public: return openFile; } }; -TYPED_TEST_CASE_P(FsppOpenFileTest_Timestamps); +TYPED_TEST_SUITE_P(FsppOpenFileTest_Timestamps); TYPED_TEST_P(FsppOpenFileTest_Timestamps, stat) { auto openFile = this->CreateAndOpenFile("/mynode"); @@ -130,7 +130,7 @@ TYPED_TEST_P(FsppOpenFileTest_Timestamps, fdatasync) { this->EXPECT_OPERATION_UPDATES_TIMESTAMPS_AS(*openFile, operation, {this->ExpectDoesntUpdateAnyTimestamps}); } -REGISTER_TYPED_TEST_CASE_P(FsppOpenFileTest_Timestamps, +REGISTER_TYPED_TEST_SUITE_P(FsppOpenFileTest_Timestamps, stat, truncate_empty_to_empty, truncate_empty_to_nonempty, diff --git a/src/fspp/fstest/FsppSymlinkTest.h b/src/fspp/fstest/FsppSymlinkTest.h index 48e61a46..370192e8 100644 --- a/src/fspp/fstest/FsppSymlinkTest.h +++ b/src/fspp/fstest/FsppSymlinkTest.h @@ -11,7 +11,7 @@ class FsppSymlinkTest: public FileSystemTest { public: }; -TYPED_TEST_CASE_P(FsppSymlinkTest); +TYPED_TEST_SUITE_P(FsppSymlinkTest); TYPED_TEST_P(FsppSymlinkTest, Create_AbsolutePath) { this->CreateSymlink("/mysymlink", "/my/symlink/target"); @@ -50,7 +50,7 @@ TYPED_TEST_P(FsppSymlinkTest, Remove_Nested) { EXPECT_EQ(boost::none, this->device->LoadSymlink("/mytestdir/mysymlink")); } -REGISTER_TYPED_TEST_CASE_P(FsppSymlinkTest, +REGISTER_TYPED_TEST_SUITE_P(FsppSymlinkTest, Create_AbsolutePath, Create_RelativePath, Read_AbsolutePath, diff --git a/src/fspp/fstest/FsppSymlinkTest_Timestamps.h b/src/fspp/fstest/FsppSymlinkTest_Timestamps.h index 72dd628b..6796ed00 100644 --- a/src/fspp/fstest/FsppSymlinkTest_Timestamps.h +++ b/src/fspp/fstest/FsppSymlinkTest_Timestamps.h @@ -8,7 +8,7 @@ template class FsppSymlinkTest_Timestamps: public TimestampTestUtils { public: }; -TYPED_TEST_CASE_P(FsppSymlinkTest_Timestamps); +TYPED_TEST_SUITE_P(FsppSymlinkTest_Timestamps); TYPED_TEST_P(FsppSymlinkTest_Timestamps, target) { auto symlink = this->CreateSymlink("/mysymlink"); @@ -19,7 +19,7 @@ TYPED_TEST_P(FsppSymlinkTest_Timestamps, target) { this->EXPECT_OPERATION_UPDATES_TIMESTAMPS_AS("/mysymlink", operation, {this->ExpectUpdatesAccessTimestamp, this->ExpectDoesntUpdateModificationTimestamp, this->ExpectDoesntUpdateMetadataTimestamp}); } -REGISTER_TYPED_TEST_CASE_P(FsppSymlinkTest_Timestamps, +REGISTER_TYPED_TEST_SUITE_P(FsppSymlinkTest_Timestamps, target ); diff --git a/src/fspp/fstest/testutils/FsppNodeTest.h b/src/fspp/fstest/testutils/FsppNodeTest.h index 42f63134..45f48e0d 100644 --- a/src/fspp/fstest/testutils/FsppNodeTest.h +++ b/src/fspp/fstest/testutils/FsppNodeTest.h @@ -25,7 +25,7 @@ public: * Inherit your fixture from this class to write a test case that is run on nodes, i.e. files, directories and symlinks. * You can use this->CreateNode() to create a node and then call fspp::Node functions on it. * Add your test cases as void Test_xxx() functions to your fixture and register/instantiate them using - * REGISTER_NODE_TEST_CASE and INSTANTIATE_NODE_TEST_CASE. + * REGISTER_NODE_TEST_SUITE and INSTANTIATE_NODE_TEST_SUITE. * It will then automatically create a test case for each node type (file, directory, symlink). * See FsppNodeTest_Rename for an example. */ @@ -35,16 +35,16 @@ public: virtual cpputils::unique_ref CreateNode(const boost::filesystem::path &path) = 0; }; -#define _REGISTER_SINGLE_NODE_TEST_CASE(r, Class, Name) \ +#define _REGISTER_SINGLE_NODE_TEST_SUITE(r, Class, Name) \ TYPED_TEST_P(Class, Name) { \ this->BOOST_PP_CAT(Test_,Name)(); \ } \ -#define _REGISTER_NODE_TEST_CASES_FOR_CLASS(Class, ...) \ - BOOST_PP_SEQ_FOR_EACH(_REGISTER_SINGLE_NODE_TEST_CASE, Class, BOOST_PP_VARIADIC_TO_SEQ(__VA_ARGS__)); \ - REGISTER_TYPED_TEST_CASE_P(Class, __VA_ARGS__); \ +#define _REGISTER_NODE_TEST_SUITES_FOR_CLASS(Class, ...) \ + BOOST_PP_SEQ_FOR_EACH(_REGISTER_SINGLE_NODE_TEST_SUITE, Class, BOOST_PP_VARIADIC_TO_SEQ(__VA_ARGS__)); \ + REGISTER_TYPED_TEST_SUITE_P(Class, __VA_ARGS__); \ -#define _REGISTER_FILE_TEST_CASE(Class, ...) \ +#define _REGISTER_FILE_TEST_SUITE(Class, ...) \ template \ class Class##_FileNode: public Class, public virtual FsppNodeTestHelper { \ public: \ @@ -53,10 +53,10 @@ public: return this->Load(path); \ } \ }; \ - TYPED_TEST_CASE_P(Class##_FileNode); \ - _REGISTER_NODE_TEST_CASES_FOR_CLASS(Class##_FileNode, __VA_ARGS__); \ + TYPED_TEST_SUITE_P(Class##_FileNode); \ + _REGISTER_NODE_TEST_SUITES_FOR_CLASS(Class##_FileNode, __VA_ARGS__); \ -#define _REGISTER_DIR_TEST_CASE(Class, ...) \ +#define _REGISTER_DIR_TEST_SUITE(Class, ...) \ template \ class Class##_DirNode: public Class, public virtual FsppNodeTestHelper { \ public: \ @@ -65,10 +65,10 @@ public: return this->Load(path); \ } \ }; \ - TYPED_TEST_CASE_P(Class##_DirNode); \ - _REGISTER_NODE_TEST_CASES_FOR_CLASS(Class##_DirNode, __VA_ARGS__); \ + TYPED_TEST_SUITE_P(Class##_DirNode); \ + _REGISTER_NODE_TEST_SUITES_FOR_CLASS(Class##_DirNode, __VA_ARGS__); \ -#define _REGISTER_SYMLINK_TEST_CASE(Class, ...) \ +#define _REGISTER_SYMLINK_TEST_SUITE(Class, ...) \ template \ class Class##_SymlinkNode: public Class, public virtual FsppNodeTestHelper { \ public: \ @@ -77,17 +77,17 @@ public: return this->Load(path); \ } \ }; \ - TYPED_TEST_CASE_P(Class##_SymlinkNode); \ - _REGISTER_NODE_TEST_CASES_FOR_CLASS(Class##_SymlinkNode, __VA_ARGS__); \ + TYPED_TEST_SUITE_P(Class##_SymlinkNode); \ + _REGISTER_NODE_TEST_SUITES_FOR_CLASS(Class##_SymlinkNode, __VA_ARGS__); \ -#define REGISTER_NODE_TEST_CASE(Class, ...) \ - _REGISTER_FILE_TEST_CASE(Class, __VA_ARGS__); \ - _REGISTER_DIR_TEST_CASE(Class, __VA_ARGS__); \ - _REGISTER_SYMLINK_TEST_CASE(Class, __VA_ARGS__); \ +#define REGISTER_NODE_TEST_SUITE(Class, ...) \ + _REGISTER_FILE_TEST_SUITE(Class, __VA_ARGS__); \ + _REGISTER_DIR_TEST_SUITE(Class, __VA_ARGS__); \ + _REGISTER_SYMLINK_TEST_SUITE(Class, __VA_ARGS__); \ -#define INSTANTIATE_NODE_TEST_CASE(FS_NAME, Class, FIXTURE) \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, Class##_FileNode, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, Class##_DirNode, FIXTURE); \ - INSTANTIATE_TYPED_TEST_CASE_P(FS_NAME, Class##_SymlinkNode, FIXTURE); \ +#define INSTANTIATE_NODE_TEST_SUITE(FS_NAME, Class, FIXTURE) \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, Class##_FileNode, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, Class##_DirNode, FIXTURE); \ + INSTANTIATE_TYPED_TEST_SUITE_P(FS_NAME, Class##_SymlinkNode, FIXTURE); \ #endif diff --git a/src/gitversion/parser.cpp b/src/gitversion/parser.cpp index 5a583fa3..a4120d7d 100644 --- a/src/gitversion/parser.cpp +++ b/src/gitversion/parser.cpp @@ -86,4 +86,4 @@ namespace gitversion { return std::make_tuple(gitCommitId.substr(1), std::stoul(commitsSinceTag)); } -} \ No newline at end of file +} diff --git a/src/parallelaccessstore/ParallelAccessBaseStore.cpp b/src/parallelaccessstore/ParallelAccessBaseStore.cpp index 4e2adb3a..b7950e3f 100644 --- a/src/parallelaccessstore/ParallelAccessBaseStore.cpp +++ b/src/parallelaccessstore/ParallelAccessBaseStore.cpp @@ -1 +1 @@ -#include "ParallelAccessBaseStore.h" \ No newline at end of file +#include "ParallelAccessBaseStore.h" diff --git a/src/parallelaccessstore/ParallelAccessStore.cpp b/src/parallelaccessstore/ParallelAccessStore.cpp index c0eb9401..4f235bba 100644 --- a/src/parallelaccessstore/ParallelAccessStore.cpp +++ b/src/parallelaccessstore/ParallelAccessStore.cpp @@ -1 +1 @@ -#include "ParallelAccessStore.h" \ No newline at end of file +#include "ParallelAccessStore.h" diff --git a/test/blobstore/implementations/onblocks/BlobReadWriteTest.cpp b/test/blobstore/implementations/onblocks/BlobReadWriteTest.cpp index 8539f845..daa3a25d 100644 --- a/test/blobstore/implementations/onblocks/BlobReadWriteTest.cpp +++ b/test/blobstore/implementations/onblocks/BlobReadWriteTest.cpp @@ -182,7 +182,7 @@ public: EXPECT_DATA_READS_AS_OUTSIDE_OF(ZEROES, blob, start, count); } }; -INSTANTIATE_TEST_CASE_P(BlobReadWriteDataTest, BlobReadWriteDataTest, Values( +INSTANTIATE_TEST_SUITE_P(BlobReadWriteDataTest, BlobReadWriteDataTest, Values( //Blob with only one leaf DataRange{BlobReadWriteDataTest::LAYOUT.maxBytesPerLeaf(), 0, BlobReadWriteDataTest::LAYOUT.maxBytesPerLeaf()}, // full size leaf, access beginning to end DataRange{BlobReadWriteDataTest::LAYOUT.maxBytesPerLeaf(), 100, BlobReadWriteDataTest::LAYOUT.maxBytesPerLeaf()-200}, // full size leaf, access middle to middle diff --git a/test/blobstore/implementations/onblocks/datanodestore/DataLeafNodeTest.cpp b/test/blobstore/implementations/onblocks/datanodestore/DataLeafNodeTest.cpp index e6aaf9a6..e17d38d2 100644 --- a/test/blobstore/implementations/onblocks/datanodestore/DataLeafNodeTest.cpp +++ b/test/blobstore/implementations/onblocks/datanodestore/DataLeafNodeTest.cpp @@ -160,7 +160,7 @@ public: return leaf->blockId(); } }; -INSTANTIATE_TEST_CASE_P(DataLeafNodeSizeTest, DataLeafNodeSizeTest, Values(0, 1, 5, 16, 32, 512, DataNodeLayout(DataLeafNodeTest::BLOCKSIZE_BYTES).maxBytesPerLeaf())); +INSTANTIATE_TEST_SUITE_P(DataLeafNodeSizeTest, DataLeafNodeSizeTest, Values(0, 1, 5, 16, 32, 512, DataNodeLayout(DataLeafNodeTest::BLOCKSIZE_BYTES).maxBytesPerLeaf())); TEST_P(DataLeafNodeSizeTest, ResizeNode_ReadSizeImmediately) { leaf->resize(GetParam()); @@ -305,7 +305,7 @@ public: EXPECT_DATA_READS_AS_OUTSIDE_OF(ZEROES, leaf, start, count); } }; -INSTANTIATE_TEST_CASE_P(DataLeafNodeDataTest, DataLeafNodeDataTest, Values( +INSTANTIATE_TEST_SUITE_P(DataLeafNodeDataTest, DataLeafNodeDataTest, Values( DataRange{DataLeafNodeTest::LAYOUT.maxBytesPerLeaf(), 0, DataLeafNodeTest::LAYOUT.maxBytesPerLeaf()}, // full size leaf, access beginning to end DataRange{DataLeafNodeTest::LAYOUT.maxBytesPerLeaf(), 100, DataLeafNodeTest::LAYOUT.maxBytesPerLeaf()-200}, // full size leaf, access middle to middle DataRange{DataLeafNodeTest::LAYOUT.maxBytesPerLeaf(), 0, DataLeafNodeTest::LAYOUT.maxBytesPerLeaf()-100}, // full size leaf, access beginning to middle diff --git a/test/blobstore/implementations/onblocks/datanodestore/DataNodeViewTest.cpp b/test/blobstore/implementations/onblocks/datanodestore/DataNodeViewTest.cpp index 447f2b57..d0a59656 100644 --- a/test/blobstore/implementations/onblocks/datanodestore/DataNodeViewTest.cpp +++ b/test/blobstore/implementations/onblocks/datanodestore/DataNodeViewTest.cpp @@ -31,7 +31,7 @@ public: class DataNodeViewDepthTest: public DataNodeViewTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(DataNodeViewDepthTest, DataNodeViewDepthTest, Values(0, 1, 3, 10, 100)); +INSTANTIATE_TEST_SUITE_P(DataNodeViewDepthTest, DataNodeViewDepthTest, Values(0, 1, 3, 10, 100)); TEST_P(DataNodeViewDepthTest, DepthIsStored) { auto block = blockStore->create(Data(BLOCKSIZE_BYTES)); @@ -46,7 +46,7 @@ TEST_P(DataNodeViewDepthTest, DepthIsStored) { class DataNodeViewSizeTest: public DataNodeViewTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(DataNodeViewSizeTest, DataNodeViewSizeTest, Values(0, 50, 64, 1024, 1024*1024*1024)); +INSTANTIATE_TEST_SUITE_P(DataNodeViewSizeTest, DataNodeViewSizeTest, Values(0, 50, 64, 1024, 1024*1024*1024)); TEST_P(DataNodeViewSizeTest, SizeIsStored) { auto block = blockStore->create(Data(BLOCKSIZE_BYTES)); diff --git a/test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_NumStoredBytes.cpp b/test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_NumStoredBytes.cpp index 12d53621..b6537c5a 100644 --- a/test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_NumStoredBytes.cpp +++ b/test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_NumStoredBytes.cpp @@ -17,9 +17,9 @@ TEST_F(DataTreeTest_NumStoredBytes, CreatedTreeIsEmpty) { } class DataTreeTest_NumStoredBytes_P: public DataTreeTest_NumStoredBytes, public WithParamInterface {}; -INSTANTIATE_TEST_CASE_P(EmptyLastLeaf, DataTreeTest_NumStoredBytes_P, Values(0u)); -INSTANTIATE_TEST_CASE_P(HalfFullLastLeaf, DataTreeTest_NumStoredBytes_P, Values(5u, 10u)); -INSTANTIATE_TEST_CASE_P(FullLastLeaf, DataTreeTest_NumStoredBytes_P, Values(static_cast(DataNodeLayout(DataTreeTest_NumStoredBytes::BLOCKSIZE_BYTES).maxBytesPerLeaf()))); +INSTANTIATE_TEST_SUITE_P(EmptyLastLeaf, DataTreeTest_NumStoredBytes_P, Values(0u)); +INSTANTIATE_TEST_SUITE_P(HalfFullLastLeaf, DataTreeTest_NumStoredBytes_P, Values(5u, 10u)); +INSTANTIATE_TEST_SUITE_P(FullLastLeaf, DataTreeTest_NumStoredBytes_P, Values(static_cast(DataNodeLayout(DataTreeTest_NumStoredBytes::BLOCKSIZE_BYTES).maxBytesPerLeaf()))); //TODO Test numLeaves() and numNodes() also two configurations with same number of bytes but different number of leaves (last leaf has 0 bytes) diff --git a/test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_ResizeByTraversing.cpp b/test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_ResizeByTraversing.cpp index 6503e814..392827f5 100644 --- a/test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_ResizeByTraversing.cpp +++ b/test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_ResizeByTraversing.cpp @@ -135,7 +135,7 @@ public: uint32_t traversalBeginIndex; Data ZEROES; }; -INSTANTIATE_TEST_CASE_P(DataTreeTest_ResizeByTraversing_P, DataTreeTest_ResizeByTraversing_P, +INSTANTIATE_TEST_SUITE_P(DataTreeTest_ResizeByTraversing_P, DataTreeTest_ResizeByTraversing_P, Combine( //Tree we're starting with Values(DataTreeTest_ResizeByTraversing*, uint32_t)>>( diff --git a/test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_ResizeNumBytes.cpp b/test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_ResizeNumBytes.cpp index bd74fe7f..6cae8b88 100644 --- a/test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_ResizeNumBytes.cpp +++ b/test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_ResizeNumBytes.cpp @@ -124,7 +124,7 @@ public: uint64_t newSize; Data ZEROES; }; -INSTANTIATE_TEST_CASE_P(DataTreeTest_ResizeNumBytes_P, DataTreeTest_ResizeNumBytes_P, +INSTANTIATE_TEST_SUITE_P(DataTreeTest_ResizeNumBytes_P, DataTreeTest_ResizeNumBytes_P, Combine( //Tree we're starting with Values(DataTreeTest_ResizeNumBytes*, uint32_t)>>( diff --git a/test/blobstore/implementations/onblocks/utils/IntPowTest.cpp b/test/blobstore/implementations/onblocks/utils/IntPowTest.cpp index 6e925388..c6118209 100644 --- a/test/blobstore/implementations/onblocks/utils/IntPowTest.cpp +++ b/test/blobstore/implementations/onblocks/utils/IntPowTest.cpp @@ -74,4 +74,4 @@ TEST_F(IntPowTest, 64bit) { uint64_t value = UINT64_C(1024)*1024*1024*1024; EXPECT_GT(value, std::numeric_limits::max()); EXPECT_EQ(value*value*value, intPow(value, UINT64_C(3))); -} \ No newline at end of file +} diff --git a/test/blockstore/implementations/caching/CachingBlockStore2Test_Generic.cpp b/test/blockstore/implementations/caching/CachingBlockStore2Test_Generic.cpp index 1d4ec708..70e51a51 100644 --- a/test/blockstore/implementations/caching/CachingBlockStore2Test_Generic.cpp +++ b/test/blockstore/implementations/caching/CachingBlockStore2Test_Generic.cpp @@ -24,7 +24,7 @@ public: } }; -INSTANTIATE_TYPED_TEST_CASE_P(Caching2, BlockStoreTest, CachingBlockStoreTestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(Caching2, BlockStoreTest, CachingBlockStoreTestFixture); class CachingBlockStore2TestFixture: public BlockStore2TestFixture { @@ -34,4 +34,4 @@ public: } }; -INSTANTIATE_TYPED_TEST_CASE_P(Caching, BlockStore2Test, CachingBlockStore2TestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(Caching, BlockStore2Test, CachingBlockStore2TestFixture); diff --git a/test/blockstore/implementations/compressing/CompressingBlockStoreTest.cpp b/test/blockstore/implementations/compressing/CompressingBlockStoreTest.cpp index 05e4f34a..87d33b91 100644 --- a/test/blockstore/implementations/compressing/CompressingBlockStoreTest.cpp +++ b/test/blockstore/implementations/compressing/CompressingBlockStoreTest.cpp @@ -23,5 +23,5 @@ public: } }; -INSTANTIATE_TYPED_TEST_CASE_P(Compressing_Gzip, BlockStoreTest, CompressingBlockStoreTestFixture); -INSTANTIATE_TYPED_TEST_CASE_P(Compressing_RunLengthEncoding, BlockStoreTest, CompressingBlockStoreTestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(Compressing_Gzip, BlockStoreTest, CompressingBlockStoreTestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(Compressing_RunLengthEncoding, BlockStoreTest, CompressingBlockStoreTestFixture); diff --git a/test/blockstore/implementations/compressing/compressors/testutils/CompressorTest.cpp b/test/blockstore/implementations/compressing/compressors/testutils/CompressorTest.cpp index 6916b142..254795e1 100644 --- a/test/blockstore/implementations/compressing/compressors/testutils/CompressorTest.cpp +++ b/test/blockstore/implementations/compressing/compressors/testutils/CompressorTest.cpp @@ -17,7 +17,7 @@ public: } }; -TYPED_TEST_CASE_P(CompressorTest); +TYPED_TEST_SUITE_P(CompressorTest); TYPED_TEST_P(CompressorTest, Empty) { Data empty(0); @@ -77,7 +77,7 @@ TYPED_TEST_P(CompressorTest, LargeRunsAndArbitrary) { this->EXPECT_COMPRESS_AND_DECOMPRESS_IS_IDENTITY(data); } -REGISTER_TYPED_TEST_CASE_P(CompressorTest, +REGISTER_TYPED_TEST_SUITE_P(CompressorTest, Empty, ArbitraryData, Zeroes, @@ -88,5 +88,5 @@ REGISTER_TYPED_TEST_CASE_P(CompressorTest, LargeRunsAndArbitrary ); -INSTANTIATE_TYPED_TEST_CASE_P(Gzip, CompressorTest, Gzip); -INSTANTIATE_TYPED_TEST_CASE_P(RunLengthEncoding, CompressorTest, RunLengthEncoding); +INSTANTIATE_TYPED_TEST_SUITE_P(Gzip, CompressorTest, Gzip); +INSTANTIATE_TYPED_TEST_SUITE_P(RunLengthEncoding, CompressorTest, RunLengthEncoding); diff --git a/test/blockstore/implementations/encrypted/EncryptedBlockStoreTest_Generic.cpp b/test/blockstore/implementations/encrypted/EncryptedBlockStoreTest_Generic.cpp index 42fc12b8..4c16bdab 100644 --- a/test/blockstore/implementations/encrypted/EncryptedBlockStoreTest_Generic.cpp +++ b/test/blockstore/implementations/encrypted/EncryptedBlockStoreTest_Generic.cpp @@ -41,9 +41,9 @@ private: } }; -INSTANTIATE_TYPED_TEST_CASE_P(Encrypted_FakeCipher, BlockStoreTest, EncryptedBlockStoreTestFixture); -INSTANTIATE_TYPED_TEST_CASE_P(Encrypted_AES256_GCM, BlockStoreTest, EncryptedBlockStoreTestFixture); -INSTANTIATE_TYPED_TEST_CASE_P(Encrypted_AES256_CFB, BlockStoreTest, EncryptedBlockStoreTestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(Encrypted_FakeCipher, BlockStoreTest, EncryptedBlockStoreTestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(Encrypted_AES256_GCM, BlockStoreTest, EncryptedBlockStoreTestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(Encrypted_AES256_CFB, BlockStoreTest, EncryptedBlockStoreTestFixture); template class EncryptedBlockStore2TestFixture: public BlockStore2TestFixture { @@ -60,6 +60,6 @@ private: } }; -INSTANTIATE_TYPED_TEST_CASE_P(Encrypted_FakeCipher, BlockStore2Test, EncryptedBlockStore2TestFixture); -INSTANTIATE_TYPED_TEST_CASE_P(Encrypted_AES256_GCM, BlockStore2Test, EncryptedBlockStore2TestFixture); -INSTANTIATE_TYPED_TEST_CASE_P(Encrypted_AES256_CFB, BlockStore2Test, EncryptedBlockStore2TestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(Encrypted_FakeCipher, BlockStore2Test, EncryptedBlockStore2TestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(Encrypted_AES256_GCM, BlockStore2Test, EncryptedBlockStore2TestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(Encrypted_AES256_CFB, BlockStore2Test, EncryptedBlockStore2TestFixture); diff --git a/test/blockstore/implementations/inmemory/InMemoryBlockStoreTest.cpp b/test/blockstore/implementations/inmemory/InMemoryBlockStoreTest.cpp index 0a636ba1..7e851ac7 100644 --- a/test/blockstore/implementations/inmemory/InMemoryBlockStoreTest.cpp +++ b/test/blockstore/implementations/inmemory/InMemoryBlockStoreTest.cpp @@ -23,7 +23,7 @@ public: } }; -INSTANTIATE_TYPED_TEST_CASE_P(InMemory, BlockStoreTest, InMemoryBlockStoreTestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(InMemory, BlockStoreTest, InMemoryBlockStoreTestFixture); class InMemoryBlockStore2TestFixture: public BlockStore2TestFixture { public: @@ -32,4 +32,4 @@ public: } }; -INSTANTIATE_TYPED_TEST_CASE_P(InMemory, BlockStore2Test, InMemoryBlockStore2TestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(InMemory, BlockStore2Test, InMemoryBlockStore2TestFixture); diff --git a/test/blockstore/implementations/integrity/IntegrityBlockStoreTest_Generic.cpp b/test/blockstore/implementations/integrity/IntegrityBlockStoreTest_Generic.cpp index bc1c8ed2..3f893996 100644 --- a/test/blockstore/implementations/integrity/IntegrityBlockStoreTest_Generic.cpp +++ b/test/blockstore/implementations/integrity/IntegrityBlockStoreTest_Generic.cpp @@ -35,10 +35,10 @@ using IntegrityBlockStoreTestFixture_singleclient = IntegrityBlockStoreTestFixtu using IntegrityBlockStoreTestFixture_multiclient_allowIntegrityViolations = IntegrityBlockStoreTestFixture; using IntegrityBlockStoreTestFixture_singleclient_allowIntegrityViolations = IntegrityBlockStoreTestFixture; -INSTANTIATE_TYPED_TEST_CASE_P(Integrity_multiclient, BlockStoreTest, IntegrityBlockStoreTestFixture_multiclient); -INSTANTIATE_TYPED_TEST_CASE_P(Integrity_singleclient, BlockStoreTest, IntegrityBlockStoreTestFixture_singleclient); -INSTANTIATE_TYPED_TEST_CASE_P(Integrity_multiclient_allowIntegrityViolations, BlockStoreTest, IntegrityBlockStoreTestFixture_multiclient_allowIntegrityViolations); -INSTANTIATE_TYPED_TEST_CASE_P(Integrity_singleclient_allowIntegrityViolations, BlockStoreTest, IntegrityBlockStoreTestFixture_singleclient_allowIntegrityViolations); +INSTANTIATE_TYPED_TEST_SUITE_P(Integrity_multiclient, BlockStoreTest, IntegrityBlockStoreTestFixture_multiclient); +INSTANTIATE_TYPED_TEST_SUITE_P(Integrity_singleclient, BlockStoreTest, IntegrityBlockStoreTestFixture_singleclient); +INSTANTIATE_TYPED_TEST_SUITE_P(Integrity_multiclient_allowIntegrityViolations, BlockStoreTest, IntegrityBlockStoreTestFixture_multiclient_allowIntegrityViolations); +INSTANTIATE_TYPED_TEST_SUITE_P(Integrity_singleclient_allowIntegrityViolations, BlockStoreTest, IntegrityBlockStoreTestFixture_singleclient_allowIntegrityViolations); template class IntegrityBlockStore2TestFixture: public BlockStore2TestFixture { @@ -56,7 +56,7 @@ using IntegrityBlockStore2TestFixture_singleclient = IntegrityBlockStore2TestFix using IntegrityBlockStore2TestFixture_multiclient_allowIntegrityViolations = IntegrityBlockStore2TestFixture; using IntegrityBlockStore2TestFixture_singleclient_allowIntegrityViolations = IntegrityBlockStore2TestFixture; -INSTANTIATE_TYPED_TEST_CASE_P(Integrity_multiclient, BlockStore2Test, IntegrityBlockStore2TestFixture_multiclient); -INSTANTIATE_TYPED_TEST_CASE_P(Integrity_singleclient, BlockStore2Test, IntegrityBlockStore2TestFixture_singleclient); -INSTANTIATE_TYPED_TEST_CASE_P(Integrity_multiclient_allowIntegrityViolations, BlockStore2Test, IntegrityBlockStore2TestFixture_multiclient_allowIntegrityViolations); -INSTANTIATE_TYPED_TEST_CASE_P(Integrity_singleclient_allowIntegrityViolations, BlockStore2Test, IntegrityBlockStore2TestFixture_singleclient_allowIntegrityViolations); +INSTANTIATE_TYPED_TEST_SUITE_P(Integrity_multiclient, BlockStore2Test, IntegrityBlockStore2TestFixture_multiclient); +INSTANTIATE_TYPED_TEST_SUITE_P(Integrity_singleclient, BlockStore2Test, IntegrityBlockStore2TestFixture_singleclient); +INSTANTIATE_TYPED_TEST_SUITE_P(Integrity_multiclient_allowIntegrityViolations, BlockStore2Test, IntegrityBlockStore2TestFixture_multiclient_allowIntegrityViolations); +INSTANTIATE_TYPED_TEST_SUITE_P(Integrity_singleclient_allowIntegrityViolations, BlockStore2Test, IntegrityBlockStore2TestFixture_singleclient_allowIntegrityViolations); diff --git a/test/blockstore/implementations/low2highlevel/LowToHighLevelBlockStoreTest.cpp b/test/blockstore/implementations/low2highlevel/LowToHighLevelBlockStoreTest.cpp index 82670059..79dc8c98 100644 --- a/test/blockstore/implementations/low2highlevel/LowToHighLevelBlockStoreTest.cpp +++ b/test/blockstore/implementations/low2highlevel/LowToHighLevelBlockStoreTest.cpp @@ -22,4 +22,4 @@ public: } }; -INSTANTIATE_TYPED_TEST_CASE_P(LowToHighLevel, BlockStoreTest, LowToHighLevelBlockStoreTestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(LowToHighLevel, BlockStoreTest, LowToHighLevelBlockStoreTestFixture); diff --git a/test/blockstore/implementations/mock/MockBlockStoreTest.cpp b/test/blockstore/implementations/mock/MockBlockStoreTest.cpp index 33648382..73fce64b 100644 --- a/test/blockstore/implementations/mock/MockBlockStoreTest.cpp +++ b/test/blockstore/implementations/mock/MockBlockStoreTest.cpp @@ -17,4 +17,4 @@ public: } }; -INSTANTIATE_TYPED_TEST_CASE_P(Mock, BlockStoreTest, MockBlockStoreTestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(Mock, BlockStoreTest, MockBlockStoreTestFixture); diff --git a/test/blockstore/implementations/ondisk/OnDiskBlockStoreTest_Generic.cpp b/test/blockstore/implementations/ondisk/OnDiskBlockStoreTest_Generic.cpp index 476deb91..9a54db8a 100644 --- a/test/blockstore/implementations/ondisk/OnDiskBlockStoreTest_Generic.cpp +++ b/test/blockstore/implementations/ondisk/OnDiskBlockStoreTest_Generic.cpp @@ -29,7 +29,7 @@ private: TempDir tempdir; }; -INSTANTIATE_TYPED_TEST_CASE_P(OnDisk, BlockStoreTest, OnDiskBlockStoreTestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(OnDisk, BlockStoreTest, OnDiskBlockStoreTestFixture); class OnDiskBlockStore2TestFixture: public BlockStore2TestFixture { public: @@ -42,4 +42,4 @@ private: TempDir tempdir; }; -INSTANTIATE_TYPED_TEST_CASE_P(OnDisk, BlockStore2Test, OnDiskBlockStore2TestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(OnDisk, BlockStore2Test, OnDiskBlockStore2TestFixture); diff --git a/test/blockstore/implementations/ondisk/OnDiskBlockTest/OnDiskBlockCreateTest.cpp b/test/blockstore/implementations/ondisk/OnDiskBlockTest/OnDiskBlockCreateTest.cpp index fd3f53f5..1ba836aa 100644 --- a/test/blockstore/implementations/ondisk/OnDiskBlockTest/OnDiskBlockCreateTest.cpp +++ b/test/blockstore/implementations/ondisk/OnDiskBlockTest/OnDiskBlockCreateTest.cpp @@ -60,7 +60,7 @@ public: ZEROES.FillWithZeroes(); } }; -INSTANTIATE_TEST_CASE_P(OnDiskBlockCreateSizeTest, OnDiskBlockCreateSizeTest, Values(0, 1, 5, 1024, 10*1024*1024)); +INSTANTIATE_TEST_SUITE_P(OnDiskBlockCreateSizeTest, OnDiskBlockCreateSizeTest, Values(0, 1, 5, 1024, 10*1024*1024)); TEST_P(OnDiskBlockCreateSizeTest, OnDiskSizeIsCorrect) { Data fileContent = Data::LoadFromFile(file.path()).value(); @@ -85,4 +85,4 @@ TEST_P(OnDiskBlockCreateSizeTest, InMemorySizeIsCorrect) { TEST_P(OnDiskBlockCreateSizeTest, InMemoryBlockIsZeroedOut) { EXPECT_EQ(0, std::memcmp(ZEROES.data(), block->data(), block->size())); } -*/ \ No newline at end of file +*/ diff --git a/test/blockstore/implementations/ondisk/OnDiskBlockTest/OnDiskBlockFlushTest.cpp b/test/blockstore/implementations/ondisk/OnDiskBlockTest/OnDiskBlockFlushTest.cpp index 0bab7f82..989f3c87 100644 --- a/test/blockstore/implementations/ondisk/OnDiskBlockTest/OnDiskBlockFlushTest.cpp +++ b/test/blockstore/implementations/ondisk/OnDiskBlockTest/OnDiskBlockFlushTest.cpp @@ -63,7 +63,7 @@ public: EXPECT_EQ(randomData, fileContentWithoutHeader); } }; -INSTANTIATE_TEST_CASE_P(OnDiskBlockFlushTest, OnDiskBlockFlushTest, Values((size_t)0, (size_t)1, (size_t)1024, (size_t)4096, (size_t)10*1024*1024)); +INSTANTIATE_TEST_SUITE_P(OnDiskBlockFlushTest, OnDiskBlockFlushTest, Values((size_t)0, (size_t)1, (size_t)1024, (size_t)4096, (size_t)10*1024*1024)); // This test is also tested by OnDiskBlockStoreTest, but there the block is created using the BlockStore interface. // Here, we create it using OnDiskBlock::CreateOnDisk() @@ -116,4 +116,4 @@ TEST_P(OnDiskBlockFlushTest, AfterLoad_FlushesWhenDestructed) { } EXPECT_STORED_FILE_DATA_CORRECT(); } -*/ \ No newline at end of file +*/ diff --git a/test/blockstore/implementations/ondisk/OnDiskBlockTest/OnDiskBlockLoadTest.cpp b/test/blockstore/implementations/ondisk/OnDiskBlockTest/OnDiskBlockLoadTest.cpp index 200a666b..bf117f2e 100644 --- a/test/blockstore/implementations/ondisk/OnDiskBlockTest/OnDiskBlockLoadTest.cpp +++ b/test/blockstore/implementations/ondisk/OnDiskBlockTest/OnDiskBlockLoadTest.cpp @@ -56,7 +56,7 @@ public: EXPECT_EQ(0, std::memcmp(expected.data(), actual.data(), expected.size())); } }; -INSTANTIATE_TEST_CASE_P(OnDiskBlockLoadTest, OnDiskBlockLoadTest, Values(0, 1, 5, 1024, 10*1024*1024)); +INSTANTIATE_TEST_SUITE_P(OnDiskBlockLoadTest, OnDiskBlockLoadTest, Values(0, 1, 5, 1024, 10*1024*1024)); TEST_P(OnDiskBlockLoadTest, LoadsCorrectSize) { CreateBlockWithSize(GetParam()); @@ -79,4 +79,4 @@ TEST_F(OnDiskBlockLoadTest, LoadNotExistingBlock) { BlockId key2 = BlockId::FromString("272EE5517627CFA147A971A8E6E747E0"); EXPECT_EQ(boost::none, OnDiskBlock::LoadFromDisk(dir.path(), key2)); } -*/ \ No newline at end of file +*/ diff --git a/test/blockstore/implementations/parallelaccess/ParallelAccessBlockStoreTest_Generic.cpp b/test/blockstore/implementations/parallelaccess/ParallelAccessBlockStoreTest_Generic.cpp index c33c82e7..ffcdef0e 100644 --- a/test/blockstore/implementations/parallelaccess/ParallelAccessBlockStoreTest_Generic.cpp +++ b/test/blockstore/implementations/parallelaccess/ParallelAccessBlockStoreTest_Generic.cpp @@ -18,6 +18,6 @@ public: } }; -INSTANTIATE_TYPED_TEST_CASE_P(ParallelAccess, BlockStoreTest, ParallelAccessBlockStoreTestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(ParallelAccess, BlockStoreTest, ParallelAccessBlockStoreTestFixture); //TODO Add specific tests ensuring that loading the same block twice doesn't load it twice from the underlying blockstore diff --git a/test/blockstore/implementations/testfake/TestFakeBlockStoreTest.cpp b/test/blockstore/implementations/testfake/TestFakeBlockStoreTest.cpp index 5c20f639..eabea809 100644 --- a/test/blockstore/implementations/testfake/TestFakeBlockStoreTest.cpp +++ b/test/blockstore/implementations/testfake/TestFakeBlockStoreTest.cpp @@ -16,4 +16,4 @@ public: } }; -INSTANTIATE_TYPED_TEST_CASE_P(TestFake, BlockStoreTest, FakeBlockStoreTestFixture); +INSTANTIATE_TYPED_TEST_SUITE_P(TestFake, BlockStoreTest, FakeBlockStoreTestFixture); diff --git a/test/blockstore/testutils/BlockStore2Test.h b/test/blockstore/testutils/BlockStore2Test.h index 7f3ee0df..d6de1b7d 100644 --- a/test/blockstore/testutils/BlockStore2Test.h +++ b/test/blockstore/testutils/BlockStore2Test.h @@ -53,7 +53,7 @@ public: } }; -TYPED_TEST_CASE_P(BlockStore2Test); +TYPED_TEST_SUITE_P(BlockStore2Test); TYPED_TEST_P(BlockStore2Test, givenNonEmptyBlockStore_whenCallingTryCreateOnExistingBlock_thenFails) { blockstore::BlockId blockId = this->blockStore->create(cpputils::Data(1024)); @@ -418,7 +418,7 @@ TYPED_TEST_P(BlockStore2Test, TryCreateTwoBlocksWithSameBlockIdAndBothNullSize) EXPECT_FALSE(blockStore->tryCreate(blockId, cpputils::Data(0))); }*/ -REGISTER_TYPED_TEST_CASE_P(BlockStore2Test, +REGISTER_TYPED_TEST_SUITE_P(BlockStore2Test, givenNonEmptyBlockStore_whenCallingTryCreateOnExistingBlock_thenFails, givenEmptyBlockStore_whenCallingTryCreateOnNonExistingBlock_thenSucceeds, givenNonEmptyBlockStore_whenCallingTryCreateOnNonExistingBlock_thenSucceeds, diff --git a/test/blockstore/testutils/BlockStoreTest.h b/test/blockstore/testutils/BlockStoreTest.h index 7db86f3d..190c9741 100644 --- a/test/blockstore/testutils/BlockStoreTest.h +++ b/test/blockstore/testutils/BlockStoreTest.h @@ -70,7 +70,7 @@ public: } }; -TYPED_TEST_CASE_P(BlockStoreTest); +TYPED_TEST_SUITE_P(BlockStoreTest); TYPED_TEST_P(BlockStoreTest, TwoCreatedBlocksHaveDifferentBlockIds) { auto blockStore = this->fixture.createBlockStore(); @@ -341,7 +341,7 @@ TYPED_TEST_P(BlockStoreTest, TryCreateTwoBlocksWithSameBlockIdAndBothNullSize) { #include "BlockStoreTest_Data.h" -REGISTER_TYPED_TEST_CASE_P(BlockStoreTest, +REGISTER_TYPED_TEST_SUITE_P(BlockStoreTest, CreatedBlockHasCorrectSize, LoadingUnchangedBlockHasCorrectSize, CreatedBlockData, diff --git a/test/cpp-utils/crypto/kdf/SCryptParametersTest.cpp b/test/cpp-utils/crypto/kdf/SCryptParametersTest.cpp index 8f18fc42..619efbc6 100644 --- a/test/cpp-utils/crypto/kdf/SCryptParametersTest.cpp +++ b/test/cpp-utils/crypto/kdf/SCryptParametersTest.cpp @@ -80,4 +80,4 @@ TEST_F(SCryptParametersTest, p_SaveAndLoad) { SCryptParameters cfg(Data(0), 0, 0, 16); SCryptParameters loaded = SaveAndLoad(cfg); EXPECT_EQ(16u, loaded.p()); -} \ No newline at end of file +} diff --git a/test/cpp-utils/crypto/symmetric/CipherTest.cpp b/test/cpp-utils/crypto/symmetric/CipherTest.cpp index ee8d73c3..6e795214 100644 --- a/test/cpp-utils/crypto/symmetric/CipherTest.cpp +++ b/test/cpp-utils/crypto/symmetric/CipherTest.cpp @@ -60,7 +60,7 @@ public: } }; -TYPED_TEST_CASE_P(CipherTest); +TYPED_TEST_SUITE_P(CipherTest); constexpr std::array SIZES = {{0, 1, 100, 1024, 5000, 1048576, 20971520}}; @@ -123,7 +123,7 @@ TYPED_TEST_P(CipherTest, TryDecryptDataThatIsMuchTooSmall_1) { this->ExpectDoesntDecrypt(tooSmallCiphertext); } -REGISTER_TYPED_TEST_CASE_P(CipherTest, +REGISTER_TYPED_TEST_SUITE_P(CipherTest, Size, EncryptThenDecrypt_Zeroes, EncryptThenDecrypt_Data, @@ -144,7 +144,7 @@ public: Data plaintext2 = CipherTest::CreateData(100 * 1024); }; -TYPED_TEST_CASE_P(AuthenticatedCipherTest); +TYPED_TEST_SUITE_P(AuthenticatedCipherTest); TYPED_TEST_P(AuthenticatedCipherTest, ModifyFirstByte_Zeroes_Size1) { Data ciphertext = this->Encrypt(this->zeroes1); @@ -210,7 +210,7 @@ TYPED_TEST_P(AuthenticatedCipherTest, TryDecryptRandomData) { this->ExpectDoesntDecrypt(this->plaintext2); } -REGISTER_TYPED_TEST_CASE_P(AuthenticatedCipherTest, +REGISTER_TYPED_TEST_SUITE_P(AuthenticatedCipherTest, ModifyFirstByte_Zeroes_Size1, ModifyFirstByte_Zeroes, ModifyFirstByte_Data_Size1, @@ -224,43 +224,43 @@ REGISTER_TYPED_TEST_CASE_P(AuthenticatedCipherTest, ); -INSTANTIATE_TYPED_TEST_CASE_P(Fake, CipherTest, FakeAuthenticatedCipher); -INSTANTIATE_TYPED_TEST_CASE_P(Fake, AuthenticatedCipherTest, FakeAuthenticatedCipher); +INSTANTIATE_TYPED_TEST_SUITE_P(Fake, CipherTest, FakeAuthenticatedCipher); +INSTANTIATE_TYPED_TEST_SUITE_P(Fake, AuthenticatedCipherTest, FakeAuthenticatedCipher); -INSTANTIATE_TYPED_TEST_CASE_P(AES256_CFB, CipherTest, AES256_CFB); //CFB mode is not authenticated -INSTANTIATE_TYPED_TEST_CASE_P(AES256_GCM, CipherTest, AES256_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(AES256_GCM, AuthenticatedCipherTest, AES256_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(AES128_CFB, CipherTest, AES128_CFB); //CFB mode is not authenticated -INSTANTIATE_TYPED_TEST_CASE_P(AES128_GCM, CipherTest, AES128_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(AES128_GCM, AuthenticatedCipherTest, AES128_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(AES256_CFB, CipherTest, AES256_CFB); //CFB mode is not authenticated +INSTANTIATE_TYPED_TEST_SUITE_P(AES256_GCM, CipherTest, AES256_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(AES256_GCM, AuthenticatedCipherTest, AES256_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(AES128_CFB, CipherTest, AES128_CFB); //CFB mode is not authenticated +INSTANTIATE_TYPED_TEST_SUITE_P(AES128_GCM, CipherTest, AES128_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(AES128_GCM, AuthenticatedCipherTest, AES128_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Twofish256_CFB, CipherTest, Twofish256_CFB); //CFB mode is not authenticated -INSTANTIATE_TYPED_TEST_CASE_P(Twofish256_GCM, CipherTest, Twofish256_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Twofish256_GCM, AuthenticatedCipherTest, Twofish256_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Twofish128_CFB, CipherTest, Twofish128_CFB); //CFB mode is not authenticated -INSTANTIATE_TYPED_TEST_CASE_P(Twofish128_GCM, CipherTest, Twofish128_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Twofish128_GCM, AuthenticatedCipherTest, Twofish128_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Twofish256_CFB, CipherTest, Twofish256_CFB); //CFB mode is not authenticated +INSTANTIATE_TYPED_TEST_SUITE_P(Twofish256_GCM, CipherTest, Twofish256_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Twofish256_GCM, AuthenticatedCipherTest, Twofish256_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Twofish128_CFB, CipherTest, Twofish128_CFB); //CFB mode is not authenticated +INSTANTIATE_TYPED_TEST_SUITE_P(Twofish128_GCM, CipherTest, Twofish128_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Twofish128_GCM, AuthenticatedCipherTest, Twofish128_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Serpent256_CFB, CipherTest, Serpent256_CFB); //CFB mode is not authenticated -INSTANTIATE_TYPED_TEST_CASE_P(Serpent256_GCM, CipherTest, Serpent256_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Serpent256_GCM, AuthenticatedCipherTest, Serpent256_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Serpent128_CFB, CipherTest, Serpent128_CFB); //CFB mode is not authenticated -INSTANTIATE_TYPED_TEST_CASE_P(Serpent128_GCM, CipherTest, Serpent128_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Serpent128_GCM, AuthenticatedCipherTest, Serpent128_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Serpent256_CFB, CipherTest, Serpent256_CFB); //CFB mode is not authenticated +INSTANTIATE_TYPED_TEST_SUITE_P(Serpent256_GCM, CipherTest, Serpent256_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Serpent256_GCM, AuthenticatedCipherTest, Serpent256_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Serpent128_CFB, CipherTest, Serpent128_CFB); //CFB mode is not authenticated +INSTANTIATE_TYPED_TEST_SUITE_P(Serpent128_GCM, CipherTest, Serpent128_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Serpent128_GCM, AuthenticatedCipherTest, Serpent128_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Cast256_CFB, CipherTest, Cast256_CFB); //CFB mode is not authenticated -INSTANTIATE_TYPED_TEST_CASE_P(Cast256_GCM, CipherTest, Cast256_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Cast256_GCM, AuthenticatedCipherTest, Cast256_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Cast256_CFB, CipherTest, Cast256_CFB); //CFB mode is not authenticated +INSTANTIATE_TYPED_TEST_SUITE_P(Cast256_GCM, CipherTest, Cast256_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Cast256_GCM, AuthenticatedCipherTest, Cast256_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Mars448_CFB, CipherTest, Mars448_CFB); //CFB mode is not authenticated -INSTANTIATE_TYPED_TEST_CASE_P(Mars448_GCM, CipherTest, Mars448_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Mars448_GCM, AuthenticatedCipherTest, Mars448_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Mars256_CFB, CipherTest, Mars256_CFB); //CFB mode is not authenticated -INSTANTIATE_TYPED_TEST_CASE_P(Mars256_GCM, CipherTest, Mars256_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Mars256_GCM, AuthenticatedCipherTest, Mars256_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Mars128_CFB, CipherTest, Mars128_CFB); //CFB mode is not authenticated -INSTANTIATE_TYPED_TEST_CASE_P(Mars128_GCM, CipherTest, Mars128_GCM); -INSTANTIATE_TYPED_TEST_CASE_P(Mars128_GCM, AuthenticatedCipherTest, Mars128_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Mars448_CFB, CipherTest, Mars448_CFB); //CFB mode is not authenticated +INSTANTIATE_TYPED_TEST_SUITE_P(Mars448_GCM, CipherTest, Mars448_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Mars448_GCM, AuthenticatedCipherTest, Mars448_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Mars256_CFB, CipherTest, Mars256_CFB); //CFB mode is not authenticated +INSTANTIATE_TYPED_TEST_SUITE_P(Mars256_GCM, CipherTest, Mars256_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Mars256_GCM, AuthenticatedCipherTest, Mars256_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Mars128_CFB, CipherTest, Mars128_CFB); //CFB mode is not authenticated +INSTANTIATE_TYPED_TEST_SUITE_P(Mars128_GCM, CipherTest, Mars128_GCM); +INSTANTIATE_TYPED_TEST_SUITE_P(Mars128_GCM, AuthenticatedCipherTest, Mars128_GCM); // Test cipher names diff --git a/test/cpp-utils/data/DataFixtureIncludeTest.cpp b/test/cpp-utils/data/DataFixtureIncludeTest.cpp index e30657ac..661525ed 100644 --- a/test/cpp-utils/data/DataFixtureIncludeTest.cpp +++ b/test/cpp-utils/data/DataFixtureIncludeTest.cpp @@ -1,3 +1,3 @@ #include "cpp-utils/data/DataFixture.h" -// Test the header can be included without needing additional dependencies \ No newline at end of file +// Test the header can be included without needing additional dependencies diff --git a/test/cpp-utils/data/DataIncludeTest.cpp b/test/cpp-utils/data/DataIncludeTest.cpp index f9230be7..ff83ca7c 100644 --- a/test/cpp-utils/data/DataIncludeTest.cpp +++ b/test/cpp-utils/data/DataIncludeTest.cpp @@ -1,3 +1,3 @@ #include "cpp-utils/data/Data.h" -// Test the header can be included without needing additional dependencies \ No newline at end of file +// Test the header can be included without needing additional dependencies diff --git a/test/cpp-utils/data/DataTest.cpp b/test/cpp-utils/data/DataTest.cpp index 7875e2ac..b6db3d98 100644 --- a/test/cpp-utils/data/DataTest.cpp +++ b/test/cpp-utils/data/DataTest.cpp @@ -57,7 +57,7 @@ public: } }; -INSTANTIATE_TEST_CASE_P(DataTestWithSizeParam, DataTestWithSizeParam, Values(0, 1, 2, 1024, 4096, 10*1024*1024)); +INSTANTIATE_TEST_SUITE_P(DataTestWithSizeParam, DataTestWithSizeParam, Values(0, 1, 2, 1024, 4096, 10*1024*1024)); TEST_P(DataTestWithSizeParam, ZeroInitializedDataIsDifferentToRandomData) { if (GetParam() != 0) { @@ -215,7 +215,7 @@ TEST_F(DataTest, LoadingNonexistingFile) { } class DataTestWithStringParam: public DataTest, public WithParamInterface {}; -INSTANTIATE_TEST_CASE_P(DataTestWithStringParam, DataTestWithStringParam, Values("", "2898B4B8A13C0F0278CCE465DB", "6FFEBAD90C0DAA2B79628F0627CE9841")); +INSTANTIATE_TEST_SUITE_P(DataTestWithStringParam, DataTestWithStringParam, Values("", "2898B4B8A13C0F0278CCE465DB", "6FFEBAD90C0DAA2B79628F0627CE9841")); TEST_P(DataTestWithStringParam, FromAndToString) { Data data = Data::FromString(GetParam()); diff --git a/test/cpp-utils/data/FixedSizeDataIncludeTest.cpp b/test/cpp-utils/data/FixedSizeDataIncludeTest.cpp index 817e1c6f..9440ebc0 100644 --- a/test/cpp-utils/data/FixedSizeDataIncludeTest.cpp +++ b/test/cpp-utils/data/FixedSizeDataIncludeTest.cpp @@ -1,3 +1,3 @@ #include "cpp-utils/data/FixedSizeData.h" -// Test the header can be included without needing additional dependencies \ No newline at end of file +// Test the header can be included without needing additional dependencies diff --git a/test/cpp-utils/data/FixedSizeDataTest.cpp b/test/cpp-utils/data/FixedSizeDataTest.cpp index 4c7ea27d..b016a39a 100644 --- a/test/cpp-utils/data/FixedSizeDataTest.cpp +++ b/test/cpp-utils/data/FixedSizeDataTest.cpp @@ -66,7 +66,7 @@ TEST_F(FixedSizeDataTest, NotEqualsTrue) { } class FixedSizeDataTestWithStringParam: public FixedSizeDataTest, public WithParamInterface {}; -INSTANTIATE_TEST_CASE_P(FixedSizeDataTestWithStringParam, FixedSizeDataTestWithStringParam, Values("2898B4B8A13CA63CBE0F0278CCE465DB", "6FFEBAD90C0DAA2B79628F0627CE9841")); +INSTANTIATE_TEST_SUITE_P(FixedSizeDataTestWithStringParam, FixedSizeDataTestWithStringParam, Values("2898B4B8A13CA63CBE0F0278CCE465DB", "6FFEBAD90C0DAA2B79628F0627CE9841")); TEST_P(FixedSizeDataTestWithStringParam, FromAndToString) { FixedSizeData data = FixedSizeData::FromString(GetParam()); @@ -86,7 +86,7 @@ public: }; const Data FixedSizeDataTestWithBinaryParam::VALUE1(DataFixture::generate(SIZE, 3)); const Data FixedSizeDataTestWithBinaryParam::VALUE2(DataFixture::generate(SIZE, 4)); -INSTANTIATE_TEST_CASE_P(FixedSizeDataTestWithBinaryParam, FixedSizeDataTestWithBinaryParam, Values(&FixedSizeDataTestWithBinaryParam::VALUE1, &FixedSizeDataTestWithBinaryParam::VALUE2)); +INSTANTIATE_TEST_SUITE_P(FixedSizeDataTestWithBinaryParam, FixedSizeDataTestWithBinaryParam, Values(&FixedSizeDataTestWithBinaryParam::VALUE1, &FixedSizeDataTestWithBinaryParam::VALUE2)); TEST_P(FixedSizeDataTestWithBinaryParam, FromBinary) { FixedSizeData data = FixedSizeData::FromBinary(GetParam()->data()); @@ -109,7 +109,7 @@ TEST_P(FixedSizeDataTestWithBinaryParam, ToAndFromBinary) { } class FixedSizeDataTestWithParam: public FixedSizeDataTest, public WithParamInterface> {}; -INSTANTIATE_TEST_CASE_P(FixedSizeDataTestWithParam, FixedSizeDataTestWithParam, Values(FixedSizeData::FromString("2898B4B8A13CA63CBE0F0278CCE465DB"), FixedSizeData::FromString("6FFEBAD90C0DAA2B79628F0627CE9841"))); +INSTANTIATE_TEST_SUITE_P(FixedSizeDataTestWithParam, FixedSizeDataTestWithParam, Values(FixedSizeData::FromString("2898B4B8A13CA63CBE0F0278CCE465DB"), FixedSizeData::FromString("6FFEBAD90C0DAA2B79628F0627CE9841"))); TEST_P(FixedSizeDataTestWithParam, CopyConstructor) { FixedSizeData copy(GetParam()); diff --git a/test/cpp-utils/io/ConsoleTest_Ask.cpp b/test/cpp-utils/io/ConsoleTest_Ask.cpp index ea8911fd..ca86fe84 100644 --- a/test/cpp-utils/io/ConsoleTest_Ask.cpp +++ b/test/cpp-utils/io/ConsoleTest_Ask.cpp @@ -182,4 +182,4 @@ TEST_F(ConsoleTest_Ask, InputNonNumbers) { EXPECT_OUTPUT_LINE("Your choice [1-2]", ':', " "); sendInputLine("2"); EXPECT_EQ(1u, chosen.get()); -} \ No newline at end of file +} diff --git a/test/cpp-utils/value_type/ValueTypeTest.cpp b/test/cpp-utils/value_type/ValueTypeTest.cpp index 7b45052a..cb984d38 100644 --- a/test/cpp-utils/value_type/ValueTypeTest.cpp +++ b/test/cpp-utils/value_type/ValueTypeTest.cpp @@ -88,7 +88,7 @@ namespace IdValueTypeTest_constexpr_test_extras { template class IdValueTypeTest : public testing::Test { }; using IdValueTypeTest_types = testing::Types; -TYPED_TEST_CASE(IdValueTypeTest, IdValueTypeTest_types); +TYPED_TEST_SUITE(IdValueTypeTest, IdValueTypeTest_types); TYPED_TEST(IdValueTypeTest, Equality) { @@ -207,7 +207,7 @@ namespace OrderedIdValueTypeTest_constexpr_test_extras { template class OrderedIdValueTypeTest : public testing::Test {}; using OrderedIdValueTypeTest_types = testing::Types; -TYPED_TEST_CASE(OrderedIdValueTypeTest, OrderedIdValueTypeTest_types); +TYPED_TEST_SUITE(OrderedIdValueTypeTest, OrderedIdValueTypeTest_types); TYPED_TEST(OrderedIdValueTypeTest, LessThan) { TypeParam a(3); @@ -310,7 +310,7 @@ namespace QuantityValueTypeTest_constexpr_test { template class QuantityValueTypeTest : public testing::Test {}; using QuantityValueTypeTest_types = testing::Types; -TYPED_TEST_CASE(QuantityValueTypeTest, QuantityValueTypeTest_types); +TYPED_TEST_SUITE(QuantityValueTypeTest, QuantityValueTypeTest_types); TYPED_TEST(QuantityValueTypeTest, PreIncrement) { TypeParam a(3); @@ -437,7 +437,7 @@ namespace FlagsValueTypeTest_constexpr_test { template class FlagsValueTypeTest : public testing::Test {}; using FlagsValueType_types = testing::Types; -TYPED_TEST_CASE(FlagsValueTypeTest, FlagsValueType_types); +TYPED_TEST_SUITE(FlagsValueTypeTest, FlagsValueType_types); TYPED_TEST(FlagsValueTypeTest, Invert) { TypeParam a(3); diff --git a/test/cryfs-cli/CliTest_Setup.cpp b/test/cryfs-cli/CliTest_Setup.cpp index 720ee4f7..fa8ecf7d 100644 --- a/test/cryfs-cli/CliTest_Setup.cpp +++ b/test/cryfs-cli/CliTest_Setup.cpp @@ -36,4 +36,4 @@ TEST_F(CliTest_Setup, FuseOptionGiven) { //Specify --cipher parameter to make it non-interactive //TODO Remove "-f" parameter, once EXPECT_RUN_SUCCESS can handle that EXPECT_RUN_SUCCESS({basedir.string().c_str(), mountdir.string().c_str(), "-f", "--cipher", "aes-256-gcm", "--", "-f"}, mountdir); -} \ No newline at end of file +} diff --git a/test/cryfs-cli/CliTest_WrongEnvironment.cpp b/test/cryfs-cli/CliTest_WrongEnvironment.cpp index dd34c47d..1f80f08d 100644 --- a/test/cryfs-cli/CliTest_WrongEnvironment.cpp +++ b/test/cryfs-cli/CliTest_WrongEnvironment.cpp @@ -72,14 +72,14 @@ public: } }; -INSTANTIATE_TEST_CASE_P(DefaultParams, CliTest_WrongEnvironment, Values(TestConfig({false, false, false}))); -INSTANTIATE_TEST_CASE_P(ExternalConfigfile, CliTest_WrongEnvironment, Values(TestConfig({true, false, false}))); -INSTANTIATE_TEST_CASE_P(LogIsNotStderr, CliTest_WrongEnvironment, Values(TestConfig({false, true, false}))); -INSTANTIATE_TEST_CASE_P(ExternalConfigfile_LogIsNotStderr, CliTest_WrongEnvironment, Values(TestConfig({true, true, false}))); -INSTANTIATE_TEST_CASE_P(RunningInForeground, CliTest_WrongEnvironment, Values(TestConfig({false, false, true}))); -INSTANTIATE_TEST_CASE_P(RunningInForeground_ExternalConfigfile, CliTest_WrongEnvironment, Values(TestConfig({true, false, true}))); -INSTANTIATE_TEST_CASE_P(RunningInForeground_LogIsNotStderr, CliTest_WrongEnvironment, Values(TestConfig({false, true, true}))); -INSTANTIATE_TEST_CASE_P(RunningInForeground_ExternalConfigfile_LogIsNotStderr, CliTest_WrongEnvironment, Values(TestConfig({true, true, true}))); +INSTANTIATE_TEST_SUITE_P(DefaultParams, CliTest_WrongEnvironment, Values(TestConfig({false, false, false}))); +INSTANTIATE_TEST_SUITE_P(ExternalConfigfile, CliTest_WrongEnvironment, Values(TestConfig({true, false, false}))); +INSTANTIATE_TEST_SUITE_P(LogIsNotStderr, CliTest_WrongEnvironment, Values(TestConfig({false, true, false}))); +INSTANTIATE_TEST_SUITE_P(ExternalConfigfile_LogIsNotStderr, CliTest_WrongEnvironment, Values(TestConfig({true, true, false}))); +INSTANTIATE_TEST_SUITE_P(RunningInForeground, CliTest_WrongEnvironment, Values(TestConfig({false, false, true}))); +INSTANTIATE_TEST_SUITE_P(RunningInForeground_ExternalConfigfile, CliTest_WrongEnvironment, Values(TestConfig({true, false, true}))); +INSTANTIATE_TEST_SUITE_P(RunningInForeground_LogIsNotStderr, CliTest_WrongEnvironment, Values(TestConfig({false, true, true}))); +INSTANTIATE_TEST_SUITE_P(RunningInForeground_ExternalConfigfile_LogIsNotStderr, CliTest_WrongEnvironment, Values(TestConfig({true, true, true}))); //Counter-Test. Test that it doesn't fail if we call it without an error condition. TEST_P(CliTest_WrongEnvironment, NoErrorCondition) { @@ -239,4 +239,4 @@ TEST_P(CliTest_WrongEnvironment, MountDir_NoPermission) { SetNoPermission(mountdir); Test_Run_Error("Error 17: Could not write to mount directory", ErrorCode::InaccessibleMountDir); } -#endif \ No newline at end of file +#endif diff --git a/test/cryfs/impl/config/CryConfigConsoleTest.cpp b/test/cryfs/impl/config/CryConfigConsoleTest.cpp index 7e12d1c0..ea4bc50c 100644 --- a/test/cryfs/impl/config/CryConfigConsoleTest.cpp +++ b/test/cryfs/impl/config/CryConfigConsoleTest.cpp @@ -111,4 +111,4 @@ TEST_P(CryConfigConsoleTest_Cipher_Choose, ChoosesCipherCorrectly) { EXPECT_EQ(cipherName, chosenCipher); } -INSTANTIATE_TEST_CASE_P(CryConfigConsoleTest_Cipher_Choose, CryConfigConsoleTest_Cipher_Choose, ValuesIn(CryCiphers::supportedCipherNames())); +INSTANTIATE_TEST_SUITE_P(CryConfigConsoleTest_Cipher_Choose, CryConfigConsoleTest_Cipher_Choose, ValuesIn(CryCiphers::supportedCipherNames())); diff --git a/test/fspp/fuse/access/FuseAccessErrorTest.cpp b/test/fspp/fuse/access/FuseAccessErrorTest.cpp index dad07268..49c5b61c 100644 --- a/test/fspp/fuse/access/FuseAccessErrorTest.cpp +++ b/test/fspp/fuse/access/FuseAccessErrorTest.cpp @@ -13,7 +13,7 @@ using namespace fspp::fuse; class FuseAccessErrorTest: public FuseAccessTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseAccessErrorTest, FuseAccessErrorTest, Values(EACCES, ELOOP, ENAMETOOLONG, ENOENT, ENOTDIR, EROFS, EFAULT, EINVAL, EIO, ENOMEM, ETXTBSY)); +INSTANTIATE_TEST_SUITE_P(FuseAccessErrorTest, FuseAccessErrorTest, Values(EACCES, ELOOP, ENAMETOOLONG, ENOENT, ENOTDIR, EROFS, EFAULT, EINVAL, EIO, ENOMEM, ETXTBSY)); TEST_P(FuseAccessErrorTest, ReturnedErrorIsCorrect) { ReturnIsFileOnLstat(FILENAME); diff --git a/test/fspp/fuse/access/FuseAccessModeTest.cpp b/test/fspp/fuse/access/FuseAccessModeTest.cpp index a5d1fd4c..8de5936f 100644 --- a/test/fspp/fuse/access/FuseAccessModeTest.cpp +++ b/test/fspp/fuse/access/FuseAccessModeTest.cpp @@ -7,7 +7,7 @@ using ::testing::Values; class FuseAccessModeTest: public FuseAccessTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseAccessModeTest, FuseAccessModeTest, Values(0, F_OK, R_OK, W_OK, X_OK, R_OK|W_OK, W_OK|X_OK, R_OK|X_OK, R_OK|W_OK|X_OK)); +INSTANTIATE_TEST_SUITE_P(FuseAccessModeTest, FuseAccessModeTest, Values(0, F_OK, R_OK, W_OK, X_OK, R_OK|W_OK, W_OK|X_OK, R_OK|X_OK, R_OK|W_OK|X_OK)); TEST_P(FuseAccessModeTest, AccessFile) { diff --git a/test/fspp/fuse/closeFile/FuseCloseTest.cpp b/test/fspp/fuse/closeFile/FuseCloseTest.cpp index eb60889c..183096a7 100644 --- a/test/fspp/fuse/closeFile/FuseCloseTest.cpp +++ b/test/fspp/fuse/closeFile/FuseCloseTest.cpp @@ -71,7 +71,7 @@ public: fd->release(); // don't try closing it again } }; -INSTANTIATE_TEST_CASE_P(FuseCloseTest, FuseCloseTest, Values(0, 1, 2, 100, 1024*1024*1024)); +INSTANTIATE_TEST_SUITE_P(FuseCloseTest, FuseCloseTest, Values(0, 1, 2, 100, 1024*1024*1024)); //TODO Figure out what's wrong and enable this test //Disabled, because it is flaky. libfuse seems to not send the release() event sometimes. diff --git a/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenErrorTest.cpp b/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenErrorTest.cpp index 7212a33f..1ba64888 100644 --- a/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenErrorTest.cpp +++ b/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenErrorTest.cpp @@ -13,7 +13,7 @@ using namespace fspp::fuse; class FuseCreateAndOpenErrorTest: public FuseCreateAndOpenTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseCreateAndOpenErrorTest, FuseCreateAndOpenErrorTest, Values(EACCES, EDQUOT, EEXIST, EFAULT, EFBIG, EINTR, EOVERFLOW, EINVAL, EISDIR, ELOOP, EMFILE, ENAMETOOLONG, ENFILE, ENODEV, ENOENT, ENOMEM, ENOSPC, ENOTDIR, ENXIO, EOPNOTSUPP, EPERM, EROFS, ETXTBSY, EWOULDBLOCK, EBADF, ENOTDIR)); +INSTANTIATE_TEST_SUITE_P(FuseCreateAndOpenErrorTest, FuseCreateAndOpenErrorTest, Values(EACCES, EDQUOT, EEXIST, EFAULT, EFBIG, EINTR, EOVERFLOW, EINVAL, EISDIR, ELOOP, EMFILE, ENAMETOOLONG, ENFILE, ENODEV, ENOENT, ENOMEM, ENOSPC, ENOTDIR, ENXIO, EOPNOTSUPP, EPERM, EROFS, ETXTBSY, EWOULDBLOCK, EBADF, ENOTDIR)); TEST_F(FuseCreateAndOpenErrorTest, ReturnNoError) { ReturnDoesntExistOnLstat(FILENAME); diff --git a/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFileDescriptorTest.cpp b/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFileDescriptorTest.cpp index 0b07ccf2..2b2a3560 100644 --- a/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFileDescriptorTest.cpp +++ b/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFileDescriptorTest.cpp @@ -30,7 +30,7 @@ private: EXPECT_EQ(1, retval) << "Reading file failed"; } }; -INSTANTIATE_TEST_CASE_P(FuseCreateAndOpenFileDescriptorTest, FuseCreateAndOpenFileDescriptorTest, Values(0, 2, 5, 1000, 1024*1024*1024)); +INSTANTIATE_TEST_SUITE_P(FuseCreateAndOpenFileDescriptorTest, FuseCreateAndOpenFileDescriptorTest, Values(0, 2, 5, 1000, 1024*1024*1024)); TEST_P(FuseCreateAndOpenFileDescriptorTest, TestReturnedFileDescriptor) { ReturnDoesntExistOnLstat(FILENAME); diff --git a/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFlagsTest.cpp b/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFlagsTest.cpp index 18ccf490..51b2eb06 100644 --- a/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFlagsTest.cpp +++ b/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFlagsTest.cpp @@ -5,7 +5,7 @@ using ::testing::Values; class FuseCreateAndOpenFlagsTest: public FuseCreateAndOpenTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseCreateAndOpenFlagsTest, FuseCreateAndOpenFlagsTest, Values(O_RDWR, O_RDONLY, O_WRONLY)); +INSTANTIATE_TEST_SUITE_P(FuseCreateAndOpenFlagsTest, FuseCreateAndOpenFlagsTest, Values(O_RDWR, O_RDONLY, O_WRONLY)); //TODO Disabled because it doesn't seem to work. Fuse doesn't seem to pass flags to create(). Why? /*TEST_P(FuseCreateAndOpenFlagsTest, testFlags) { diff --git a/test/fspp/fuse/fdatasync/FuseFdatasyncErrorTest.cpp b/test/fspp/fuse/fdatasync/FuseFdatasyncErrorTest.cpp index 7f621cb5..1c685bdc 100644 --- a/test/fspp/fuse/fdatasync/FuseFdatasyncErrorTest.cpp +++ b/test/fspp/fuse/fdatasync/FuseFdatasyncErrorTest.cpp @@ -10,7 +10,7 @@ using namespace fspp::fuse; class FuseFdatasyncErrorTest: public FuseFdatasyncTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseFdatasyncErrorTest, FuseFdatasyncErrorTest, Values(EBADF, EIO, EROFS, EINVAL)); +INSTANTIATE_TEST_SUITE_P(FuseFdatasyncErrorTest, FuseFdatasyncErrorTest, Values(EBADF, EIO, EROFS, EINVAL)); TEST_P(FuseFdatasyncErrorTest, ReturnedErrorIsCorrect) { ReturnIsFileOnLstat(FILENAME); diff --git a/test/fspp/fuse/fdatasync/FuseFdatasyncFileDescriptorTest.cpp b/test/fspp/fuse/fdatasync/FuseFdatasyncFileDescriptorTest.cpp index 07f6ea27..e9fe8021 100644 --- a/test/fspp/fuse/fdatasync/FuseFdatasyncFileDescriptorTest.cpp +++ b/test/fspp/fuse/fdatasync/FuseFdatasyncFileDescriptorTest.cpp @@ -11,7 +11,7 @@ using namespace fspp::fuse; class FuseFdatasyncFileDescriptorTest: public FuseFdatasyncTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseFdatasyncFileDescriptorTest, FuseFdatasyncFileDescriptorTest, Values(0,1,10,1000,1024*1024*1024)); +INSTANTIATE_TEST_SUITE_P(FuseFdatasyncFileDescriptorTest, FuseFdatasyncFileDescriptorTest, Values(0,1,10,1000,1024*1024*1024)); TEST_P(FuseFdatasyncFileDescriptorTest, FileDescriptorIsCorrect) { diff --git a/test/fspp/fuse/flush/FuseFlushErrorTest.cpp b/test/fspp/fuse/flush/FuseFlushErrorTest.cpp index 56a0e930..08d8da98 100644 --- a/test/fspp/fuse/flush/FuseFlushErrorTest.cpp +++ b/test/fspp/fuse/flush/FuseFlushErrorTest.cpp @@ -14,7 +14,7 @@ using fspp::fuse::FuseErrnoException; class FuseFlushErrorTest: public FuseFlushTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseFlushErrorTest, FuseFlushErrorTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseFlushErrorTest, FuseFlushErrorTest, Values( EBADF, #if defined(__GLIBC__) || defined(__APPLE__) // musl has different handling for EINTR, see https://ewontfix.com/4/ diff --git a/test/fspp/fuse/flush/FuseFlushFileDescriptorTest.cpp b/test/fspp/fuse/flush/FuseFlushFileDescriptorTest.cpp index fc0fd4d4..6ff9e993 100644 --- a/test/fspp/fuse/flush/FuseFlushFileDescriptorTest.cpp +++ b/test/fspp/fuse/flush/FuseFlushFileDescriptorTest.cpp @@ -22,7 +22,7 @@ using std::string; class FuseFlushFileDescriptorTest: public FuseFlushTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseFlushFileDescriptorTest, FuseFlushFileDescriptorTest, Values(0, 1, 2, 100, 1024*1024*1024)); +INSTANTIATE_TEST_SUITE_P(FuseFlushFileDescriptorTest, FuseFlushFileDescriptorTest, Values(0, 1, 2, 100, 1024*1024*1024)); TEST_P(FuseFlushFileDescriptorTest, FlushOnCloseFile) { ReturnIsFileOnLstat(FILENAME); diff --git a/test/fspp/fuse/fstat/FuseFstatErrorTest.cpp b/test/fspp/fuse/fstat/FuseFstatErrorTest.cpp index f766378a..ddd08310 100644 --- a/test/fspp/fuse/fstat/FuseFstatErrorTest.cpp +++ b/test/fspp/fuse/fstat/FuseFstatErrorTest.cpp @@ -23,7 +23,7 @@ public: return make_unique_ref(real_path.string().c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); }*/ }; -INSTANTIATE_TEST_CASE_P(FuseFstatErrorTest, FuseFstatErrorTest, Values(EACCES, EBADF, EFAULT, ELOOP, ENAMETOOLONG, ENOENT, ENOMEM, ENOTDIR, EOVERFLOW)); +INSTANTIATE_TEST_SUITE_P(FuseFstatErrorTest, FuseFstatErrorTest, Values(EACCES, EBADF, EFAULT, ELOOP, ENAMETOOLONG, ENOENT, ENOMEM, ENOTDIR, EOVERFLOW)); TEST_P(FuseFstatErrorTest, ReturnedErrorCodeIsCorrect) { ReturnDoesntExistOnLstat(FILENAME); diff --git a/test/fspp/fuse/fstat/FuseFstatParameterTest.cpp b/test/fspp/fuse/fstat/FuseFstatParameterTest.cpp index ba76a081..2d217fa6 100644 --- a/test/fspp/fuse/fstat/FuseFstatParameterTest.cpp +++ b/test/fspp/fuse/fstat/FuseFstatParameterTest.cpp @@ -21,7 +21,7 @@ public: CreateFile(fs.get(), filename); } }; -INSTANTIATE_TEST_CASE_P(FuseFstatParameterTest, FuseFstatParameterTest, Values(0,1,10,1000,1024*1024*1024)); +INSTANTIATE_TEST_SUITE_P(FuseFstatParameterTest, FuseFstatParameterTest, Values(0,1,10,1000,1024*1024*1024)); TEST_P(FuseFstatParameterTest, FileDescriptorIsCorrect) { diff --git a/test/fspp/fuse/fstat/README b/test/fspp/fuse/fstat/README index 79d496a2..a72352a3 100644 --- a/test/fspp/fuse/fstat/README +++ b/test/fspp/fuse/fstat/README @@ -3,4 +3,4 @@ Cite from FUSE documentation on the fgetattr function: Later it may be called for invocations of fstat() too. So we need to issue a create to get our fstat called. Since fstat is currently only called after create, we can't call it directly. -So we can't test the returned values. \ No newline at end of file +So we can't test the returned values. diff --git a/test/fspp/fuse/fsync/FuseFsyncErrorTest.cpp b/test/fspp/fuse/fsync/FuseFsyncErrorTest.cpp index 11c65f92..36a3e17c 100644 --- a/test/fspp/fuse/fsync/FuseFsyncErrorTest.cpp +++ b/test/fspp/fuse/fsync/FuseFsyncErrorTest.cpp @@ -10,7 +10,7 @@ using namespace fspp::fuse; class FuseFsyncErrorTest: public FuseFsyncTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseFsyncErrorTest, FuseFsyncErrorTest, Values(EBADF, EIO, EROFS, EINVAL)); +INSTANTIATE_TEST_SUITE_P(FuseFsyncErrorTest, FuseFsyncErrorTest, Values(EBADF, EIO, EROFS, EINVAL)); TEST_P(FuseFsyncErrorTest, ReturnedErrorIsCorrect) { ReturnIsFileOnLstat(FILENAME); diff --git a/test/fspp/fuse/fsync/FuseFsyncFileDescriptorTest.cpp b/test/fspp/fuse/fsync/FuseFsyncFileDescriptorTest.cpp index 6749e64a..c2765d89 100644 --- a/test/fspp/fuse/fsync/FuseFsyncFileDescriptorTest.cpp +++ b/test/fspp/fuse/fsync/FuseFsyncFileDescriptorTest.cpp @@ -11,7 +11,7 @@ using namespace fspp::fuse; class FuseFsyncFileDescriptorTest: public FuseFsyncTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseFsyncFileDescriptorTest, FuseFsyncFileDescriptorTest, Values(0,1,10,1000,1024*1024*1024)); +INSTANTIATE_TEST_SUITE_P(FuseFsyncFileDescriptorTest, FuseFsyncFileDescriptorTest, Values(0,1,10,1000,1024*1024*1024)); TEST_P(FuseFsyncFileDescriptorTest, FileDescriptorIsCorrect) { diff --git a/test/fspp/fuse/ftruncate/FuseFTruncateErrorTest.cpp b/test/fspp/fuse/ftruncate/FuseFTruncateErrorTest.cpp index 4f96c2db..587293e6 100644 --- a/test/fspp/fuse/ftruncate/FuseFTruncateErrorTest.cpp +++ b/test/fspp/fuse/ftruncate/FuseFTruncateErrorTest.cpp @@ -11,7 +11,7 @@ using namespace fspp::fuse; class FuseFTruncateErrorTest: public FuseFTruncateTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseFTruncateErrorTest, FuseFTruncateErrorTest, Values(EACCES, EFAULT, EFBIG, EINTR, EINVAL, EIO, EISDIR, ELOOP, ENAMETOOLONG, ENOENT, ENOTDIR, EPERM, EROFS, ETXTBSY, EBADF)); +INSTANTIATE_TEST_SUITE_P(FuseFTruncateErrorTest, FuseFTruncateErrorTest, Values(EACCES, EFAULT, EFBIG, EINTR, EINVAL, EIO, EISDIR, ELOOP, ENAMETOOLONG, ENOENT, ENOTDIR, EPERM, EROFS, ETXTBSY, EBADF)); TEST_P(FuseFTruncateErrorTest, ReturnedErrorIsCorrect) { ReturnIsFileOnLstat(FILENAME); diff --git a/test/fspp/fuse/ftruncate/FuseFTruncateFileDescriptorTest.cpp b/test/fspp/fuse/ftruncate/FuseFTruncateFileDescriptorTest.cpp index 9a540aff..673a82cb 100644 --- a/test/fspp/fuse/ftruncate/FuseFTruncateFileDescriptorTest.cpp +++ b/test/fspp/fuse/ftruncate/FuseFTruncateFileDescriptorTest.cpp @@ -12,7 +12,7 @@ using namespace fspp::fuse; class FuseFTruncateFileDescriptorTest: public FuseFTruncateTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseFTruncateFileDescriptorTest, FuseFTruncateFileDescriptorTest, Values(0,1,10,1000,1024*1024*1024)); +INSTANTIATE_TEST_SUITE_P(FuseFTruncateFileDescriptorTest, FuseFTruncateFileDescriptorTest, Values(0,1,10,1000,1024*1024*1024)); TEST_P(FuseFTruncateFileDescriptorTest, FileDescriptorIsCorrect) { diff --git a/test/fspp/fuse/ftruncate/FuseFTruncateSizeTest.cpp b/test/fspp/fuse/ftruncate/FuseFTruncateSizeTest.cpp index ea8a7df3..7560c581 100644 --- a/test/fspp/fuse/ftruncate/FuseFTruncateSizeTest.cpp +++ b/test/fspp/fuse/ftruncate/FuseFTruncateSizeTest.cpp @@ -7,7 +7,7 @@ using ::testing::Values; class FuseFTruncateSizeTest: public FuseFTruncateTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseFTruncateSizeTest, FuseFTruncateSizeTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseFTruncateSizeTest, FuseFTruncateSizeTest, Values( fspp::num_bytes_t(0), fspp::num_bytes_t(1), fspp::num_bytes_t(10), diff --git a/test/fspp/fuse/lstat/FuseLstatErrorTest.cpp b/test/fspp/fuse/lstat/FuseLstatErrorTest.cpp index ae259313..499536ff 100644 --- a/test/fspp/fuse/lstat/FuseLstatErrorTest.cpp +++ b/test/fspp/fuse/lstat/FuseLstatErrorTest.cpp @@ -14,7 +14,7 @@ using fspp::fuse::FuseErrnoException; class FuseLstatErrorTest: public FuseLstatTest, public WithParamInterface { public: }; -INSTANTIATE_TEST_CASE_P(LstatErrorCodes, FuseLstatErrorTest, Values(EACCES, EBADF, EFAULT, ELOOP, ENAMETOOLONG, ENOENT, ENOMEM, ENOTDIR, EOVERFLOW, EINVAL, ENOTDIR)); +INSTANTIATE_TEST_SUITE_P(LstatErrorCodes, FuseLstatErrorTest, Values(EACCES, EBADF, EFAULT, ELOOP, ENAMETOOLONG, ENOENT, ENOMEM, ENOTDIR, EOVERFLOW, EINVAL, ENOTDIR)); TEST_F(FuseLstatErrorTest, ReturnNoError) { EXPECT_CALL(*fsimpl, lstat(StrEq(FILENAME), _)).Times(AtLeast(1)).WillRepeatedly(ReturnIsFile); diff --git a/test/fspp/fuse/lstat/FuseLstatReturnAtimeTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnAtimeTest.cpp index daeac1b6..b5f6f5ce 100644 --- a/test/fspp/fuse/lstat/FuseLstatReturnAtimeTest.cpp +++ b/test/fspp/fuse/lstat/FuseLstatReturnAtimeTest.cpp @@ -11,7 +11,7 @@ private: stat->st_atim.tv_nsec = 0; } }; -INSTANTIATE_TEST_CASE_P(FuseLstatReturnATimeTest, FuseLstatReturnATimeTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseLstatReturnATimeTest, FuseLstatReturnATimeTest, Values( 0, 100, 1416496809, // current timestamp as of writing the test diff --git a/test/fspp/fuse/lstat/FuseLstatReturnCtimeTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnCtimeTest.cpp index 25cfda05..051c1487 100644 --- a/test/fspp/fuse/lstat/FuseLstatReturnCtimeTest.cpp +++ b/test/fspp/fuse/lstat/FuseLstatReturnCtimeTest.cpp @@ -11,7 +11,7 @@ private: stat->st_ctim.tv_nsec = 0; } }; -INSTANTIATE_TEST_CASE_P(FuseLstatReturnCtimeTest, FuseLstatReturnCtimeTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseLstatReturnCtimeTest, FuseLstatReturnCtimeTest, Values( 0, 100, 1416496809, // current timestamp as of writing the test diff --git a/test/fspp/fuse/lstat/FuseLstatReturnGidTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnGidTest.cpp index 56314c8e..b7721778 100644 --- a/test/fspp/fuse/lstat/FuseLstatReturnGidTest.cpp +++ b/test/fspp/fuse/lstat/FuseLstatReturnGidTest.cpp @@ -9,7 +9,7 @@ private: stat->st_gid = value; } }; -INSTANTIATE_TEST_CASE_P(FuseLstatReturnGidTest, FuseLstatReturnGidTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseLstatReturnGidTest, FuseLstatReturnGidTest, Values( 0, 10 )); diff --git a/test/fspp/fuse/lstat/FuseLstatReturnModeTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnModeTest.cpp index e7934b61..87d4d28f 100644 --- a/test/fspp/fuse/lstat/FuseLstatReturnModeTest.cpp +++ b/test/fspp/fuse/lstat/FuseLstatReturnModeTest.cpp @@ -11,7 +11,7 @@ public: }); } }; -INSTANTIATE_TEST_CASE_P(FuseLstatReturnModeTest, FuseLstatReturnModeTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseLstatReturnModeTest, FuseLstatReturnModeTest, Values( S_IFREG, S_IFDIR, S_IFREG | S_IRUSR | S_IWGRP | S_IXOTH, // a file with some access bits set diff --git a/test/fspp/fuse/lstat/FuseLstatReturnMtimeTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnMtimeTest.cpp index b253a5a8..a01f3180 100644 --- a/test/fspp/fuse/lstat/FuseLstatReturnMtimeTest.cpp +++ b/test/fspp/fuse/lstat/FuseLstatReturnMtimeTest.cpp @@ -11,7 +11,7 @@ private: stat->st_mtim.tv_nsec = 0; } }; -INSTANTIATE_TEST_CASE_P(FuseLstatReturnMtimeTest, FuseLstatReturnMtimeTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseLstatReturnMtimeTest, FuseLstatReturnMtimeTest, Values( 0, 100, 1416496809, // current timestamp as of writing the test diff --git a/test/fspp/fuse/lstat/FuseLstatReturnNlinkTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnNlinkTest.cpp index 9955c052..cb0e7fc9 100644 --- a/test/fspp/fuse/lstat/FuseLstatReturnNlinkTest.cpp +++ b/test/fspp/fuse/lstat/FuseLstatReturnNlinkTest.cpp @@ -9,7 +9,7 @@ private: stat->st_nlink = value; } }; -INSTANTIATE_TEST_CASE_P(FuseLstatReturnNlinkTest, FuseLstatReturnNlinkTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseLstatReturnNlinkTest, FuseLstatReturnNlinkTest, Values( 1, 2, 5, diff --git a/test/fspp/fuse/lstat/FuseLstatReturnSizeTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnSizeTest.cpp index b3b24ab2..40dd7f0d 100644 --- a/test/fspp/fuse/lstat/FuseLstatReturnSizeTest.cpp +++ b/test/fspp/fuse/lstat/FuseLstatReturnSizeTest.cpp @@ -9,7 +9,7 @@ private: stat->st_size = value.value(); } }; -INSTANTIATE_TEST_CASE_P(FuseLstatReturnSizeTest, FuseLstatReturnSizeTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseLstatReturnSizeTest, FuseLstatReturnSizeTest, Values( fspp::num_bytes_t(0), fspp::num_bytes_t(1), fspp::num_bytes_t(4096), diff --git a/test/fspp/fuse/lstat/FuseLstatReturnUidTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnUidTest.cpp index fc13fd95..25ca37bb 100644 --- a/test/fspp/fuse/lstat/FuseLstatReturnUidTest.cpp +++ b/test/fspp/fuse/lstat/FuseLstatReturnUidTest.cpp @@ -9,7 +9,7 @@ private: stat->st_uid = value; } }; -INSTANTIATE_TEST_CASE_P(FuseLstatReturnUidTest, FuseLstatReturnUidTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseLstatReturnUidTest, FuseLstatReturnUidTest, Values( 0, 10 )); diff --git a/test/fspp/fuse/mkdir/FuseMkdirErrorTest.cpp b/test/fspp/fuse/mkdir/FuseMkdirErrorTest.cpp index 8d07d5cc..528ef512 100644 --- a/test/fspp/fuse/mkdir/FuseMkdirErrorTest.cpp +++ b/test/fspp/fuse/mkdir/FuseMkdirErrorTest.cpp @@ -12,7 +12,7 @@ using namespace fspp::fuse; class FuseMkdirErrorTest: public FuseMkdirTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseMkdirErrorTest, FuseMkdirErrorTest, Values(EACCES, EDQUOT, EEXIST, EFAULT, ELOOP, EMLINK, ENAMETOOLONG, ENOENT, ENOMEM, ENOSPC, ENOTDIR, EPERM, EROFS, EBADF)); +INSTANTIATE_TEST_SUITE_P(FuseMkdirErrorTest, FuseMkdirErrorTest, Values(EACCES, EDQUOT, EEXIST, EFAULT, ELOOP, EMLINK, ENAMETOOLONG, ENOENT, ENOMEM, ENOSPC, ENOTDIR, EPERM, EROFS, EBADF)); TEST_F(FuseMkdirErrorTest, NoError) { ReturnDoesntExistOnLstat(DIRNAME); diff --git a/test/fspp/fuse/mkdir/FuseMkdirModeTest.cpp b/test/fspp/fuse/mkdir/FuseMkdirModeTest.cpp index 526d4ca6..0e3774be 100644 --- a/test/fspp/fuse/mkdir/FuseMkdirModeTest.cpp +++ b/test/fspp/fuse/mkdir/FuseMkdirModeTest.cpp @@ -7,7 +7,7 @@ using ::testing::Values; class FuseMkdirModeTest: public FuseMkdirTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseMkdirModeTest, FuseMkdirModeTest, Values(0, S_IRUSR, S_IRGRP, S_IXOTH, S_IRUSR|S_IRGRP|S_IROTH|S_IRGRP)); +INSTANTIATE_TEST_SUITE_P(FuseMkdirModeTest, FuseMkdirModeTest, Values(0, S_IRUSR, S_IRGRP, S_IXOTH, S_IRUSR|S_IRGRP|S_IROTH|S_IRGRP)); TEST_P(FuseMkdirModeTest, Mkdir) { diff --git a/test/fspp/fuse/openFile/FuseOpenErrorTest.cpp b/test/fspp/fuse/openFile/FuseOpenErrorTest.cpp index 784fd17c..3c069687 100644 --- a/test/fspp/fuse/openFile/FuseOpenErrorTest.cpp +++ b/test/fspp/fuse/openFile/FuseOpenErrorTest.cpp @@ -13,7 +13,7 @@ using namespace fspp::fuse; class FuseOpenErrorTest: public FuseOpenTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseOpenErrorTest, FuseOpenErrorTest, Values(EACCES, EDQUOT, EEXIST, EFAULT, EFBIG, EINTR, EOVERFLOW, EINVAL, EISDIR, ELOOP, EMFILE, ENAMETOOLONG, ENFILE, ENODEV, ENOENT, ENOMEM, ENOSPC, ENOTDIR, ENXIO, EOPNOTSUPP, EPERM, EROFS, ETXTBSY, EWOULDBLOCK, EBADF, ENOTDIR)); +INSTANTIATE_TEST_SUITE_P(FuseOpenErrorTest, FuseOpenErrorTest, Values(EACCES, EDQUOT, EEXIST, EFAULT, EFBIG, EINTR, EOVERFLOW, EINVAL, EISDIR, ELOOP, EMFILE, ENAMETOOLONG, ENFILE, ENODEV, ENOENT, ENOMEM, ENOSPC, ENOTDIR, ENXIO, EOPNOTSUPP, EPERM, EROFS, ETXTBSY, EWOULDBLOCK, EBADF, ENOTDIR)); TEST_F(FuseOpenErrorTest, ReturnNoError) { ReturnIsFileOnLstat(FILENAME); diff --git a/test/fspp/fuse/openFile/FuseOpenFileDescriptorTest.cpp b/test/fspp/fuse/openFile/FuseOpenFileDescriptorTest.cpp index b386f4e6..079cedc4 100644 --- a/test/fspp/fuse/openFile/FuseOpenFileDescriptorTest.cpp +++ b/test/fspp/fuse/openFile/FuseOpenFileDescriptorTest.cpp @@ -30,7 +30,7 @@ private: EXPECT_EQ(1, retval) << "Reading file failed"; } }; -INSTANTIATE_TEST_CASE_P(FuseOpenFileDescriptorTest, FuseOpenFileDescriptorTest, Values(0, 2, 5, 1000, 1024*1024*1024)); +INSTANTIATE_TEST_SUITE_P(FuseOpenFileDescriptorTest, FuseOpenFileDescriptorTest, Values(0, 2, 5, 1000, 1024*1024*1024)); TEST_P(FuseOpenFileDescriptorTest, TestReturnedFileDescriptor) { ReturnIsFileOnLstatWithSize(FILENAME, fspp::num_bytes_t(1)); diff --git a/test/fspp/fuse/openFile/FuseOpenFlagsTest.cpp b/test/fspp/fuse/openFile/FuseOpenFlagsTest.cpp index 21f3fa97..fe4e6768 100644 --- a/test/fspp/fuse/openFile/FuseOpenFlagsTest.cpp +++ b/test/fspp/fuse/openFile/FuseOpenFlagsTest.cpp @@ -7,7 +7,7 @@ using ::testing::Return; class FuseOpenFlagsTest: public FuseOpenTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseOpenFlagsTest, FuseOpenFlagsTest, Values(O_RDWR, O_RDONLY, O_WRONLY)); +INSTANTIATE_TEST_SUITE_P(FuseOpenFlagsTest, FuseOpenFlagsTest, Values(O_RDWR, O_RDONLY, O_WRONLY)); TEST_P(FuseOpenFlagsTest, testFlags) { ReturnIsFileOnLstat(FILENAME); diff --git a/test/fspp/fuse/read/FuseReadErrorTest.cpp b/test/fspp/fuse/read/FuseReadErrorTest.cpp index da864e5b..f9e34986 100644 --- a/test/fspp/fuse/read/FuseReadErrorTest.cpp +++ b/test/fspp/fuse/read/FuseReadErrorTest.cpp @@ -23,7 +23,7 @@ public: OnOpenReturnFileDescriptor(FILENAME, 0); } }; -INSTANTIATE_TEST_CASE_P(FuseReadErrorTest, FuseReadErrorTest, Values(EAGAIN, EBADF, EFAULT, EINTR, EINVAL, EIO, EISDIR, EOVERFLOW, ESPIPE, ENXIO)); +INSTANTIATE_TEST_SUITE_P(FuseReadErrorTest, FuseReadErrorTest, Values(EAGAIN, EBADF, EFAULT, EINTR, EINVAL, EIO, EISDIR, EOVERFLOW, ESPIPE, ENXIO)); TEST_P(FuseReadErrorTest, ReturnErrorOnFirstReadCall) { diff --git a/test/fspp/fuse/read/FuseReadFileDescriptorTest.cpp b/test/fspp/fuse/read/FuseReadFileDescriptorTest.cpp index 03809775..0c54c795 100644 --- a/test/fspp/fuse/read/FuseReadFileDescriptorTest.cpp +++ b/test/fspp/fuse/read/FuseReadFileDescriptorTest.cpp @@ -11,7 +11,7 @@ using namespace fspp::fuse; class FuseReadFileDescriptorTest: public FuseReadTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseReadFileDescriptorTest, FuseReadFileDescriptorTest, Values(0,1,10,1000,1024*1024*1024)); +INSTANTIATE_TEST_SUITE_P(FuseReadFileDescriptorTest, FuseReadFileDescriptorTest, Values(0,1,10,1000,1024*1024*1024)); TEST_P(FuseReadFileDescriptorTest, FileDescriptorIsCorrect) { diff --git a/test/fspp/fuse/read/FuseReadReturnedDataTest.cpp b/test/fspp/fuse/read/FuseReadReturnedDataTest.cpp index c497e2e1..63f0cdd0 100644 --- a/test/fspp/fuse/read/FuseReadReturnedDataTest.cpp +++ b/test/fspp/fuse/read/FuseReadReturnedDataTest.cpp @@ -61,7 +61,7 @@ public: return testFile->read(buf, count, offset); }); }; -INSTANTIATE_TEST_CASE_P(FuseReadReturnedDataTest, FuseReadReturnedDataTest, Combine( +INSTANTIATE_TEST_SUITE_P(FuseReadReturnedDataTest, FuseReadReturnedDataTest, Combine( Values(fspp::num_bytes_t(0), fspp::num_bytes_t(1), fspp::num_bytes_t(10), fspp::num_bytes_t(1000), fspp::num_bytes_t(1024), fspp::num_bytes_t(10*1024*1024)), Values(fspp::num_bytes_t(0), fspp::num_bytes_t(1), fspp::num_bytes_t(10), fspp::num_bytes_t(1024), fspp::num_bytes_t(10*1024*1024)), Values(fspp::num_bytes_t(0), fspp::num_bytes_t(1), fspp::num_bytes_t(10), fspp::num_bytes_t(1024), fspp::num_bytes_t(10*1024*1024)) diff --git a/test/fspp/fuse/readDir/FuseReadDirErrorTest.cpp b/test/fspp/fuse/readDir/FuseReadDirErrorTest.cpp index 5de5872f..4d7298e3 100644 --- a/test/fspp/fuse/readDir/FuseReadDirErrorTest.cpp +++ b/test/fspp/fuse/readDir/FuseReadDirErrorTest.cpp @@ -13,7 +13,7 @@ using namespace fspp::fuse; class FuseReadDirErrorTest: public FuseReadDirTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseReadDirErrorTest, FuseReadDirErrorTest, Values(EACCES, EBADF, EMFILE, ENFILE, ENOMEM, ENOTDIR, EFAULT, EINVAL)); +INSTANTIATE_TEST_SUITE_P(FuseReadDirErrorTest, FuseReadDirErrorTest, Values(EACCES, EBADF, EMFILE, ENFILE, ENOMEM, ENOTDIR, EFAULT, EINVAL)); //TODO On ENOENT, libfuse doesn't return the ENOENT error, but returns a success response with an empty directory. Why? diff --git a/test/fspp/fuse/readDir/FuseReadDirReturnTest.cpp b/test/fspp/fuse/readDir/FuseReadDirReturnTest.cpp index 367e4239..9f05659b 100644 --- a/test/fspp/fuse/readDir/FuseReadDirReturnTest.cpp +++ b/test/fspp/fuse/readDir/FuseReadDirReturnTest.cpp @@ -33,7 +33,7 @@ public: EXPECT_EQ(direntries, *returned_dir_entries); } }; -INSTANTIATE_TEST_CASE_P(FuseReadDirReturnTest, FuseReadDirReturnTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseReadDirReturnTest, FuseReadDirReturnTest, Values( vector({}), vector({"oneentry"}), vector({"twoentries_1", "twoentries_2"}), diff --git a/test/fspp/fuse/rename/FuseRenameErrorTest.cpp b/test/fspp/fuse/rename/FuseRenameErrorTest.cpp index db0e35a0..e8903ad0 100644 --- a/test/fspp/fuse/rename/FuseRenameErrorTest.cpp +++ b/test/fspp/fuse/rename/FuseRenameErrorTest.cpp @@ -10,7 +10,7 @@ using namespace fspp::fuse; class FuseRenameErrorTest: public FuseRenameTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseRenameErrorTest, FuseRenameErrorTest, Values(EACCES, EBUSY, EDQUOT, EFAULT, EINVAL, EISDIR, ELOOP, EMLINK, ENAMETOOLONG, ENOENT, ENOMEM, ENOSPC, ENOTDIR, ENOTEMPTY, EEXIST, EPERM, EROFS, EXDEV, EBADF, ENOTDIR)); +INSTANTIATE_TEST_SUITE_P(FuseRenameErrorTest, FuseRenameErrorTest, Values(EACCES, EBUSY, EDQUOT, EFAULT, EINVAL, EISDIR, ELOOP, EMLINK, ENAMETOOLONG, ENOENT, ENOMEM, ENOSPC, ENOTDIR, ENOTEMPTY, EEXIST, EPERM, EROFS, EXDEV, EBADF, ENOTDIR)); TEST_P(FuseRenameErrorTest, ReturnedErrorIsCorrect) { ReturnIsFileOnLstat(FILENAME1); diff --git a/test/fspp/fuse/rmdir/FuseRmdirErrorTest.cpp b/test/fspp/fuse/rmdir/FuseRmdirErrorTest.cpp index 771de2e8..cabf2cdb 100644 --- a/test/fspp/fuse/rmdir/FuseRmdirErrorTest.cpp +++ b/test/fspp/fuse/rmdir/FuseRmdirErrorTest.cpp @@ -10,7 +10,7 @@ using namespace fspp::fuse; class FuseRmdirErrorTest: public FuseRmdirTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseRmdirErrorTest, FuseRmdirErrorTest, Values(EACCES, EBUSY, EFAULT, EINVAL, ELOOP, ENAMETOOLONG, ENOENT, ENOMEM, ENOTDIR, ENOTEMPTY, EPERM, EROFS)); +INSTANTIATE_TEST_SUITE_P(FuseRmdirErrorTest, FuseRmdirErrorTest, Values(EACCES, EBUSY, EFAULT, EINVAL, ELOOP, ENAMETOOLONG, ENOENT, ENOMEM, ENOTDIR, ENOTEMPTY, EPERM, EROFS)); TEST_P(FuseRmdirErrorTest, ReturnedErrorIsCorrect) { ReturnIsDirOnLstat(DIRNAME); diff --git a/test/fspp/fuse/statfs/FuseStatfsErrorTest.cpp b/test/fspp/fuse/statfs/FuseStatfsErrorTest.cpp index 56bcae7a..d30c827c 100644 --- a/test/fspp/fuse/statfs/FuseStatfsErrorTest.cpp +++ b/test/fspp/fuse/statfs/FuseStatfsErrorTest.cpp @@ -13,7 +13,7 @@ using fspp::fuse::FuseErrnoException; class FuseStatfsErrorTest: public FuseStatfsTest, public WithParamInterface { public: }; -INSTANTIATE_TEST_CASE_P(FuseStatfsErrorTest, FuseStatfsErrorTest, Values(EACCES, EBADF, EFAULT, EINTR, EIO, ELOOP, ENAMETOOLONG, ENOENT, ENOMEM, ENOSYS, ENOTDIR, EOVERFLOW)); +INSTANTIATE_TEST_SUITE_P(FuseStatfsErrorTest, FuseStatfsErrorTest, Values(EACCES, EBADF, EFAULT, EINTR, EIO, ELOOP, ENAMETOOLONG, ENOENT, ENOMEM, ENOSYS, ENOTDIR, EOVERFLOW)); TEST_F(FuseStatfsErrorTest, ReturnNoError) { ReturnIsFileOnLstat(FILENAME); diff --git a/test/fspp/fuse/statfs/FuseStatfsReturnBavailTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnBavailTest.cpp index 76ce39ea..733fee72 100644 --- a/test/fspp/fuse/statfs/FuseStatfsReturnBavailTest.cpp +++ b/test/fspp/fuse/statfs/FuseStatfsReturnBavailTest.cpp @@ -9,7 +9,7 @@ private: stat->f_bavail = value; } }; -INSTANTIATE_TEST_CASE_P(FuseStatfsReturnBavailTest, FuseStatfsReturnBavailTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseStatfsReturnBavailTest, FuseStatfsReturnBavailTest, Values( 0, 10, 256, diff --git a/test/fspp/fuse/statfs/FuseStatfsReturnBfreeTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnBfreeTest.cpp index e7473e96..9e3ef5c1 100644 --- a/test/fspp/fuse/statfs/FuseStatfsReturnBfreeTest.cpp +++ b/test/fspp/fuse/statfs/FuseStatfsReturnBfreeTest.cpp @@ -9,7 +9,7 @@ private: stat->f_bfree = value; } }; -INSTANTIATE_TEST_CASE_P(FuseStatfsReturnBfreeTest, FuseStatfsReturnBfreeTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseStatfsReturnBfreeTest, FuseStatfsReturnBfreeTest, Values( 0, 10, 256, diff --git a/test/fspp/fuse/statfs/FuseStatfsReturnBlocksTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnBlocksTest.cpp index e8dcecca..f77a80ee 100644 --- a/test/fspp/fuse/statfs/FuseStatfsReturnBlocksTest.cpp +++ b/test/fspp/fuse/statfs/FuseStatfsReturnBlocksTest.cpp @@ -9,7 +9,7 @@ private: stat->f_blocks = value; } }; -INSTANTIATE_TEST_CASE_P(FuseStatfsReturnBlocksTest, FuseStatfsReturnBlocksTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseStatfsReturnBlocksTest, FuseStatfsReturnBlocksTest, Values( 0, 10, 256, diff --git a/test/fspp/fuse/statfs/FuseStatfsReturnBsizeTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnBsizeTest.cpp index ccdb1278..bbb84161 100644 --- a/test/fspp/fuse/statfs/FuseStatfsReturnBsizeTest.cpp +++ b/test/fspp/fuse/statfs/FuseStatfsReturnBsizeTest.cpp @@ -9,7 +9,7 @@ private: stat->f_bsize = value; } }; -INSTANTIATE_TEST_CASE_P(FuseStatfsReturnBsizeTest, FuseStatfsReturnBsizeTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseStatfsReturnBsizeTest, FuseStatfsReturnBsizeTest, Values( 0, 10, 256, diff --git a/test/fspp/fuse/statfs/FuseStatfsReturnFfreeTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnFfreeTest.cpp index 3819e241..9cf015a2 100644 --- a/test/fspp/fuse/statfs/FuseStatfsReturnFfreeTest.cpp +++ b/test/fspp/fuse/statfs/FuseStatfsReturnFfreeTest.cpp @@ -9,7 +9,7 @@ private: stat->f_ffree = value; } }; -INSTANTIATE_TEST_CASE_P(FuseStatfsReturnFfreeTest, FuseStatfsReturnFfreeTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseStatfsReturnFfreeTest, FuseStatfsReturnFfreeTest, Values( 0, 10, 256, diff --git a/test/fspp/fuse/statfs/FuseStatfsReturnFilesTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnFilesTest.cpp index 344f2483..acef1dff 100644 --- a/test/fspp/fuse/statfs/FuseStatfsReturnFilesTest.cpp +++ b/test/fspp/fuse/statfs/FuseStatfsReturnFilesTest.cpp @@ -9,7 +9,7 @@ private: stat->f_files = value; } }; -INSTANTIATE_TEST_CASE_P(FuseStatfsReturnFilesTest, FuseStatfsReturnFilesTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseStatfsReturnFilesTest, FuseStatfsReturnFilesTest, Values( 0, 10, 256, diff --git a/test/fspp/fuse/statfs/FuseStatfsReturnNamemaxTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnNamemaxTest.cpp index c663e586..ce180c3a 100644 --- a/test/fspp/fuse/statfs/FuseStatfsReturnNamemaxTest.cpp +++ b/test/fspp/fuse/statfs/FuseStatfsReturnNamemaxTest.cpp @@ -9,7 +9,7 @@ private: stat->f_namemax = value; } }; -INSTANTIATE_TEST_CASE_P(FuseStatfsReturnNamemaxTest, FuseStatfsReturnNamemaxTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseStatfsReturnNamemaxTest, FuseStatfsReturnNamemaxTest, Values( 0, 10, 256, diff --git a/test/fspp/fuse/truncate/FuseTruncateErrorTest.cpp b/test/fspp/fuse/truncate/FuseTruncateErrorTest.cpp index e6a35b6d..e6392d27 100644 --- a/test/fspp/fuse/truncate/FuseTruncateErrorTest.cpp +++ b/test/fspp/fuse/truncate/FuseTruncateErrorTest.cpp @@ -11,7 +11,7 @@ using namespace fspp::fuse; class FuseTruncateErrorTest: public FuseTruncateTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseTruncateErrorTest, FuseTruncateErrorTest, Values(EACCES, EFAULT, EFBIG, EINTR, EINVAL, EIO, EISDIR, ELOOP, ENAMETOOLONG, ENOENT, ENOTDIR, EPERM, EROFS, ETXTBSY)); +INSTANTIATE_TEST_SUITE_P(FuseTruncateErrorTest, FuseTruncateErrorTest, Values(EACCES, EFAULT, EFBIG, EINTR, EINVAL, EIO, EISDIR, ELOOP, ENAMETOOLONG, ENOENT, ENOTDIR, EPERM, EROFS, ETXTBSY)); TEST_P(FuseTruncateErrorTest, ReturnedErrorIsCorrect) { ReturnIsFileOnLstat(FILENAME); diff --git a/test/fspp/fuse/truncate/FuseTruncateSizeTest.cpp b/test/fspp/fuse/truncate/FuseTruncateSizeTest.cpp index f716ee75..036c5ea2 100644 --- a/test/fspp/fuse/truncate/FuseTruncateSizeTest.cpp +++ b/test/fspp/fuse/truncate/FuseTruncateSizeTest.cpp @@ -8,7 +8,7 @@ using ::testing::Eq; class FuseTruncateSizeTest: public FuseTruncateTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseTruncateSizeTest, FuseTruncateSizeTest, Values( +INSTANTIATE_TEST_SUITE_P(FuseTruncateSizeTest, FuseTruncateSizeTest, Values( fspp::num_bytes_t(0), fspp::num_bytes_t(1), fspp::num_bytes_t(10), diff --git a/test/fspp/fuse/unlink/FuseUnlinkErrorTest.cpp b/test/fspp/fuse/unlink/FuseUnlinkErrorTest.cpp index 0082c0a4..799413d7 100644 --- a/test/fspp/fuse/unlink/FuseUnlinkErrorTest.cpp +++ b/test/fspp/fuse/unlink/FuseUnlinkErrorTest.cpp @@ -10,7 +10,7 @@ using namespace fspp::fuse; class FuseUnlinkErrorTest: public FuseUnlinkTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseUnlinkErrorTest, FuseUnlinkErrorTest, Values(EACCES, EBUSY, EFAULT, EIO, EISDIR, ELOOP, ENAMETOOLONG, ENOENT, ENOMEM, ENOTDIR, EPERM, EROFS, EINVAL)); +INSTANTIATE_TEST_SUITE_P(FuseUnlinkErrorTest, FuseUnlinkErrorTest, Values(EACCES, EBUSY, EFAULT, EIO, EISDIR, ELOOP, ENAMETOOLONG, ENOENT, ENOMEM, ENOTDIR, EPERM, EROFS, EINVAL)); TEST_P(FuseUnlinkErrorTest, ReturnedErrorIsCorrect) { ReturnIsFileOnLstat(FILENAME); diff --git a/test/fspp/fuse/utimens/FuseUtimensErrorTest.cpp b/test/fspp/fuse/utimens/FuseUtimensErrorTest.cpp index bd5b068e..d00e56df 100644 --- a/test/fspp/fuse/utimens/FuseUtimensErrorTest.cpp +++ b/test/fspp/fuse/utimens/FuseUtimensErrorTest.cpp @@ -11,7 +11,7 @@ using namespace fspp::fuse; class FuseUtimensErrorTest: public FuseUtimensTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseUtimensErrorTest, FuseUtimensErrorTest, Values(EACCES, ENOENT, EPERM, EROFS)); +INSTANTIATE_TEST_SUITE_P(FuseUtimensErrorTest, FuseUtimensErrorTest, Values(EACCES, ENOENT, EPERM, EROFS)); TEST_P(FuseUtimensErrorTest, ReturnedErrorIsCorrect) { ReturnIsFileOnLstat(FILENAME); diff --git a/test/fspp/fuse/utimens/FuseUtimensTimeParameterTest.cpp b/test/fspp/fuse/utimens/FuseUtimensTimeParameterTest.cpp index f8a60728..80066c96 100644 --- a/test/fspp/fuse/utimens/FuseUtimensTimeParameterTest.cpp +++ b/test/fspp/fuse/utimens/FuseUtimensTimeParameterTest.cpp @@ -17,7 +17,7 @@ const std::array TIMEVAL7 = {FuseUtimensTest::makeTimespec(0,0), Fu const std::array TIMEVAL8 = {FuseUtimensTest::makeTimespec(0,0), FuseUtimensTest::makeTimespec(1000,1000)}; const std::array TIMEVAL9 = {FuseUtimensTest::makeTimespec(1417196126,123000), FuseUtimensTest::makeTimespec(1417109713,321000)}; // current timestamp and the day before as of writing this test case const std::array TIMEVAL10 = {FuseUtimensTest::makeTimespec(UINT64_C(1024)*1024*1024*1024,999000), FuseUtimensTest::makeTimespec(UINT64_C(2*1024)*1024*1024*1024,321000)}; // needs 64bit for timestamp representation -INSTANTIATE_TEST_CASE_P(FuseUtimensTimeParameterTest, FuseUtimensTimeParameterTest, +INSTANTIATE_TEST_SUITE_P(FuseUtimensTimeParameterTest, FuseUtimensTimeParameterTest, Values(TIMEVAL1, TIMEVAL2, TIMEVAL3, TIMEVAL4, TIMEVAL5, TIMEVAL6, TIMEVAL7, TIMEVAL8, TIMEVAL9, TIMEVAL10)); diff --git a/test/fspp/fuse/write/FuseWriteDataTest.cpp b/test/fspp/fuse/write/FuseWriteDataTest.cpp index ecd2a981..ac857bcd 100644 --- a/test/fspp/fuse/write/FuseWriteDataTest.cpp +++ b/test/fspp/fuse/write/FuseWriteDataTest.cpp @@ -58,7 +58,7 @@ public: testFile->write(buf, count, offset); }); }; -INSTANTIATE_TEST_CASE_P(FuseWriteDataTest, FuseWriteDataTest, Combine( +INSTANTIATE_TEST_SUITE_P(FuseWriteDataTest, FuseWriteDataTest, Combine( Values(fspp::num_bytes_t(0), fspp::num_bytes_t(1), fspp::num_bytes_t(10), fspp::num_bytes_t(1000), fspp::num_bytes_t(1024), fspp::num_bytes_t(10*1024*1024)), Values(fspp::num_bytes_t(0), fspp::num_bytes_t(1), fspp::num_bytes_t(10), fspp::num_bytes_t(1024), fspp::num_bytes_t(10*1024*1024)), Values(fspp::num_bytes_t(0), fspp::num_bytes_t(1), fspp::num_bytes_t(10), fspp::num_bytes_t(1024), fspp::num_bytes_t(10*1024*1024)) diff --git a/test/fspp/fuse/write/FuseWriteErrorTest.cpp b/test/fspp/fuse/write/FuseWriteErrorTest.cpp index 6886e400..88f772bd 100644 --- a/test/fspp/fuse/write/FuseWriteErrorTest.cpp +++ b/test/fspp/fuse/write/FuseWriteErrorTest.cpp @@ -23,7 +23,7 @@ public: OnOpenReturnFileDescriptor(FILENAME, 0); } }; -INSTANTIATE_TEST_CASE_P(FuseWriteErrorTest, FuseWriteErrorTest, Values(EAGAIN, EBADF, EDESTADDRREQ, EDQUOT, EFAULT, EFBIG, EINTR, EINVAL, EIO, ENOSPC, EPIPE, EOVERFLOW, ESPIPE, ENXIO)); +INSTANTIATE_TEST_SUITE_P(FuseWriteErrorTest, FuseWriteErrorTest, Values(EAGAIN, EBADF, EDESTADDRREQ, EDQUOT, EFAULT, EFBIG, EINTR, EINVAL, EIO, ENOSPC, EPIPE, EOVERFLOW, ESPIPE, ENXIO)); TEST_P(FuseWriteErrorTest, ReturnErrorOnFirstWriteCall) { diff --git a/test/fspp/fuse/write/FuseWriteFileDescriptorTest.cpp b/test/fspp/fuse/write/FuseWriteFileDescriptorTest.cpp index 50158d44..6b91892b 100644 --- a/test/fspp/fuse/write/FuseWriteFileDescriptorTest.cpp +++ b/test/fspp/fuse/write/FuseWriteFileDescriptorTest.cpp @@ -12,7 +12,7 @@ using namespace fspp::fuse; class FuseWriteFileDescriptorTest: public FuseWriteTest, public WithParamInterface { }; -INSTANTIATE_TEST_CASE_P(FuseWriteFileDescriptorTest, FuseWriteFileDescriptorTest, Values(0,1,10,1000,1024*1024*1024)); +INSTANTIATE_TEST_SUITE_P(FuseWriteFileDescriptorTest, FuseWriteFileDescriptorTest, Values(0,1,10,1000,1024*1024*1024)); TEST_P(FuseWriteFileDescriptorTest, FileDescriptorIsCorrect) { diff --git a/test/fspp/testutils/FuseTest.cpp b/test/fspp/testutils/FuseTest.cpp index 55a27f45..81b9dc66 100644 --- a/test/fspp/testutils/FuseTest.cpp +++ b/test/fspp/testutils/FuseTest.cpp @@ -129,4 +129,4 @@ void FuseTest::ReturnIsFileOnFstat(int descriptor) { void FuseTest::ReturnIsFileOnFstatWithSize(int descriptor, fspp::num_bytes_t size) { EXPECT_CALL(*fsimpl, fstat(descriptor, _)).WillRepeatedly(ReturnIsFileFstatWithSize(size)); -} \ No newline at end of file +} diff --git a/test/gitversion/ParserTest.cpp b/test/gitversion/ParserTest.cpp index 03e2b8d4..11a3875a 100644 --- a/test/gitversion/ParserTest.cpp +++ b/test/gitversion/ParserTest.cpp @@ -254,4 +254,4 @@ TEST(ParserTest, TestDirtyDevVersion_WithoutMinorVersion) { EXPECT_EQ("0123abcdef", info.gitCommitId); EXPECT_EQ("rc1", info.versionTag); EXPECT_EQ(20u, info.commitsSinceTag); -} \ No newline at end of file +} diff --git a/test/gitversion/VersionCompareTest.cpp b/test/gitversion/VersionCompareTest.cpp index 77643dce..b4d010f6 100644 --- a/test/gitversion/VersionCompareTest.cpp +++ b/test/gitversion/VersionCompareTest.cpp @@ -74,4 +74,4 @@ TEST_F(VersionCompareTest, DevVersions_VersionTags) { EXPECT_IS_OLDER_THAN("0.9.3-alpha+5.gabcd", "1+0.gabcd.dirty"); EXPECT_IS_OLDER_THAN("0.9.3-alpha+5.gabcd", "1"); EXPECT_IS_SAME_AGE("0.9.3-alpha+3.gabcd", "0.9.3-alpha+3.gabcd"); -} \ No newline at end of file +}