update to newer googletest

This matches the version used in Chromium.

Change-Id: I1b697c7f79a4e628cecf96f6abc3e5dacac0888a
Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/2605357
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Mike Frysinger 2021-01-04 02:30:03 -05:00
parent 86c090b77f
commit f469cab97b
9 changed files with 25 additions and 21 deletions

View file

@ -204,7 +204,7 @@ TEST_P(DwarfHeader, Header) {
EXPECT_EQ(parser.Start(), info_contents.size());
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
HeaderVariants, DwarfHeader,
::testing::Values(DwarfHeaderParams(kLittleEndian, 4, 2, 4),
DwarfHeaderParams(kLittleEndian, 4, 2, 8),
@ -494,7 +494,7 @@ TEST_P(DwarfForms, implicit_const) {
// Tests for the other attribute forms could go here.
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
HeaderVariants, DwarfForms,
::testing::Values(DwarfHeaderParams(kLittleEndian, 4, 2, 4),
DwarfHeaderParams(kLittleEndian, 4, 2, 8),

View file

@ -55,6 +55,7 @@ using google_breakpad::Module;
using ::testing::_;
using ::testing::AtMost;
using ::testing::DoAll;
using ::testing::Invoke;
using ::testing::Return;
using ::testing::Test;
@ -857,8 +858,8 @@ Situation situations[] = {
class FuncLinePairing: public CUFixtureBase,
public TestWithParam<Situation> { };
INSTANTIATE_TEST_CASE_P(AllSituations, FuncLinePairing,
ValuesIn(situations));
INSTANTIATE_TEST_SUITE_P(AllSituations, FuncLinePairing,
ValuesIn(situations));
TEST_P(FuncLinePairing, Pairing) {
const Situation& s = GetParam();
@ -1043,11 +1044,11 @@ TEST_F(FuncLinePairing, WarnOnceLine) {
class CXXQualifiedNames: public CUFixtureBase,
public TestWithParam<DwarfTag> { };
INSTANTIATE_TEST_CASE_P(VersusEnclosures, CXXQualifiedNames,
Values(dwarf2reader::DW_TAG_class_type,
dwarf2reader::DW_TAG_structure_type,
dwarf2reader::DW_TAG_union_type,
dwarf2reader::DW_TAG_namespace));
INSTANTIATE_TEST_SUITE_P(VersusEnclosures, CXXQualifiedNames,
Values(dwarf2reader::DW_TAG_class_type,
dwarf2reader::DW_TAG_structure_type,
dwarf2reader::DW_TAG_union_type,
dwarf2reader::DW_TAG_namespace));
TEST_P(CXXQualifiedNames, TwoFunctions) {
DwarfTag tag = GetParam();
@ -1145,8 +1146,8 @@ class QualifiedForLanguage
: public CUFixtureBase,
public TestWithParam<LanguageAndQualifiedName> { };
INSTANTIATE_TEST_CASE_P(LanguageAndQualifiedName, QualifiedForLanguage,
ValuesIn(LanguageAndQualifiedNameCases));
INSTANTIATE_TEST_SUITE_P(LanguageAndQualifiedName, QualifiedForLanguage,
ValuesIn(LanguageAndQualifiedNameCases));
TEST_P(QualifiedForLanguage, MemberFunction) {
const LanguageAndQualifiedName& param = GetParam();

View file

@ -248,9 +248,9 @@ TEST_P(ELFSymbolsToModuleTest32, SkipStuff) {
}
// Run all the 32-bit tests with both endianness
INSTANTIATE_TEST_CASE_P(Endian,
ELFSymbolsToModuleTest32,
::testing::Values(kLittleEndian, kBigEndian));
INSTANTIATE_TEST_SUITE_P(Endian,
ELFSymbolsToModuleTest32,
::testing::Values(kLittleEndian, kBigEndian));
// Similar tests, but with 64-bit values. Ostensibly this could be
// shoehorned into the parameterization by using ::testing::Combine,
@ -365,6 +365,6 @@ TEST_P(ELFSymbolsToModuleTest64, SkipStuff) {
}
// Run all the 64-bit tests with both endianness
INSTANTIATE_TEST_CASE_P(Endian,
ELFSymbolsToModuleTest64,
::testing::Values(kLittleEndian, kBigEndian));
INSTANTIATE_TEST_SUITE_P(Endian,
ELFSymbolsToModuleTest64,
::testing::Values(kLittleEndian, kBigEndian));