Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Unified Diff: webrtc/system_wrappers/source/scoped_vector_unittest.cc

Issue 1839603002: Remove webrtc::ScopedVector (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/system_wrappers/include/scoped_vector.h ('k') | webrtc/system_wrappers/system_wrappers.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/system_wrappers/source/scoped_vector_unittest.cc
diff --git a/webrtc/system_wrappers/source/scoped_vector_unittest.cc b/webrtc/system_wrappers/source/scoped_vector_unittest.cc
deleted file mode 100644
index d0275947dde5258485a82960d860aec535c37523..0000000000000000000000000000000000000000
--- a/webrtc/system_wrappers/source/scoped_vector_unittest.cc
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-// Borrowed from Chromium's src/base/memory/scoped_vector_unittest.cc
-
-#include "webrtc/system_wrappers/include/scoped_vector.h"
-
-#include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/base/scoped_ptr.h"
-
-namespace webrtc {
-namespace {
-
-// The LifeCycleObject notifies its Observer upon construction & destruction.
-class LifeCycleObject {
- public:
- class Observer {
- public:
- virtual void OnLifeCycleConstruct(LifeCycleObject* o) = 0;
- virtual void OnLifeCycleDestroy(LifeCycleObject* o) = 0;
-
- protected:
- virtual ~Observer() {}
- };
-
- ~LifeCycleObject() {
- observer_->OnLifeCycleDestroy(this);
- }
-
- private:
- friend class LifeCycleWatcher;
-
- explicit LifeCycleObject(Observer* observer)
- : observer_(observer) {
- observer_->OnLifeCycleConstruct(this);
- }
-
- Observer* observer_;
-
- RTC_DISALLOW_COPY_AND_ASSIGN(LifeCycleObject);
-};
-
-// The life cycle states we care about for the purposes of testing ScopedVector
-// against objects.
-enum LifeCycleState {
- LC_INITIAL,
- LC_CONSTRUCTED,
- LC_DESTROYED,
-};
-
-// Because we wish to watch the life cycle of an object being constructed and
-// destroyed, and further wish to test expectations against the state of that
-// object, we cannot save state in that object itself. Instead, we use this
-// pairing of the watcher, which observes the object and notifies of
-// construction & destruction. Since we also may be testing assumptions about
-// things not getting freed, this class also acts like a scoping object and
-// deletes the |constructed_life_cycle_object_|, if any when the
-// LifeCycleWatcher is destroyed. To keep this simple, the only expected state
-// changes are:
-// INITIAL -> CONSTRUCTED -> DESTROYED.
-// Anything more complicated than that should start another test.
-class LifeCycleWatcher : public LifeCycleObject::Observer {
- public:
- LifeCycleWatcher() : life_cycle_state_(LC_INITIAL) {}
- virtual ~LifeCycleWatcher() {}
-
- // Assert INITIAL -> CONSTRUCTED and no LifeCycleObject associated with this
- // LifeCycleWatcher.
- void OnLifeCycleConstruct(LifeCycleObject* object) override {
- ASSERT_EQ(LC_INITIAL, life_cycle_state_);
- ASSERT_EQ(NULL, constructed_life_cycle_object_.get());
- life_cycle_state_ = LC_CONSTRUCTED;
- constructed_life_cycle_object_.reset(object);
- }
-
- // Assert CONSTRUCTED -> DESTROYED and the |object| being destroyed is the
- // same one we saw constructed.
- void OnLifeCycleDestroy(LifeCycleObject* object) override {
- ASSERT_EQ(LC_CONSTRUCTED, life_cycle_state_);
- LifeCycleObject* constructed_life_cycle_object =
- constructed_life_cycle_object_.release();
- ASSERT_EQ(constructed_life_cycle_object, object);
- life_cycle_state_ = LC_DESTROYED;
- }
-
- LifeCycleState life_cycle_state() const { return life_cycle_state_; }
-
- // Factory method for creating a new LifeCycleObject tied to this
- // LifeCycleWatcher.
- LifeCycleObject* NewLifeCycleObject() {
- return new LifeCycleObject(this);
- }
-
- // Returns true iff |object| is the same object that this watcher is tracking.
- bool IsWatching(LifeCycleObject* object) const {
- return object == constructed_life_cycle_object_.get();
- }
-
- private:
- LifeCycleState life_cycle_state_;
- rtc::scoped_ptr<LifeCycleObject> constructed_life_cycle_object_;
-
- RTC_DISALLOW_COPY_AND_ASSIGN(LifeCycleWatcher);
-};
-
-TEST(ScopedVectorTest, LifeCycleWatcher) {
- LifeCycleWatcher watcher;
- EXPECT_EQ(LC_INITIAL, watcher.life_cycle_state());
- LifeCycleObject* object = watcher.NewLifeCycleObject();
- EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state());
- delete object;
- EXPECT_EQ(LC_DESTROYED, watcher.life_cycle_state());
-}
-
-TEST(ScopedVectorTest, PopBack) {
- 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());
- EXPECT_TRUE(watcher.IsWatching(scoped_vector.back()));
- scoped_vector.pop_back();
- EXPECT_EQ(LC_DESTROYED, watcher.life_cycle_state());
- EXPECT_TRUE(scoped_vector.empty());
-}
-
-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());
- EXPECT_TRUE(watcher.IsWatching(scoped_vector.back()));
- scoped_vector.clear();
- EXPECT_EQ(LC_DESTROYED, watcher.life_cycle_state());
- EXPECT_TRUE(scoped_vector.empty());
-}
-
-TEST(ScopedVectorTest, WeakClear) {
- 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());
- EXPECT_TRUE(watcher.IsWatching(scoped_vector.back()));
- scoped_vector.weak_clear();
- EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state());
- EXPECT_TRUE(scoped_vector.empty());
-}
-
-TEST(ScopedVectorTest, ResizeShrink) {
- LifeCycleWatcher first_watcher;
- EXPECT_EQ(LC_INITIAL, first_watcher.life_cycle_state());
- LifeCycleWatcher second_watcher;
- EXPECT_EQ(LC_INITIAL, second_watcher.life_cycle_state());
- ScopedVector<LifeCycleObject> scoped_vector;
-
- scoped_vector.push_back(first_watcher.NewLifeCycleObject());
- EXPECT_EQ(LC_CONSTRUCTED, first_watcher.life_cycle_state());
- EXPECT_EQ(LC_INITIAL, second_watcher.life_cycle_state());
- EXPECT_TRUE(first_watcher.IsWatching(scoped_vector[0]));
- EXPECT_FALSE(second_watcher.IsWatching(scoped_vector[0]));
-
- scoped_vector.push_back(second_watcher.NewLifeCycleObject());
- EXPECT_EQ(LC_CONSTRUCTED, first_watcher.life_cycle_state());
- EXPECT_EQ(LC_CONSTRUCTED, second_watcher.life_cycle_state());
- EXPECT_FALSE(first_watcher.IsWatching(scoped_vector[1]));
- EXPECT_TRUE(second_watcher.IsWatching(scoped_vector[1]));
-
- // Test that shrinking a vector deletes elements in the disappearing range.
- scoped_vector.resize(1);
- EXPECT_EQ(LC_CONSTRUCTED, first_watcher.life_cycle_state());
- EXPECT_EQ(LC_DESTROYED, second_watcher.life_cycle_state());
- EXPECT_EQ(1u, scoped_vector.size());
- EXPECT_TRUE(first_watcher.IsWatching(scoped_vector[0]));
-}
-
-TEST(ScopedVectorTest, ResizeGrow) {
- 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());
- EXPECT_TRUE(watcher.IsWatching(scoped_vector.back()));
-
- scoped_vector.resize(5);
- EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state());
- ASSERT_EQ(5u, scoped_vector.size());
- EXPECT_TRUE(watcher.IsWatching(scoped_vector[0]));
- EXPECT_FALSE(watcher.IsWatching(scoped_vector[1]));
- EXPECT_FALSE(watcher.IsWatching(scoped_vector[2]));
- EXPECT_FALSE(watcher.IsWatching(scoped_vector[3]));
- EXPECT_FALSE(watcher.IsWatching(scoped_vector[4]));
-}
-
-TEST(ScopedVectorTest, Scope) {
- 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());
- EXPECT_TRUE(watcher.IsWatching(scoped_vector.back()));
- }
- EXPECT_EQ(LC_DESTROYED, watcher.life_cycle_state());
-}
-
-TEST(ScopedVectorTest, MoveConstruct) {
- LifeCycleWatcher watcher;
- EXPECT_EQ(LC_INITIAL, watcher.life_cycle_state());
- {
- ScopedVector<LifeCycleObject> scoped_vector;
- scoped_vector.push_back(watcher.NewLifeCycleObject());
- EXPECT_FALSE(scoped_vector.empty());
- EXPECT_TRUE(watcher.IsWatching(scoped_vector.back()));
-
- ScopedVector<LifeCycleObject> scoped_vector_copy(std::move(scoped_vector));
- EXPECT_TRUE(scoped_vector.empty());
- EXPECT_FALSE(scoped_vector_copy.empty());
- EXPECT_TRUE(watcher.IsWatching(scoped_vector_copy.back()));
-
- EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state());
- }
- EXPECT_EQ(LC_DESTROYED, watcher.life_cycle_state());
-}
-
-TEST(ScopedVectorTest, MoveAssign) {
- LifeCycleWatcher watcher;
- EXPECT_EQ(LC_INITIAL, watcher.life_cycle_state());
- {
- ScopedVector<LifeCycleObject> scoped_vector;
- scoped_vector.push_back(watcher.NewLifeCycleObject());
- ScopedVector<LifeCycleObject> scoped_vector_assign;
- EXPECT_FALSE(scoped_vector.empty());
- EXPECT_TRUE(watcher.IsWatching(scoped_vector.back()));
-
- scoped_vector_assign = std::move(scoped_vector);
- EXPECT_TRUE(scoped_vector.empty());
- EXPECT_FALSE(scoped_vector_assign.empty());
- EXPECT_TRUE(watcher.IsWatching(scoped_vector_assign.back()));
-
- EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state());
- }
- EXPECT_EQ(LC_DESTROYED, watcher.life_cycle_state());
-}
-
-class DeleteCounter {
- public:
- explicit DeleteCounter(int* deletes)
- : deletes_(deletes) {
- }
-
- ~DeleteCounter() {
- (*deletes_)++;
- }
-
- void VoidMethod0() {}
-
- private:
- int* const deletes_;
-
- RTC_DISALLOW_COPY_AND_ASSIGN(DeleteCounter);
-};
-
-// This class is used in place of Chromium's base::Callback.
-template <typename T>
-class PassThru {
- public:
- explicit PassThru(ScopedVector<T> scoper) : scoper_(std::move(scoper)) {}
- ScopedVector<T> Run() { return std::move(scoper_); }
-
- private:
- ScopedVector<T> scoper_;
-};
-
-TEST(ScopedVectorTest, Passed) {
- int deletes = 0;
- ScopedVector<DeleteCounter> deleter_vector;
- deleter_vector.push_back(new DeleteCounter(&deletes));
- EXPECT_EQ(0, deletes);
- PassThru<DeleteCounter> pass_thru(std::move(deleter_vector));
- EXPECT_EQ(0, deletes);
- ScopedVector<DeleteCounter> result = pass_thru.Run();
- EXPECT_EQ(0, deletes);
- result.clear();
- EXPECT_EQ(1, deletes);
-};
-
-TEST(ScopedVectorTest, InsertRange) {
- LifeCycleWatcher watchers[5];
- size_t watchers_size = sizeof(watchers) / sizeof(*watchers);
-
- std::vector<LifeCycleObject*> vec;
- for (LifeCycleWatcher* it = watchers; it != watchers + watchers_size;
- ++it) {
- EXPECT_EQ(LC_INITIAL, it->life_cycle_state());
- vec.push_back(it->NewLifeCycleObject());
- EXPECT_EQ(LC_CONSTRUCTED, it->life_cycle_state());
- }
- // Start scope for ScopedVector.
- {
- ScopedVector<LifeCycleObject> scoped_vector;
- scoped_vector.insert(scoped_vector.end(), vec.begin() + 1, vec.begin() + 3);
- for (LifeCycleWatcher* it = watchers; it != watchers + watchers_size;
- ++it)
- EXPECT_EQ(LC_CONSTRUCTED, it->life_cycle_state());
- }
- for (LifeCycleWatcher* it = watchers; it != watchers + 1; ++it)
- EXPECT_EQ(LC_CONSTRUCTED, it->life_cycle_state());
- for (LifeCycleWatcher* it = watchers + 1; it != watchers + 3; ++it)
- EXPECT_EQ(LC_DESTROYED, it->life_cycle_state());
- for (LifeCycleWatcher* it = watchers + 3; it != watchers + watchers_size;
- ++it)
- EXPECT_EQ(LC_CONSTRUCTED, it->life_cycle_state());
-}
-
-} // namespace
-} // namespace webrtc
« no previous file with comments | « webrtc/system_wrappers/include/scoped_vector.h ('k') | webrtc/system_wrappers/system_wrappers.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698