diff options
Diffstat (limited to 'base/memory/scoped_vector_unittest.cc')
-rw-r--r-- | base/memory/scoped_vector_unittest.cc | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/base/memory/scoped_vector_unittest.cc b/base/memory/scoped_vector_unittest.cc index f6c7167..03774c5 100644 --- a/base/memory/scoped_vector_unittest.cc +++ b/base/memory/scoped_vector_unittest.cc @@ -107,14 +107,27 @@ TEST(ScopedVectorTest, LifeCycleWatcher) { EXPECT_EQ(LC_DESTROYED, watcher.life_cycle_state()); } -TEST(ScopedVectorTest, Reset) { +TEST(ScopedVectorTest, Clear) { LifeCycleWatcher watcher; EXPECT_EQ(LC_INITIAL, watcher.life_cycle_state()); ScopedVector<LifeCycleObject> scoped_vector; scoped_vector.push_back(watcher.NewLifeCycleObject()); EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state()); - scoped_vector.reset(); + scoped_vector.clear(); EXPECT_EQ(LC_DESTROYED, watcher.life_cycle_state()); + EXPECT_EQ(static_cast<size_t>(0), scoped_vector.size()); +} + +TEST(ScopedVectorTest, WeakClear) { + LifeCycleWatcher watcher; + EXPECT_EQ(LC_INITIAL, watcher.life_cycle_state()); + ScopedVector<LifeCycleObject> scoped_vector; + scoped_ptr<LifeCycleObject> object(watcher.NewLifeCycleObject()); + scoped_vector.push_back(object.get()); + EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state()); + scoped_vector.weak_clear(); + EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state()); + EXPECT_EQ(static_cast<size_t>(0), scoped_vector.size()); } TEST(ScopedVectorTest, Scope) { @@ -196,7 +209,7 @@ TEST(ScopedVectorTest, Passed) { EXPECT_EQ(0, deletes); ScopedVector<DeleteCounter> result = callback.Run(); EXPECT_EQ(0, deletes); - result.reset(); + result.clear(); EXPECT_EQ(1, deletes); }; |