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

Side by Side Diff: chrome/browser/autocomplete/shortcuts_provider_unittest.cc

Issue 11413050: chrome/browser: Update calls from RunAllPending() to RunUntilIdle(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/autocomplete/shortcuts_provider.h" 5 #include "chrome/browser/autocomplete/shortcuts_provider.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <functional> 10 #include <functional>
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 backend_ = ShortcutsBackendFactory::GetForProfile(&profile_); 180 backend_ = ShortcutsBackendFactory::GetForProfile(&profile_);
181 ASSERT_TRUE(backend_.get()); 181 ASSERT_TRUE(backend_.get());
182 profile_.CreateHistoryService(true, false); 182 profile_.CreateHistoryService(true, false);
183 provider_ = new ShortcutsProvider(this, &profile_); 183 provider_ = new ShortcutsProvider(this, &profile_);
184 FillData(shortcut_test_db, arraysize(shortcut_test_db)); 184 FillData(shortcut_test_db, arraysize(shortcut_test_db));
185 } 185 }
186 186
187 void ShortcutsProviderTest::TearDown() { 187 void ShortcutsProviderTest::TearDown() {
188 // Run all pending tasks or else some threads hold on to the message loop 188 // Run all pending tasks or else some threads hold on to the message loop
189 // and prevent it from being deleted. 189 // and prevent it from being deleted.
190 message_loop_.RunAllPending(); 190 message_loop_.RunUntilIdle();
191 provider_ = NULL; 191 provider_ = NULL;
192 } 192 }
193 193
194 void ShortcutsProviderTest::FillData(TestShortcutInfo* db, size_t db_size) { 194 void ShortcutsProviderTest::FillData(TestShortcutInfo* db, size_t db_size) {
195 DCHECK(provider_.get()); 195 DCHECK(provider_.get());
196 size_t expected_size = backend_->shortcuts_map().size() + db_size; 196 size_t expected_size = backend_->shortcuts_map().size() + db_size;
197 for (size_t i = 0; i < db_size; ++i) { 197 for (size_t i = 0; i < db_size; ++i) {
198 const TestShortcutInfo& cur = db[i]; 198 const TestShortcutInfo& cur = db[i];
199 ShortcutsBackend::Shortcut shortcut(cur.guid, 199 ShortcutsBackend::Shortcut shortcut(cur.guid,
200 ASCIIToUTF16(cur.title), GURL(cur.url), ASCIIToUTF16(cur.contents), 200 ASCIIToUTF16(cur.title), GURL(cur.url), ASCIIToUTF16(cur.contents),
(...skipping 17 matching lines...) Expand all
218 void ShortcutsProviderTest::SetShouldContain::operator()( 218 void ShortcutsProviderTest::SetShouldContain::operator()(
219 const std::string& expected) { 219 const std::string& expected) {
220 EXPECT_EQ(1U, matches_.erase(expected)); 220 EXPECT_EQ(1U, matches_.erase(expected));
221 } 221 }
222 222
223 void ShortcutsProviderTest::RunTest(const string16 text, 223 void ShortcutsProviderTest::RunTest(const string16 text,
224 std::vector<std::string> expected_urls, 224 std::vector<std::string> expected_urls,
225 std::string expected_top_result) { 225 std::string expected_top_result) {
226 std::sort(expected_urls.begin(), expected_urls.end()); 226 std::sort(expected_urls.begin(), expected_urls.end());
227 227
228 MessageLoop::current()->RunAllPending(); 228 MessageLoop::current()->RunUntilIdle();
229 AutocompleteInput input(text, string16(), false, false, true, 229 AutocompleteInput input(text, string16(), false, false, true,
230 AutocompleteInput::ALL_MATCHES); 230 AutocompleteInput::ALL_MATCHES);
231 provider_->Start(input, false); 231 provider_->Start(input, false);
232 EXPECT_TRUE(provider_->done()); 232 EXPECT_TRUE(provider_->done());
233 233
234 ac_matches_ = provider_->matches(); 234 ac_matches_ = provider_->matches();
235 235
236 // We should have gotten back at most AutocompleteProvider::kMaxMatches. 236 // We should have gotten back at most AutocompleteProvider::kMaxMatches.
237 EXPECT_LE(ac_matches_.size(), AutocompleteProvider::kMaxMatches); 237 EXPECT_LE(ac_matches_.size(), AutocompleteProvider::kMaxMatches);
238 238
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 664
665 match.destination_url = GURL(shortcuts_to_test_delete[2].url); 665 match.destination_url = GURL(shortcuts_to_test_delete[2].url);
666 match.contents = ASCIIToUTF16(shortcuts_to_test_delete[2].contents); 666 match.contents = ASCIIToUTF16(shortcuts_to_test_delete[2].contents);
667 match.description = ASCIIToUTF16(shortcuts_to_test_delete[2].description); 667 match.description = ASCIIToUTF16(shortcuts_to_test_delete[2].description);
668 668
669 provider_->DeleteMatch(match); 669 provider_->DeleteMatch(match);
670 EXPECT_EQ(original_shortcuts_count, backend_->shortcuts_map().size()); 670 EXPECT_EQ(original_shortcuts_count, backend_->shortcuts_map().size());
671 EXPECT_TRUE(backend_->shortcuts_map().end() == 671 EXPECT_TRUE(backend_->shortcuts_map().end() ==
672 backend_->shortcuts_map().find(ASCIIToUTF16("delete"))); 672 backend_->shortcuts_map().find(ASCIIToUTF16("delete")));
673 } 673 }
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/search_provider_unittest.cc ('k') | chrome/browser/bookmarks/bookmark_html_writer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698