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

Unified Diff: mojo/services/view_manager/view_manager_unittest.cc

Issue 566463003: Removes redundant test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/view_manager/view_manager_unittest.cc
diff --git a/mojo/services/view_manager/view_manager_unittest.cc b/mojo/services/view_manager/view_manager_unittest.cc
index eb9d4cb03159f6e6ca1fcfb1323de44296a13958..be9e7ccf940c3dccf2eb627992f016ce51ff261d 100644
--- a/mojo/services/view_manager/view_manager_unittest.cc
+++ b/mojo/services/view_manager/view_manager_unittest.cc
@@ -60,6 +60,11 @@ class ViewManagerProxy : public TestChangeTracker::Delegate {
virtual ~ViewManagerProxy() {
}
+ // Returns true if in an initial state. If this returns false it means the
+ // last test didn't clean up properly, or most likely didn't invoke
+ // WaitForInstance() when it needed to.
+ static bool IsInInitialState() { return instance_ == NULL; }
+
// Runs a message loop until the single instance has been created.
static ViewManagerProxy* WaitForInstance() {
if (!instance_)
@@ -449,6 +454,8 @@ class ViewManagerTest : public testing::Test {
connection3_(NULL) {}
virtual void SetUp() OVERRIDE {
+ ASSERT_TRUE(ViewManagerProxy::IsInInitialState());
+
test_helper_.Init();
test_helper_.SetLoaderForURL(
@@ -1171,26 +1178,6 @@ TEST_F(ViewManagerTest, CantGetViewTreeOfOtherRoots) {
EXPECT_EQ("view=1,1 parent=null", views[0].ToString());
}
-TEST_F(ViewManagerTest, ConnectTwice) {
- ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 1)));
- ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 2)));
-
- ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
-
- // Try to connect again to 1,1, this should fail as already connected to that
- // root.
- ASSERT_TRUE(connection_->Embed(BuildViewId(1, 1), kTestServiceURL));
-
- // Connecting to 1,2 should succeed and end up in connection2.
- {
- ASSERT_TRUE(connection_->Embed(BuildViewId(1, 2), kTestServiceURL));
- connection2_->DoRunLoopUntilChangesCount(1);
- const Changes changes(ChangesToDescription1(connection2_->changes()));
- ASSERT_EQ(1u, changes.size());
- EXPECT_EQ("ViewDeleted view=1,1", changes[0]);
- }
-}
-
TEST_F(ViewManagerTest, OnViewInput) {
ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 1)));
ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698