diff options
Diffstat (limited to 'runtime/class_table_test.cc')
| -rw-r--r-- | runtime/class_table_test.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/runtime/class_table_test.cc b/runtime/class_table_test.cc index 642e10ac46..d9f53ed6a2 100644 --- a/runtime/class_table_test.cc +++ b/runtime/class_table_test.cc @@ -100,12 +100,9 @@ TEST_F(ClassTableTest, ClassTable) { // Test inserting and related lookup functions. EXPECT_TRUE(table.LookupByDescriptor(h_Y.Get()) == nullptr); - EXPECT_FALSE(table.Contains(h_Y.Get())); table.Insert(h_Y.Get()); EXPECT_OBJ_PTR_EQ(table.LookupByDescriptor(h_X.Get()), h_X.Get()); EXPECT_OBJ_PTR_EQ(table.LookupByDescriptor(h_Y.Get()), h_Y.Get()); - EXPECT_TRUE(table.Contains(h_X.Get())); - EXPECT_TRUE(table.Contains(h_Y.Get())); EXPECT_EQ(table.NumZygoteClasses(class_loader.Get()), 1u); EXPECT_EQ(table.NumNonZygoteClasses(class_loader.Get()), 1u); @@ -142,7 +139,7 @@ TEST_F(ClassTableTest, ClassTable) { // Test remove. table.Remove(descriptor_x); - EXPECT_FALSE(table.Contains(h_X.Get())); + EXPECT_TRUE(table.LookupByDescriptor(h_X.Get()) == nullptr); // Test that reading a class set from memory works. table.Insert(h_X.Get()); @@ -158,8 +155,8 @@ TEST_F(ClassTableTest, ClassTable) { size_t count2 = table2.ReadFromMemory(&buffer[0]); EXPECT_EQ(count, count2); // Strong roots are not serialized, only classes. - EXPECT_TRUE(table2.Contains(h_X.Get())); - EXPECT_TRUE(table2.Contains(h_Y.Get())); + EXPECT_OBJ_PTR_EQ(table2.LookupByDescriptor(h_X.Get()), h_X.Get()); + EXPECT_OBJ_PTR_EQ(table2.LookupByDescriptor(h_Y.Get()), h_Y.Get()); // TODO: Add tests for UpdateClass, InsertOatFile. } |