xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unitTests: fix old API usage

Browse Source 
Found with google-upgrade-googletest-case

Signed-off-by: Rosen Penev <rosenp@gmail.com>
main
Rosen Penev 2 years ago
parent c94d0aae12
commit 785a9ed084
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

4
unitTests/test_XmpKey.cpp
Unescape Escape View File

@ -18,11 +18,11 @@ const std::string notRegisteredValidKey("Xmp.noregistered.prop");
// behavior of the XmpKey class // behavior of the XmpKey class
class AXmpKey : public testing::Test { class AXmpKey : public testing::Test {
public: public:
static void SetUpTestCase() { static void SetUpTestSuite() {
XmpProperties::registerNs(expectedFamily, expectedPrefix); XmpProperties::registerNs(expectedFamily, expectedPrefix);
} }
static void TearDownTestCase() { static void TearDownTestSuite() {
XmpProperties::unregisterNs(); XmpProperties::unregisterNs();
} }

24
unitTests/test_slice.cpp
Unescape Escape View File

@ -111,8 +111,8 @@ const std::vector<int>& get_test_data<const std::vector<int>>(slice<const std::v
template <typename T> template <typename T>
class mutableSlice : public slice<T> {}; class mutableSlice : public slice<T> {};
TYPED_TEST_CASE_P(slice); TYPED_TEST_SUITE_P(slice);
TYPED_TEST_CASE_P(mutableSlice); TYPED_TEST_SUITE_P(mutableSlice);
TYPED_TEST_P(slice, atAccess) { TYPED_TEST_P(slice, atAccess) {
// typedef Slice<TypeParam> slice_t; // typedef Slice<TypeParam> slice_t;
@ -355,7 +355,7 @@ struct dataBufSlice : public ::testing::Test {
template <typename T> template <typename T>
byte dataBufSlice<T>::data[4] = {0xde, 0xad, 0xbe, 0xef}; byte dataBufSlice<T>::data[4] = {0xde, 0xad, 0xbe, 0xef};
TYPED_TEST_CASE_P(dataBufSlice); TYPED_TEST_SUITE_P(dataBufSlice);
TYPED_TEST_P(dataBufSlice, successfulConstruction) { TYPED_TEST_P(dataBufSlice, successfulConstruction) {
// just check that makeSlice appears to work // just check that makeSlice appears to work
@ -375,18 +375,18 @@ TYPED_TEST_P(dataBufSlice, failedConstruction) {
// //
// GTest boilerplate to get the tests running for all the different types // GTest boilerplate to get the tests running for all the different types
// //
REGISTER_TYPED_TEST_CASE_P(slice, atAccess, iteratorAccess, constructionFailsFromInvalidRange, REGISTER_TYPED_TEST_SUITE_P(slice, atAccess, iteratorAccess, constructionFailsFromInvalidRange,
constructionFailsWithZeroLength, subSliceSuccessfulConstruction, subSliceFunctions, constructionFailsWithZeroLength, subSliceSuccessfulConstruction, subSliceFunctions,
subSliceFailedConstruction, subSliceConstructionOverflowResistance, subSliceFailedConstruction, subSliceConstructionOverflowResistance,
constMethodsPreserveConst); constMethodsPreserveConst);
using test_types_t = ::testing::Types<const std::vector<int>, std::vector<int>, int*, const int*>; using test_types_t = ::testing::Types<const std::vector<int>, std::vector<int>, int*, const int*>;
INSTANTIATE_TYPED_TEST_CASE_P(slice, slice, test_types_t); INSTANTIATE_TYPED_TEST_SUITE_P(slice, slice, test_types_t);
REGISTER_TYPED_TEST_CASE_P(mutableSlice, iterators, at); REGISTER_TYPED_TEST_SUITE_P(mutableSlice, iterators, at);
using mut_test_types_t = ::testing::Types<std::vector<int>, int*>; using mut_test_types_t = ::testing::Types<std::vector<int>, int*>;
INSTANTIATE_TYPED_TEST_CASE_P(slice, mutableSlice, mut_test_types_t); INSTANTIATE_TYPED_TEST_SUITE_P(slice, mutableSlice, mut_test_types_t);
REGISTER_TYPED_TEST_CASE_P(dataBufSlice, successfulConstruction, failedConstruction); REGISTER_TYPED_TEST_SUITE_P(dataBufSlice, successfulConstruction, failedConstruction);
using data_buf_types_t = ::testing::Types<DataBuf&, const DataBuf&>; using data_buf_types_t = ::testing::Types<DataBuf&, const DataBuf&>;
INSTANTIATE_TYPED_TEST_CASE_P(slice, dataBufSlice, data_buf_types_t); INSTANTIATE_TYPED_TEST_SUITE_P(slice, dataBufSlice, data_buf_types_t);

Write Preview
Loading…
Cancel
Save