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

Side by Side Diff: chrome/browser/ui/global_error_service_unittest.cc

Issue 7948003: Update error badge on wrench menu button (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/ui/global_error_service.h" 5 #include "chrome/browser/ui/global_error_service.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/ui/global_error.h" 9 #include "chrome/browser/ui/global_error.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 private: 101 private:
102 int command_id_; 102 int command_id_;
103 103
104 DISALLOW_COPY_AND_ASSIGN(MenuError); 104 DISALLOW_COPY_AND_ASSIGN(MenuError);
105 }; 105 };
106 106
107 } // namespace 107 } // namespace
108 108
109 // Test adding errors to the global error service. 109 // Test adding errors to the global error service.
110 TEST(GlobalErrorServiceTest, AddError) { 110 TEST(GlobalErrorServiceTest, AddError) {
111 scoped_ptr<GlobalErrorService> service(new GlobalErrorService); 111 scoped_ptr<GlobalErrorService> service(new GlobalErrorService(NULL));
112 EXPECT_EQ(0u, service->errors().size()); 112 EXPECT_EQ(0u, service->errors().size());
113 113
114 BaseError* error1 = new BaseError; 114 BaseError* error1 = new BaseError;
115 service->AddGlobalError(error1); 115 service->AddGlobalError(error1);
116 EXPECT_EQ(1u, service->errors().size()); 116 EXPECT_EQ(1u, service->errors().size());
117 EXPECT_EQ(error1, service->errors()[0]); 117 EXPECT_EQ(error1, service->errors()[0]);
118 118
119 BaseError* error2 = new BaseError; 119 BaseError* error2 = new BaseError;
120 service->AddGlobalError(error2); 120 service->AddGlobalError(error2);
121 EXPECT_EQ(2u, service->errors().size()); 121 EXPECT_EQ(2u, service->errors().size());
122 EXPECT_EQ(error1, service->errors()[0]); 122 EXPECT_EQ(error1, service->errors()[0]);
123 EXPECT_EQ(error2, service->errors()[1]); 123 EXPECT_EQ(error2, service->errors()[1]);
124 124
125 // Ensure that deleting the service deletes the error objects. 125 // Ensure that deleting the service deletes the error objects.
126 EXPECT_EQ(2, BaseError::count()); 126 EXPECT_EQ(2, BaseError::count());
127 service.reset(); 127 service.reset();
128 EXPECT_EQ(0, BaseError::count()); 128 EXPECT_EQ(0, BaseError::count());
129 } 129 }
130 130
131 // Test removing errors from the global error service. 131 // Test removing errors from the global error service.
132 TEST(GlobalErrorServiceTest, RemoveError) { 132 TEST(GlobalErrorServiceTest, RemoveError) {
133 scoped_ptr<GlobalErrorService> service(new GlobalErrorService); 133 scoped_ptr<GlobalErrorService> service(new GlobalErrorService(NULL));
134 BaseError error1; 134 BaseError error1;
135 service->AddGlobalError(&error1); 135 service->AddGlobalError(&error1);
136 BaseError error2; 136 BaseError error2;
137 service->AddGlobalError(&error2); 137 service->AddGlobalError(&error2);
138 138
139 EXPECT_EQ(2u, service->errors().size()); 139 EXPECT_EQ(2u, service->errors().size());
140 service->RemoveGlobalError(&error1); 140 service->RemoveGlobalError(&error1);
141 EXPECT_EQ(1u, service->errors().size()); 141 EXPECT_EQ(1u, service->errors().size());
142 EXPECT_EQ(&error2, service->errors()[0]); 142 EXPECT_EQ(&error2, service->errors()[0]);
143 service->RemoveGlobalError(&error2); 143 service->RemoveGlobalError(&error2);
144 EXPECT_EQ(0u, service->errors().size()); 144 EXPECT_EQ(0u, service->errors().size());
145 145
146 // Ensure that deleting the service does not delete the error objects. 146 // Ensure that deleting the service does not delete the error objects.
147 EXPECT_EQ(2, BaseError::count()); 147 EXPECT_EQ(2, BaseError::count());
148 service.reset(); 148 service.reset();
149 EXPECT_EQ(2, BaseError::count()); 149 EXPECT_EQ(2, BaseError::count());
150 } 150 }
151 151
152 // Test finding errors by their menu item command ID. 152 // Test finding errors by their menu item command ID.
153 TEST(GlobalErrorServiceTest, GetMenuItem) { 153 TEST(GlobalErrorServiceTest, GetMenuItem) {
154 BaseError* error1 = new BaseError; 154 BaseError* error1 = new BaseError;
155 MenuError* error2 = new MenuError(2); 155 MenuError* error2 = new MenuError(2);
156 MenuError* error3 = new MenuError(3); 156 MenuError* error3 = new MenuError(3);
157 157
158 GlobalErrorService service; 158 GlobalErrorService service(NULL);
159 service.AddGlobalError(error1); 159 service.AddGlobalError(error1);
160 service.AddGlobalError(error2); 160 service.AddGlobalError(error2);
161 service.AddGlobalError(error3); 161 service.AddGlobalError(error3);
162 162
163 EXPECT_EQ(error2, service.GetGlobalErrorByMenuItemCommandID(2)); 163 EXPECT_EQ(error2, service.GetGlobalErrorByMenuItemCommandID(2));
164 EXPECT_EQ(error3, service.GetGlobalErrorByMenuItemCommandID(3)); 164 EXPECT_EQ(error3, service.GetGlobalErrorByMenuItemCommandID(3));
165 EXPECT_EQ(NULL, service.GetGlobalErrorByMenuItemCommandID(4)); 165 EXPECT_EQ(NULL, service.GetGlobalErrorByMenuItemCommandID(4));
166 } 166 }
167 167
168 // Test getting the badge icon resource ID of the first error. 168 // Test getting the badge icon resource ID of the first error.
169 TEST(GlobalErrorServiceTest, GetBadgeID) { 169 TEST(GlobalErrorServiceTest, GetBadgeID) {
170 BaseError* error1 = new BaseError; 170 BaseError* error1 = new BaseError;
171 BadgeError error2(2); 171 BadgeError error2(2);
172 BadgeError* error3 = new BadgeError(3); 172 BadgeError* error3 = new BadgeError(3);
173 173
174 GlobalErrorService service; 174 GlobalErrorService service(NULL);
175 EXPECT_EQ(0, service.GetFirstBadgeResourceID()); 175 EXPECT_EQ(0, service.GetFirstBadgeResourceID());
176 176
177 service.AddGlobalError(error1); 177 service.AddGlobalError(error1);
178 EXPECT_EQ(0, service.GetFirstBadgeResourceID()); 178 EXPECT_EQ(0, service.GetFirstBadgeResourceID());
179 179
180 service.AddGlobalError(&error2); 180 service.AddGlobalError(&error2);
181 EXPECT_EQ(2, service.GetFirstBadgeResourceID()); 181 EXPECT_EQ(2, service.GetFirstBadgeResourceID());
182 182
183 service.AddGlobalError(error3); 183 service.AddGlobalError(error3);
184 EXPECT_EQ(2, service.GetFirstBadgeResourceID()); 184 EXPECT_EQ(2, service.GetFirstBadgeResourceID());
185 185
186 // Remove the first error with a badge. 186 // Remove the first error with a badge.
187 service.RemoveGlobalError(&error2); 187 service.RemoveGlobalError(&error2);
188 // Now error3 should be the first error with a badge. 188 // Now error3 should be the first error with a badge.
189 EXPECT_EQ(3, service.GetFirstBadgeResourceID()); 189 EXPECT_EQ(3, service.GetFirstBadgeResourceID());
190 } 190 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/global_error_service_factory.cc ('k') | chrome/browser/ui/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698