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

Side by Side Diff: mojo/services/view_manager/view_manager_unittest.cc

Issue 374723002: Mojo: Trivial style fixes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 // Change ids start at 1 as well. 519 // Change ids start at 1 as well.
520 EXPECT_EQ(static_cast<Id>(1), connection_->changes()[0].change_id); 520 EXPECT_EQ(static_cast<Id>(1), connection_->changes()[0].change_id);
521 } 521 }
522 522
523 // Verifies two clients/connections get different ids. 523 // Verifies two clients/connections get different ids.
524 TEST_F(ViewManagerTest, TwoClientsGetDifferentConnectionIds) { 524 TEST_F(ViewManagerTest, TwoClientsGetDifferentConnectionIds) {
525 ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true)); 525 ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
526 EXPECT_EQ("OnConnectionEstablished creator=mojo:test_url", 526 EXPECT_EQ("OnConnectionEstablished creator=mojo:test_url",
527 ChangesToDescription1(connection2_->changes())[0]); 527 ChangesToDescription1(connection2_->changes())[0]);
528 528
529 // It isn't strickly necessary that the second connection gets 2, but these 529 // It isn't strictly necessary that the second connection gets 2, but these
530 // tests are written assuming that is the case. The key thing is the 530 // tests are written assuming that is the case. The key thing is the
531 // connection ids of |connection_| and |connection2_| differ. 531 // connection ids of |connection_| and |connection2_| differ.
532 EXPECT_EQ(2, connection2_->changes()[0].connection_id); 532 EXPECT_EQ(2, connection2_->changes()[0].connection_id);
533 533
534 // Change ids start at 1 as well. 534 // Change ids start at 1 as well.
535 EXPECT_EQ(static_cast<Id>(1), connection2_->changes()[0].change_id); 535 EXPECT_EQ(static_cast<Id>(1), connection2_->changes()[0].change_id);
536 } 536 }
537 537
538 // Verifies client gets a valid id. 538 // Verifies client gets a valid id.
539 TEST_F(ViewManagerTest, CreateNode) { 539 TEST_F(ViewManagerTest, CreateNode) {
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
1376 // originating connection. 1376 // originating connection.
1377 1377
1378 // TODO(beng): Add tests for focus: 1378 // TODO(beng): Add tests for focus:
1379 // - focus between two nodes known to a connection 1379 // - focus between two nodes known to a connection
1380 // - focus between nodes unknown to one of the connections. 1380 // - focus between nodes unknown to one of the connections.
1381 // - focus between nodes unknown to either connection. 1381 // - focus between nodes unknown to either connection.
1382 1382
1383 } // namespace service 1383 } // namespace service
1384 } // namespace view_manager 1384 } // namespace view_manager
1385 } // namespace mojo 1385 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/services/view_manager/view_manager_service_impl.cc ('k') | mojo/services/view_manager/window_tree_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698