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

Side by Side Diff: mojo/application/public/cpp/tests/service_registry_unittest.cc

Issue 1195003002: Mandoline: Introduce ApplicationConnection::CloseConnection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 5 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
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 "mojo/application/public/cpp/lib/service_registry.h" 5 #include "mojo/application/public/cpp/lib/service_registry.h"
6 6
7 #include "mojo/application/public/cpp/service_connector.h" 7 #include "mojo/application/public/cpp/service_connector.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 9
10 namespace mojo { 10 namespace mojo {
(...skipping 10 matching lines...) Expand all
21 21
22 private: 22 private:
23 int* delete_count_; 23 int* delete_count_;
24 }; 24 };
25 25
26 TEST(ServiceRegistryTest, Ownership) { 26 TEST(ServiceRegistryTest, Ownership) {
27 int delete_count = 0; 27 int delete_count = 0;
28 28
29 // Destruction. 29 // Destruction.
30 { 30 {
31 ServiceRegistry registry; 31 ServiceRegistry* registry = new ServiceRegistry;
32 registry.SetServiceConnectorForName(new TestConnector(&delete_count), 32 registry->SetServiceConnectorForName(new TestConnector(&delete_count),
33 "TC1"); 33 "TC1");
34 registry->CloseConnection();
34 } 35 }
35 EXPECT_EQ(1, delete_count); 36 EXPECT_EQ(1, delete_count);
36 37
37 // Removal. 38 // Removal.
38 { 39 {
39 ServiceRegistry registry; 40 ServiceRegistry* registry = new ServiceRegistry;
40 ServiceConnector* c = new TestConnector(&delete_count); 41 ServiceConnector* c = new TestConnector(&delete_count);
41 registry.SetServiceConnectorForName(c, "TC1"); 42 registry->SetServiceConnectorForName(c, "TC1");
42 registry.RemoveServiceConnectorForName("TC1"); 43 registry->RemoveServiceConnectorForName("TC1");
44 registry->CloseConnection();
43 EXPECT_EQ(2, delete_count); 45 EXPECT_EQ(2, delete_count);
44 } 46 }
45 47
46 // Multiple. 48 // Multiple.
47 { 49 {
48 ServiceRegistry registry; 50 ServiceRegistry* registry = new ServiceRegistry;
49 registry.SetServiceConnectorForName(new TestConnector(&delete_count), 51 registry->SetServiceConnectorForName(new TestConnector(&delete_count),
50 "TC1"); 52 "TC1");
51 registry.SetServiceConnectorForName(new TestConnector(&delete_count), 53 registry->SetServiceConnectorForName(new TestConnector(&delete_count),
52 "TC2"); 54 "TC2");
55 registry->CloseConnection();
53 } 56 }
54 EXPECT_EQ(4, delete_count); 57 EXPECT_EQ(4, delete_count);
55 58
56 // Re-addition. 59 // Re-addition.
57 { 60 {
58 ServiceRegistry registry; 61 ServiceRegistry* registry = new ServiceRegistry;
59 registry.SetServiceConnectorForName(new TestConnector(&delete_count), 62 registry->SetServiceConnectorForName(new TestConnector(&delete_count),
60 "TC1"); 63 "TC1");
61 registry.SetServiceConnectorForName(new TestConnector(&delete_count), 64 registry->SetServiceConnectorForName(new TestConnector(&delete_count),
62 "TC1"); 65 "TC1");
63 EXPECT_EQ(5, delete_count); 66 EXPECT_EQ(5, delete_count);
67 registry->CloseConnection();
64 } 68 }
65 EXPECT_EQ(6, delete_count); 69 EXPECT_EQ(6, delete_count);
66 } 70 }
67 71
68 } // namespace 72 } // namespace
69 } // namespace internal 73 } // namespace internal
70 } // namespace mojo 74 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698