third_party/exiv2
1
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>
This commit is contained in:
Rosen Penev 2023-02-07 11:52:10 -08:00
parent c94d0aae12
commit 785a9ed084
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unitTests/test_XmpKey.cpp
View File

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

24
unitTests/test_slice.cpp
View File

@ -111,8 +111,8 @@ const std::vector<int>& get_test_data<const std::vector<int>>(slice<const std::v
template <typename T>
class mutableSlice : public slice<T> {};
TYPED_TEST_CASE_P(slice);
TYPED_TEST_CASE_P(mutableSlice);
TYPED_TEST_SUITE_P(slice);
TYPED_TEST_SUITE_P(mutableSlice);
TYPED_TEST_P(slice, atAccess) {
// typedef Slice<TypeParam> slice_t;
@ -355,7 +355,7 @@ struct dataBufSlice : public ::testing::Test {
template <typename T>
byte dataBufSlice<T>::data[4] = {0xde, 0xad, 0xbe, 0xef};
TYPED_TEST_CASE_P(dataBufSlice);
TYPED_TEST_SUITE_P(dataBufSlice);
TYPED_TEST_P(dataBufSlice, successfulConstruction) {
// 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
//
REGISTER_TYPED_TEST_CASE_P(slice, atAccess, iteratorAccess, constructionFailsFromInvalidRange,
constructionFailsWithZeroLength, subSliceSuccessfulConstruction, subSliceFunctions,
subSliceFailedConstruction, subSliceConstructionOverflowResistance,
constMethodsPreserveConst);
REGISTER_TYPED_TEST_SUITE_P(slice, atAccess, iteratorAccess, constructionFailsFromInvalidRange,
constructionFailsWithZeroLength, subSliceSuccessfulConstruction, subSliceFunctions,
subSliceFailedConstruction, subSliceConstructionOverflowResistance,
constMethodsPreserveConst);
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*>;
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&>;
INSTANTIATE_TYPED_TEST_CASE_P(slice, dataBufSlice, data_buf_types_t);
INSTANTIATE_TYPED_TEST_SUITE_P(slice, dataBufSlice, data_buf_types_t);