diff options
Diffstat (limited to 'libunwindstack/tests/LocalUpdatableMapsTest.cpp')
| -rw-r--r-- | libunwindstack/tests/LocalUpdatableMapsTest.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libunwindstack/tests/LocalUpdatableMapsTest.cpp b/libunwindstack/tests/LocalUpdatableMapsTest.cpp index 07a3dba..0632a44 100644 --- a/libunwindstack/tests/LocalUpdatableMapsTest.cpp +++ b/libunwindstack/tests/LocalUpdatableMapsTest.cpp @@ -119,7 +119,7 @@ TEST_F(LocalUpdatableMapsTest, same_map_new_perms) { EXPECT_EQ(0x4000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_WRITE | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); map_info = maps_.Get(1); ASSERT_TRUE(map_info != nullptr); @@ -127,7 +127,7 @@ TEST_F(LocalUpdatableMapsTest, same_map_new_perms) { EXPECT_EQ(0x9000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); auto& saved_maps = maps_.TestGetSavedMaps(); ASSERT_EQ(1U, saved_maps.size()); @@ -137,7 +137,7 @@ TEST_F(LocalUpdatableMapsTest, same_map_new_perms) { EXPECT_EQ(0x4000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); } TEST_F(LocalUpdatableMapsTest, same_map_new_name) { @@ -165,7 +165,7 @@ TEST_F(LocalUpdatableMapsTest, same_map_new_name) { EXPECT_EQ(0x9000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); auto& saved_maps = maps_.TestGetSavedMaps(); ASSERT_EQ(1U, saved_maps.size()); @@ -175,7 +175,7 @@ TEST_F(LocalUpdatableMapsTest, same_map_new_name) { EXPECT_EQ(0x4000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); } TEST_F(LocalUpdatableMapsTest, only_add_maps) { @@ -198,7 +198,7 @@ TEST_F(LocalUpdatableMapsTest, only_add_maps) { EXPECT_EQ(0x2000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); map_info = maps_.Get(1); ASSERT_TRUE(map_info != nullptr); @@ -206,7 +206,7 @@ TEST_F(LocalUpdatableMapsTest, only_add_maps) { EXPECT_EQ(0x4000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); map_info = maps_.Get(2); ASSERT_TRUE(map_info != nullptr); @@ -214,7 +214,7 @@ TEST_F(LocalUpdatableMapsTest, only_add_maps) { EXPECT_EQ(0x9000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); map_info = maps_.Get(3); ASSERT_TRUE(map_info != nullptr); @@ -222,7 +222,7 @@ TEST_F(LocalUpdatableMapsTest, only_add_maps) { EXPECT_EQ(0xf000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); } TEST_F(LocalUpdatableMapsTest, all_new_maps) { @@ -242,7 +242,7 @@ TEST_F(LocalUpdatableMapsTest, all_new_maps) { EXPECT_EQ(0x2000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); map_info = maps_.Get(1); ASSERT_TRUE(map_info != nullptr); @@ -250,7 +250,7 @@ TEST_F(LocalUpdatableMapsTest, all_new_maps) { EXPECT_EQ(0xf000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); auto& saved_maps = maps_.TestGetSavedMaps(); ASSERT_EQ(2U, saved_maps.size()); @@ -260,7 +260,7 @@ TEST_F(LocalUpdatableMapsTest, all_new_maps) { EXPECT_EQ(0x4000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); map_info = saved_maps[1].get(); ASSERT_TRUE(map_info != nullptr); @@ -268,7 +268,7 @@ TEST_F(LocalUpdatableMapsTest, all_new_maps) { EXPECT_EQ(0x9000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); } TEST_F(LocalUpdatableMapsTest, add_map_prev_name_updated) { @@ -289,7 +289,7 @@ TEST_F(LocalUpdatableMapsTest, add_map_prev_name_updated) { EXPECT_EQ(0xA000U, map_info->end()); EXPECT_EQ(0U, map_info->offset()); EXPECT_EQ(PROT_READ | PROT_EXEC, map_info->flags()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); EXPECT_EQ(maps_.Get(1), map_info->prev_map()); } @@ -331,7 +331,7 @@ TEST_F(LocalUpdatableMapsTest, add_map_prev_real_name_updated) { EXPECT_TRUE(map_info->IsBlank()); EXPECT_EQ(maps_.Get(2), map_info->prev_real_map()); EXPECT_EQ(maps_.Get(2), map_info->prev_map()); - EXPECT_TRUE(map_info->name_.empty()); + EXPECT_TRUE(map_info->name().empty()); ASSERT_TRUE( android::base::WriteStringToFile("3000-4000 r-xp 00000 00:00 0 /fake/lib.so\n" |