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

Side by Side Diff: chrome/renderer/translate_helper_browsertest.cc

Issue 11299062: chrome: Update the remaining 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/common/chrome_constants.h" 5 #include "chrome/common/chrome_constants.h"
6 #include "chrome/common/render_messages.h" 6 #include "chrome/common/render_messages.h"
7 #include "chrome/renderer/translate_helper.h" 7 #include "chrome/renderer/translate_helper.h"
8 #include "chrome/test/base/chrome_render_view_test.h" 8 #include "chrome/test/base/chrome_render_view_test.h"
9 #include "content/public/renderer/render_view.h" 9 #include "content/public/renderer/render_view.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 .Times(AtLeast(1)) 89 .Times(AtLeast(1))
90 .WillRepeatedly(Return(true)); 90 .WillRepeatedly(Return(true));
91 91
92 EXPECT_CALL(*translate_helper_, IsTranslateLibReady()) 92 EXPECT_CALL(*translate_helper_, IsTranslateLibReady())
93 .Times(AtLeast(5)) // See kMaxTranslateInitCheckAttempts in 93 .Times(AtLeast(5)) // See kMaxTranslateInitCheckAttempts in
94 // translate_helper.cc 94 // translate_helper.cc
95 .WillRepeatedly(Return(false)); 95 .WillRepeatedly(Return(false));
96 96
97 translate_helper_->TranslatePage( 97 translate_helper_->TranslatePage(
98 view_->GetPageId(), "en", "fr", std::string()); 98 view_->GetPageId(), "en", "fr", std::string());
99 MessageLoop::current()->RunAllPending(); 99 MessageLoop::current()->RunUntilIdle();
100 100
101 int page_id; 101 int page_id;
102 TranslateErrors::Type error; 102 TranslateErrors::Type error;
103 ASSERT_TRUE(GetPageTranslatedMessage(&page_id, NULL, NULL, &error)); 103 ASSERT_TRUE(GetPageTranslatedMessage(&page_id, NULL, NULL, &error));
104 EXPECT_EQ(view_->GetPageId(), page_id); 104 EXPECT_EQ(view_->GetPageId(), page_id);
105 EXPECT_EQ(TranslateErrors::INITIALIZATION_ERROR, error); 105 EXPECT_EQ(TranslateErrors::INITIALIZATION_ERROR, error);
106 } 106 }
107 107
108 // Tests that the browser gets notified of the translation success when the 108 // Tests that the browser gets notified of the translation success when the
109 // translation succeeds. 109 // translation succeeds.
(...skipping 15 matching lines...) Expand all
125 .WillRepeatedly(Return(false)); 125 .WillRepeatedly(Return(false));
126 EXPECT_CALL(*translate_helper_, HasTranslationFinished()) 126 EXPECT_CALL(*translate_helper_, HasTranslationFinished())
127 .WillOnce(Return(false)) 127 .WillOnce(Return(false))
128 .WillOnce(Return(false)) 128 .WillOnce(Return(false))
129 .WillOnce(Return(true)); 129 .WillOnce(Return(true));
130 130
131 std::string original_lang("en"); 131 std::string original_lang("en");
132 std::string target_lang("fr"); 132 std::string target_lang("fr");
133 translate_helper_->TranslatePage( 133 translate_helper_->TranslatePage(
134 view_->GetPageId(), original_lang, target_lang, std::string()); 134 view_->GetPageId(), original_lang, target_lang, std::string());
135 MessageLoop::current()->RunAllPending(); 135 MessageLoop::current()->RunUntilIdle();
136 136
137 int page_id; 137 int page_id;
138 std::string received_original_lang; 138 std::string received_original_lang;
139 std::string received_target_lang; 139 std::string received_target_lang;
140 TranslateErrors::Type error; 140 TranslateErrors::Type error;
141 ASSERT_TRUE(GetPageTranslatedMessage(&page_id, 141 ASSERT_TRUE(GetPageTranslatedMessage(&page_id,
142 &received_original_lang, 142 &received_original_lang,
143 &received_target_lang, 143 &received_target_lang,
144 &error)); 144 &error));
145 EXPECT_EQ(view_->GetPageId(), page_id); 145 EXPECT_EQ(view_->GetPageId(), page_id);
(...skipping 22 matching lines...) Expand all
168 .WillOnce(Return(false)) 168 .WillOnce(Return(false))
169 .WillOnce(Return(false)) 169 .WillOnce(Return(false))
170 .WillOnce(Return(true)); 170 .WillOnce(Return(true));
171 171
172 EXPECT_CALL(*translate_helper_, HasTranslationFinished()) 172 EXPECT_CALL(*translate_helper_, HasTranslationFinished())
173 .Times(AtLeast(1)) 173 .Times(AtLeast(1))
174 .WillRepeatedly(Return(false)); 174 .WillRepeatedly(Return(false));
175 175
176 translate_helper_->TranslatePage( 176 translate_helper_->TranslatePage(
177 view_->GetPageId(), "en", "fr", std::string()); 177 view_->GetPageId(), "en", "fr", std::string());
178 MessageLoop::current()->RunAllPending(); 178 MessageLoop::current()->RunUntilIdle();
179 179
180 int page_id; 180 int page_id;
181 TranslateErrors::Type error; 181 TranslateErrors::Type error;
182 ASSERT_TRUE(GetPageTranslatedMessage(&page_id, NULL, NULL, &error)); 182 ASSERT_TRUE(GetPageTranslatedMessage(&page_id, NULL, NULL, &error));
183 EXPECT_EQ(view_->GetPageId(), page_id); 183 EXPECT_EQ(view_->GetPageId(), page_id);
184 EXPECT_EQ(TranslateErrors::TRANSLATION_ERROR, error); 184 EXPECT_EQ(TranslateErrors::TRANSLATION_ERROR, error);
185 } 185 }
186 186
187 // Tests that when the browser translate a page for which the language is 187 // Tests that when the browser translate a page for which the language is
188 // undefined we query the translate element to get the language. 188 // undefined we query the translate element to get the language.
(...skipping 13 matching lines...) Expand all
202 EXPECT_CALL(*translate_helper_, StartTranslation()).WillOnce(Return(true)); 202 EXPECT_CALL(*translate_helper_, StartTranslation()).WillOnce(Return(true));
203 EXPECT_CALL(*translate_helper_, HasTranslationFailed()) 203 EXPECT_CALL(*translate_helper_, HasTranslationFailed())
204 .WillOnce(Return(false)); 204 .WillOnce(Return(false));
205 EXPECT_CALL(*translate_helper_, HasTranslationFinished()) 205 EXPECT_CALL(*translate_helper_, HasTranslationFinished())
206 .Times(AtLeast(1)) 206 .Times(AtLeast(1))
207 .WillRepeatedly(Return(true)); 207 .WillRepeatedly(Return(true));
208 208
209 translate_helper_->TranslatePage(view_->GetPageId(), 209 translate_helper_->TranslatePage(view_->GetPageId(),
210 chrome::kUnknownLanguageCode, "fr", 210 chrome::kUnknownLanguageCode, "fr",
211 std::string()); 211 std::string());
212 MessageLoop::current()->RunAllPending(); 212 MessageLoop::current()->RunUntilIdle();
213 213
214 int page_id; 214 int page_id;
215 TranslateErrors::Type error; 215 TranslateErrors::Type error;
216 std::string original_lang; 216 std::string original_lang;
217 std::string target_lang; 217 std::string target_lang;
218 ASSERT_TRUE(GetPageTranslatedMessage(&page_id, &original_lang, &target_lang, 218 ASSERT_TRUE(GetPageTranslatedMessage(&page_id, &original_lang, &target_lang,
219 &error)); 219 &error));
220 EXPECT_EQ(view_->GetPageId(), page_id); 220 EXPECT_EQ(view_->GetPageId(), page_id);
221 EXPECT_EQ("de", original_lang); 221 EXPECT_EQ("de", original_lang);
222 EXPECT_EQ("fr", target_lang); 222 EXPECT_EQ("fr", target_lang);
(...skipping 19 matching lines...) Expand all
242 .WillOnce(Return(true)); 242 .WillOnce(Return(true));
243 243
244 std::string original_lang("en"); 244 std::string original_lang("en");
245 std::string target_lang("fr"); 245 std::string target_lang("fr");
246 translate_helper_->TranslatePage( 246 translate_helper_->TranslatePage(
247 view_->GetPageId(), original_lang, target_lang, std::string()); 247 view_->GetPageId(), original_lang, target_lang, std::string());
248 // While this is running call again TranslatePage to make sure noting bad 248 // While this is running call again TranslatePage to make sure noting bad
249 // happens. 249 // happens.
250 translate_helper_->TranslatePage( 250 translate_helper_->TranslatePage(
251 view_->GetPageId(), original_lang, target_lang, std::string()); 251 view_->GetPageId(), original_lang, target_lang, std::string());
252 MessageLoop::current()->RunAllPending(); 252 MessageLoop::current()->RunUntilIdle();
253 253
254 int page_id; 254 int page_id;
255 std::string received_original_lang; 255 std::string received_original_lang;
256 std::string received_target_lang; 256 std::string received_target_lang;
257 TranslateErrors::Type error; 257 TranslateErrors::Type error;
258 ASSERT_TRUE(GetPageTranslatedMessage(&page_id, 258 ASSERT_TRUE(GetPageTranslatedMessage(&page_id,
259 &received_original_lang, 259 &received_original_lang,
260 &received_target_lang, 260 &received_target_lang,
261 &error)); 261 &error));
262 EXPECT_EQ(view_->GetPageId(), page_id); 262 EXPECT_EQ(view_->GetPageId(), page_id);
(...skipping 17 matching lines...) Expand all
280 .WillOnce(Return(true)); 280 .WillOnce(Return(true));
281 281
282 std::string original_lang("en"); 282 std::string original_lang("en");
283 std::string target_lang("fr"); 283 std::string target_lang("fr");
284 translate_helper_->TranslatePage( 284 translate_helper_->TranslatePage(
285 view_->GetPageId(), original_lang, target_lang, std::string()); 285 view_->GetPageId(), original_lang, target_lang, std::string());
286 // While this is running call again TranslatePage with a new target lang. 286 // While this is running call again TranslatePage with a new target lang.
287 std::string new_target_lang("de"); 287 std::string new_target_lang("de");
288 translate_helper_->TranslatePage( 288 translate_helper_->TranslatePage(
289 view_->GetPageId(), original_lang, new_target_lang, std::string()); 289 view_->GetPageId(), original_lang, new_target_lang, std::string());
290 MessageLoop::current()->RunAllPending(); 290 MessageLoop::current()->RunUntilIdle();
291 291
292 int page_id; 292 int page_id;
293 std::string received_original_lang; 293 std::string received_original_lang;
294 std::string received_target_lang; 294 std::string received_target_lang;
295 TranslateErrors::Type error; 295 TranslateErrors::Type error;
296 ASSERT_TRUE(GetPageTranslatedMessage(&page_id, 296 ASSERT_TRUE(GetPageTranslatedMessage(&page_id,
297 &received_original_lang, 297 &received_original_lang,
298 &received_target_lang, 298 &received_target_lang,
299 &error)); 299 &error));
300 EXPECT_EQ(view_->GetPageId(), page_id); 300 EXPECT_EQ(view_->GetPageId(), page_id);
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 GoBack(GetMainFrame()->previousHistoryItem()); 440 GoBack(GetMainFrame()->previousHistoryItem());
441 441
442 message = render_thread_->sink().GetUniqueMessageMatching( 442 message = render_thread_->sink().GetUniqueMessageMatching(
443 ChromeViewHostMsg_TranslateLanguageDetermined::ID); 443 ChromeViewHostMsg_TranslateLanguageDetermined::ID);
444 ASSERT_NE(static_cast<IPC::Message*>(NULL), message); 444 ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
445 ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params); 445 ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
446 EXPECT_EQ("zh", params.a); 446 EXPECT_EQ("zh", params.a);
447 render_thread_->sink().ClearMessages(); 447 render_thread_->sink().ClearMessages();
448 } 448 }
449 449
OLDNEW
« no previous file with comments | « chrome/renderer/spellchecker/spellcheck_unittest.cc ('k') | chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698