From 7e21eba5b7691b09b4bfa63cbfc6e442df574a17 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Thu, 20 Jun 2019 16:16:42 -0700 Subject: [PATCH] Switch case to suite to follow new gtest naming. Bug: 135528735 Test: All unit tests pass. Change-Id: I1f3dc6fe381ec557b6b7bc5cb1c58d210efa63da --- libunwindstack/tests/ArmExidxDecodeTest.cpp | 4 ++-- libunwindstack/tests/DwarfCfaLogTest.cpp | 22 ++++++++--------- libunwindstack/tests/DwarfCfaTest.cpp | 21 ++++++++-------- libunwindstack/tests/DwarfDebugFrameTest.cpp | 6 ++--- libunwindstack/tests/DwarfEhFrameTest.cpp | 6 ++--- .../tests/DwarfEhFrameWithHdrTest.cpp | 16 ++++++------- libunwindstack/tests/DwarfOpLogTest.cpp | 6 ++--- libunwindstack/tests/DwarfOpTest.cpp | 19 ++++++++------- libunwindstack/tests/DwarfSectionImplTest.cpp | 24 +++++++++---------- libunwindstack/tests/ElfCacheTest.cpp | 2 +- .../tests/MapInfoCreateMemoryTest.cpp | 2 +- .../tests/MemoryOfflineBufferTest.cpp | 2 +- libunwindstack/tests/RegsIterateTest.cpp | 2 +- libunwindstack/tests/SymbolsTest.cpp | 10 ++++---- libunwindstack/tests/UnwinderTest.cpp | 2 +- 15 files changed, 73 insertions(+), 71 deletions(-) diff --git a/libunwindstack/tests/ArmExidxDecodeTest.cpp b/libunwindstack/tests/ArmExidxDecodeTest.cpp index 5f3d1ea08..7b1dd921f 100644 --- a/libunwindstack/tests/ArmExidxDecodeTest.cpp +++ b/libunwindstack/tests/ArmExidxDecodeTest.cpp @@ -1662,7 +1662,7 @@ TEST_P(ArmExidxDecodeTest, eval_pc_set) { ASSERT_EQ(0x10U, (*exidx_->regs())[15]); } -INSTANTIATE_TEST_CASE_P(, ArmExidxDecodeTest, - ::testing::Values("logging", "register_logging", "no_logging")); +INSTANTIATE_TEST_SUITE_P(, ArmExidxDecodeTest, + ::testing::Values("logging", "register_logging", "no_logging")); } // namespace unwindstack diff --git a/libunwindstack/tests/DwarfCfaLogTest.cpp b/libunwindstack/tests/DwarfCfaLogTest.cpp index bb2e8f039..9dd0cdd1b 100644 --- a/libunwindstack/tests/DwarfCfaLogTest.cpp +++ b/libunwindstack/tests/DwarfCfaLogTest.cpp @@ -66,7 +66,7 @@ class DwarfCfaLogTest : public ::testing::Test { DwarfCie cie_; DwarfFde fde_; }; -TYPED_TEST_CASE_P(DwarfCfaLogTest); +TYPED_TEST_SUITE_P(DwarfCfaLogTest); // NOTE: All class variable references have to be prefaced with this->. @@ -763,17 +763,17 @@ TYPED_TEST_P(DwarfCfaLogTest, cfa_register_override) { ASSERT_EQ("", GetFakeLogBuf()); } -REGISTER_TYPED_TEST_CASE_P(DwarfCfaLogTest, cfa_illegal, cfa_nop, cfa_offset, cfa_offset_extended, - cfa_offset_extended_sf, cfa_restore, cfa_restore_extended, cfa_set_loc, - cfa_advance_loc, cfa_advance_loc1, cfa_advance_loc2, cfa_advance_loc4, - cfa_undefined, cfa_same, cfa_register, cfa_state, - cfa_state_cfa_offset_restore, cfa_def_cfa, cfa_def_cfa_sf, - cfa_def_cfa_register, cfa_def_cfa_offset, cfa_def_cfa_offset_sf, - cfa_def_cfa_expression, cfa_expression, cfa_val_offset, - cfa_val_offset_sf, cfa_val_expression, cfa_gnu_args_size, - cfa_gnu_negative_offset_extended, cfa_register_override); +REGISTER_TYPED_TEST_SUITE_P(DwarfCfaLogTest, cfa_illegal, cfa_nop, cfa_offset, cfa_offset_extended, + cfa_offset_extended_sf, cfa_restore, cfa_restore_extended, cfa_set_loc, + cfa_advance_loc, cfa_advance_loc1, cfa_advance_loc2, cfa_advance_loc4, + cfa_undefined, cfa_same, cfa_register, cfa_state, + cfa_state_cfa_offset_restore, cfa_def_cfa, cfa_def_cfa_sf, + cfa_def_cfa_register, cfa_def_cfa_offset, cfa_def_cfa_offset_sf, + cfa_def_cfa_expression, cfa_expression, cfa_val_offset, + cfa_val_offset_sf, cfa_val_expression, cfa_gnu_args_size, + cfa_gnu_negative_offset_extended, cfa_register_override); typedef ::testing::Types DwarfCfaLogTestTypes; -INSTANTIATE_TYPED_TEST_CASE_P(, DwarfCfaLogTest, DwarfCfaLogTestTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(, DwarfCfaLogTest, DwarfCfaLogTestTypes); } // namespace unwindstack diff --git a/libunwindstack/tests/DwarfCfaTest.cpp b/libunwindstack/tests/DwarfCfaTest.cpp index 7395b04dd..dd714902b 100644 --- a/libunwindstack/tests/DwarfCfaTest.cpp +++ b/libunwindstack/tests/DwarfCfaTest.cpp @@ -64,7 +64,7 @@ class DwarfCfaTest : public ::testing::Test { DwarfCie cie_; DwarfFde fde_; }; -TYPED_TEST_CASE_P(DwarfCfaTest); +TYPED_TEST_SUITE_P(DwarfCfaTest); // NOTE: All test class variables need to be referenced as this->. @@ -952,16 +952,17 @@ TYPED_TEST_P(DwarfCfaTest, cfa_register_override) { ASSERT_EQ("", GetFakeLogBuf()); } -REGISTER_TYPED_TEST_CASE_P(DwarfCfaTest, cfa_illegal, cfa_nop, cfa_offset, cfa_offset_extended, - cfa_offset_extended_sf, cfa_restore, cfa_restore_extended, cfa_set_loc, - cfa_advance_loc1, cfa_advance_loc2, cfa_advance_loc4, cfa_undefined, - cfa_same, cfa_register, cfa_state, cfa_state_cfa_offset_restore, - cfa_def_cfa, cfa_def_cfa_sf, cfa_def_cfa_register, cfa_def_cfa_offset, - cfa_def_cfa_offset_sf, cfa_def_cfa_expression, cfa_expression, - cfa_val_offset, cfa_val_offset_sf, cfa_val_expression, cfa_gnu_args_size, - cfa_gnu_negative_offset_extended, cfa_register_override); +REGISTER_TYPED_TEST_SUITE_P(DwarfCfaTest, cfa_illegal, cfa_nop, cfa_offset, cfa_offset_extended, + cfa_offset_extended_sf, cfa_restore, cfa_restore_extended, cfa_set_loc, + cfa_advance_loc1, cfa_advance_loc2, cfa_advance_loc4, cfa_undefined, + cfa_same, cfa_register, cfa_state, cfa_state_cfa_offset_restore, + cfa_def_cfa, cfa_def_cfa_sf, cfa_def_cfa_register, cfa_def_cfa_offset, + cfa_def_cfa_offset_sf, cfa_def_cfa_expression, cfa_expression, + cfa_val_offset, cfa_val_offset_sf, cfa_val_expression, + cfa_gnu_args_size, cfa_gnu_negative_offset_extended, + cfa_register_override); typedef ::testing::Types DwarfCfaTestTypes; -INSTANTIATE_TYPED_TEST_CASE_P(, DwarfCfaTest, DwarfCfaTestTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(, DwarfCfaTest, DwarfCfaTestTypes); } // namespace unwindstack diff --git a/libunwindstack/tests/DwarfDebugFrameTest.cpp b/libunwindstack/tests/DwarfDebugFrameTest.cpp index 120bd73b5..2b36f1714 100644 --- a/libunwindstack/tests/DwarfDebugFrameTest.cpp +++ b/libunwindstack/tests/DwarfDebugFrameTest.cpp @@ -44,7 +44,7 @@ class DwarfDebugFrameTest : public ::testing::Test { MemoryFake memory_; DwarfDebugFrame* debug_frame_ = nullptr; }; -TYPED_TEST_CASE_P(DwarfDebugFrameTest); +TYPED_TEST_SUITE_P(DwarfDebugFrameTest); // NOTE: All test class variables need to be referenced as this->. @@ -812,7 +812,7 @@ TYPED_TEST_P(DwarfDebugFrameTest, GetFdeFromPc_interleaved) { EXPECT_EQ(0xb50U, fde->pc_end); } -REGISTER_TYPED_TEST_CASE_P( +REGISTER_TYPED_TEST_SUITE_P( DwarfDebugFrameTest, GetFdes32, GetFdes32_after_GetFdeFromPc, GetFdes32_not_in_section, GetFdeFromPc32, GetFdeFromPc32_reverse, GetFdeFromPc32_not_in_section, GetFdes64, GetFdes64_after_GetFdeFromPc, GetFdes64_not_in_section, GetFdeFromPc64, GetFdeFromPc64_reverse, @@ -825,6 +825,6 @@ REGISTER_TYPED_TEST_CASE_P( GetFdeFromOffset64_lsda_address, GetFdeFromPc_interleaved); typedef ::testing::Types DwarfDebugFrameTestTypes; -INSTANTIATE_TYPED_TEST_CASE_P(, DwarfDebugFrameTest, DwarfDebugFrameTestTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(, DwarfDebugFrameTest, DwarfDebugFrameTestTypes); } // namespace unwindstack diff --git a/libunwindstack/tests/DwarfEhFrameTest.cpp b/libunwindstack/tests/DwarfEhFrameTest.cpp index 9cac6e8ee..4792fb50e 100644 --- a/libunwindstack/tests/DwarfEhFrameTest.cpp +++ b/libunwindstack/tests/DwarfEhFrameTest.cpp @@ -42,7 +42,7 @@ class DwarfEhFrameTest : public ::testing::Test { MemoryFake memory_; DwarfEhFrame* eh_frame_ = nullptr; }; -TYPED_TEST_CASE_P(DwarfEhFrameTest); +TYPED_TEST_SUITE_P(DwarfEhFrameTest); // NOTE: All test class variables need to be referenced as this->. @@ -125,9 +125,9 @@ TYPED_TEST_P(DwarfEhFrameTest, GetFdeCieFromOffset64) { EXPECT_EQ(1U, cie->return_address_register); } -REGISTER_TYPED_TEST_CASE_P(DwarfEhFrameTest, GetFdeCieFromOffset32, GetFdeCieFromOffset64); +REGISTER_TYPED_TEST_SUITE_P(DwarfEhFrameTest, GetFdeCieFromOffset32, GetFdeCieFromOffset64); typedef ::testing::Types DwarfEhFrameTestTypes; -INSTANTIATE_TYPED_TEST_CASE_P(, DwarfEhFrameTest, DwarfEhFrameTestTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(, DwarfEhFrameTest, DwarfEhFrameTestTypes); } // namespace unwindstack diff --git a/libunwindstack/tests/DwarfEhFrameWithHdrTest.cpp b/libunwindstack/tests/DwarfEhFrameWithHdrTest.cpp index be9e721eb..78608e3ee 100644 --- a/libunwindstack/tests/DwarfEhFrameWithHdrTest.cpp +++ b/libunwindstack/tests/DwarfEhFrameWithHdrTest.cpp @@ -73,7 +73,7 @@ class DwarfEhFrameWithHdrTest : public ::testing::Test { MemoryFake memory_; TestDwarfEhFrameWithHdr* eh_frame_ = nullptr; }; -TYPED_TEST_CASE_P(DwarfEhFrameWithHdrTest); +TYPED_TEST_SUITE_P(DwarfEhFrameWithHdrTest); // NOTE: All test class variables need to be referenced as this->. @@ -446,14 +446,14 @@ TYPED_TEST_P(DwarfEhFrameWithHdrTest, GetFdeFromPc_fde_not_found) { ASSERT_EQ(nullptr, this->eh_frame_->GetFdeFromPc(0x800)); } -REGISTER_TYPED_TEST_CASE_P(DwarfEhFrameWithHdrTest, Init, Init_non_zero_load_bias, GetFdes, - GetFdeInfoFromIndex_expect_cache_fail, GetFdeInfoFromIndex_read_pcrel, - GetFdeInfoFromIndex_read_datarel, GetFdeInfoFromIndex_cached, - GetFdeOffsetFromPc_verify, GetFdeOffsetFromPc_index_fail, - GetFdeOffsetFromPc_fail_fde_count, GetFdeOffsetFromPc_search, - GetCieFde32, GetCieFde64, GetFdeFromPc_fde_not_found); +REGISTER_TYPED_TEST_SUITE_P(DwarfEhFrameWithHdrTest, Init, Init_non_zero_load_bias, GetFdes, + GetFdeInfoFromIndex_expect_cache_fail, GetFdeInfoFromIndex_read_pcrel, + GetFdeInfoFromIndex_read_datarel, GetFdeInfoFromIndex_cached, + GetFdeOffsetFromPc_verify, GetFdeOffsetFromPc_index_fail, + GetFdeOffsetFromPc_fail_fde_count, GetFdeOffsetFromPc_search, + GetCieFde32, GetCieFde64, GetFdeFromPc_fde_not_found); typedef ::testing::Types DwarfEhFrameWithHdrTestTypes; -INSTANTIATE_TYPED_TEST_CASE_P(, DwarfEhFrameWithHdrTest, DwarfEhFrameWithHdrTestTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(, DwarfEhFrameWithHdrTest, DwarfEhFrameWithHdrTestTypes); } // namespace unwindstack diff --git a/libunwindstack/tests/DwarfOpLogTest.cpp b/libunwindstack/tests/DwarfOpLogTest.cpp index 3f09dd87e..f4ade5d3f 100644 --- a/libunwindstack/tests/DwarfOpLogTest.cpp +++ b/libunwindstack/tests/DwarfOpLogTest.cpp @@ -48,7 +48,7 @@ class DwarfOpLogTest : public ::testing::Test { std::unique_ptr mem_; std::unique_ptr> op_; }; -TYPED_TEST_CASE_P(DwarfOpLogTest); +TYPED_TEST_SUITE_P(DwarfOpLogTest); TYPED_TEST_P(DwarfOpLogTest, multiple_ops) { // Multi operation opcodes. @@ -65,9 +65,9 @@ TYPED_TEST_P(DwarfOpLogTest, multiple_ops) { ASSERT_EQ(expected, lines); } -REGISTER_TYPED_TEST_CASE_P(DwarfOpLogTest, multiple_ops); +REGISTER_TYPED_TEST_SUITE_P(DwarfOpLogTest, multiple_ops); typedef ::testing::Types DwarfOpLogTestTypes; -INSTANTIATE_TYPED_TEST_CASE_P(, DwarfOpLogTest, DwarfOpLogTestTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(, DwarfOpLogTest, DwarfOpLogTestTypes); } // namespace unwindstack diff --git a/libunwindstack/tests/DwarfOpTest.cpp b/libunwindstack/tests/DwarfOpTest.cpp index d424d5f43..0898ec0ef 100644 --- a/libunwindstack/tests/DwarfOpTest.cpp +++ b/libunwindstack/tests/DwarfOpTest.cpp @@ -48,7 +48,7 @@ class DwarfOpTest : public ::testing::Test { std::unique_ptr mem_; std::unique_ptr> op_; }; -TYPED_TEST_CASE_P(DwarfOpTest); +TYPED_TEST_SUITE_P(DwarfOpTest); TYPED_TEST_P(DwarfOpTest, decode) { // Memory error. @@ -1571,15 +1571,16 @@ TYPED_TEST_P(DwarfOpTest, is_dex_pc) { EXPECT_FALSE(this->op_->dex_pc_set()); } -REGISTER_TYPED_TEST_CASE_P(DwarfOpTest, decode, eval, illegal_opcode, not_implemented, op_addr, - op_deref, op_deref_size, const_unsigned, const_signed, const_uleb, - const_sleb, op_dup, op_drop, op_over, op_pick, op_swap, op_rot, op_abs, - op_and, op_div, op_minus, op_mod, op_mul, op_neg, op_not, op_or, op_plus, - op_plus_uconst, op_shl, op_shr, op_shra, op_xor, op_bra, - compare_opcode_stack_error, compare_opcodes, op_skip, op_lit, op_reg, - op_regx, op_breg, op_breg_invalid_register, op_bregx, op_nop, is_dex_pc); +REGISTER_TYPED_TEST_SUITE_P(DwarfOpTest, decode, eval, illegal_opcode, not_implemented, op_addr, + op_deref, op_deref_size, const_unsigned, const_signed, const_uleb, + const_sleb, op_dup, op_drop, op_over, op_pick, op_swap, op_rot, op_abs, + op_and, op_div, op_minus, op_mod, op_mul, op_neg, op_not, op_or, + op_plus, op_plus_uconst, op_shl, op_shr, op_shra, op_xor, op_bra, + compare_opcode_stack_error, compare_opcodes, op_skip, op_lit, op_reg, + op_regx, op_breg, op_breg_invalid_register, op_bregx, op_nop, + is_dex_pc); typedef ::testing::Types DwarfOpTestTypes; -INSTANTIATE_TYPED_TEST_CASE_P(, DwarfOpTest, DwarfOpTestTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(, DwarfOpTest, DwarfOpTestTypes); } // namespace unwindstack diff --git a/libunwindstack/tests/DwarfSectionImplTest.cpp b/libunwindstack/tests/DwarfSectionImplTest.cpp index 46f555a6f..b386ef495 100644 --- a/libunwindstack/tests/DwarfSectionImplTest.cpp +++ b/libunwindstack/tests/DwarfSectionImplTest.cpp @@ -68,7 +68,7 @@ class DwarfSectionImplTest : public ::testing::Test { MemoryFake memory_; TestDwarfSectionImpl* section_ = nullptr; }; -TYPED_TEST_CASE_P(DwarfSectionImplTest); +TYPED_TEST_SUITE_P(DwarfSectionImplTest); // NOTE: All test class variables need to be referenced as this->. @@ -571,18 +571,18 @@ TYPED_TEST_P(DwarfSectionImplTest, Log) { ASSERT_EQ("", GetFakeLogBuf()); } -REGISTER_TYPED_TEST_CASE_P(DwarfSectionImplTest, GetCieFromOffset_fail_should_not_cache, - GetFdeFromOffset_fail_should_not_cache, Eval_cfa_expr_eval_fail, - Eval_cfa_expr_no_stack, Eval_cfa_expr_is_register, Eval_cfa_expr, - Eval_cfa_val_expr, Eval_bad_regs, Eval_no_cfa, Eval_cfa_bad, - Eval_cfa_register_prev, Eval_cfa_register_from_value, - Eval_double_indirection, Eval_register_reference_chain, Eval_dex_pc, - Eval_invalid_register, Eval_different_reg_locations, - Eval_return_address_undefined, Eval_pc_zero, Eval_return_address, - Eval_ignore_large_reg_loc, Eval_reg_expr, Eval_reg_val_expr, - GetCfaLocationInfo_cie_not_cached, GetCfaLocationInfo_cie_cached, Log); +REGISTER_TYPED_TEST_SUITE_P(DwarfSectionImplTest, GetCieFromOffset_fail_should_not_cache, + GetFdeFromOffset_fail_should_not_cache, Eval_cfa_expr_eval_fail, + Eval_cfa_expr_no_stack, Eval_cfa_expr_is_register, Eval_cfa_expr, + Eval_cfa_val_expr, Eval_bad_regs, Eval_no_cfa, Eval_cfa_bad, + Eval_cfa_register_prev, Eval_cfa_register_from_value, + Eval_double_indirection, Eval_register_reference_chain, Eval_dex_pc, + Eval_invalid_register, Eval_different_reg_locations, + Eval_return_address_undefined, Eval_pc_zero, Eval_return_address, + Eval_ignore_large_reg_loc, Eval_reg_expr, Eval_reg_val_expr, + GetCfaLocationInfo_cie_not_cached, GetCfaLocationInfo_cie_cached, Log); typedef ::testing::Types DwarfSectionImplTestTypes; -INSTANTIATE_TYPED_TEST_CASE_P(, DwarfSectionImplTest, DwarfSectionImplTestTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(, DwarfSectionImplTest, DwarfSectionImplTestTypes); } // namespace unwindstack diff --git a/libunwindstack/tests/ElfCacheTest.cpp b/libunwindstack/tests/ElfCacheTest.cpp index 07fd6f642..573585837 100644 --- a/libunwindstack/tests/ElfCacheTest.cpp +++ b/libunwindstack/tests/ElfCacheTest.cpp @@ -31,7 +31,7 @@ namespace unwindstack { class ElfCacheTest : public ::testing::Test { protected: - static void SetUpTestCase() { memory_.reset(new MemoryFake); } + static void SetUpTestSuite() { memory_.reset(new MemoryFake); } void SetUp() override { Elf::SetCachingEnabled(true); } diff --git a/libunwindstack/tests/MapInfoCreateMemoryTest.cpp b/libunwindstack/tests/MapInfoCreateMemoryTest.cpp index 6be8bdccb..5b4ca7c44 100644 --- a/libunwindstack/tests/MapInfoCreateMemoryTest.cpp +++ b/libunwindstack/tests/MapInfoCreateMemoryTest.cpp @@ -58,7 +58,7 @@ class MapInfoCreateMemoryTest : public ::testing::Test { ASSERT_TRUE(android::base::WriteFully(fd, buffer.data(), buffer.size())); } - static void SetUpTestCase() { + static void SetUpTestSuite() { std::vector buffer(12288, 0); memcpy(buffer.data(), ELFMAG, SELFMAG); buffer[EI_CLASS] = ELFCLASS32; diff --git a/libunwindstack/tests/MemoryOfflineBufferTest.cpp b/libunwindstack/tests/MemoryOfflineBufferTest.cpp index c62c53dae..953170848 100644 --- a/libunwindstack/tests/MemoryOfflineBufferTest.cpp +++ b/libunwindstack/tests/MemoryOfflineBufferTest.cpp @@ -30,7 +30,7 @@ class MemoryOfflineBufferTest : public ::testing::Test { memory_.reset(new MemoryOfflineBuffer(buffer_.data(), kStart, kEnd)); } - static void SetUpTestCase() { + static void SetUpTestSuite() { buffer_.resize(kLength); for (size_t i = 0; i < kLength; i++) { buffer_[i] = i % 189; diff --git a/libunwindstack/tests/RegsIterateTest.cpp b/libunwindstack/tests/RegsIterateTest.cpp index 9a27dbd21..7e36953f2 100644 --- a/libunwindstack/tests/RegsIterateTest.cpp +++ b/libunwindstack/tests/RegsIterateTest.cpp @@ -236,7 +236,7 @@ std::vector ExpectedRegisters() { } using RegTypes = ::testing::Types; -TYPED_TEST_CASE(RegsIterateTest, RegTypes); +TYPED_TEST_SUITE(RegsIterateTest, RegTypes); TYPED_TEST(RegsIterateTest, iterate) { std::vector expected = ExpectedRegisters(); diff --git a/libunwindstack/tests/SymbolsTest.cpp b/libunwindstack/tests/SymbolsTest.cpp index b40a2531c..ae3c349a4 100644 --- a/libunwindstack/tests/SymbolsTest.cpp +++ b/libunwindstack/tests/SymbolsTest.cpp @@ -55,7 +55,7 @@ class SymbolsTest : public ::testing::Test { MemoryFake memory_; }; -TYPED_TEST_CASE_P(SymbolsTest); +TYPED_TEST_SUITE_P(SymbolsTest); TYPED_TEST_P(SymbolsTest, function_bounds_check) { Symbols symbols(0x1000, sizeof(TypeParam), sizeof(TypeParam), 0x2000, 0x100); @@ -362,11 +362,11 @@ TYPED_TEST_P(SymbolsTest, get_global) { EXPECT_EQ(4U, offset); } -REGISTER_TYPED_TEST_CASE_P(SymbolsTest, function_bounds_check, no_symbol, multiple_entries, - multiple_entries_nonstandard_size, symtab_value_out_of_bounds, - symtab_read_cached, get_global); +REGISTER_TYPED_TEST_SUITE_P(SymbolsTest, function_bounds_check, no_symbol, multiple_entries, + multiple_entries_nonstandard_size, symtab_value_out_of_bounds, + symtab_read_cached, get_global); typedef ::testing::Types SymbolsTestTypes; -INSTANTIATE_TYPED_TEST_CASE_P(, SymbolsTest, SymbolsTestTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(, SymbolsTest, SymbolsTestTypes); } // namespace unwindstack diff --git a/libunwindstack/tests/UnwinderTest.cpp b/libunwindstack/tests/UnwinderTest.cpp index 14631671c..ef1950ccc 100644 --- a/libunwindstack/tests/UnwinderTest.cpp +++ b/libunwindstack/tests/UnwinderTest.cpp @@ -54,7 +54,7 @@ class UnwinderTest : public ::testing::Test { } } - static void SetUpTestCase() { + static void SetUpTestSuite() { maps_.reset(new Maps); ElfFake* elf = new ElfFake(new MemoryFake);