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

Unified Diff: chrome/test/data/webui/webui_resource_browsertest.cc

Issue 16831021: Convert asynchronous closure test in cr.ui framework to a browser test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove assertNotThrows and tweak array comparison. Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/data/webui/webui_resource_browsertest.cc
diff --git a/chrome/test/data/webui/webui_resource_browsertest.cc b/chrome/test/data/webui/webui_resource_browsertest.cc
index e2d5114d9476c9d24bcfe1c014d0ae04a0b13117..61e52318f26ab71a8c50a84f01152a3345886902 100644
--- a/chrome/test/data/webui/webui_resource_browsertest.cc
+++ b/chrome/test/data/webui/webui_resource_browsertest.cc
@@ -44,6 +44,9 @@ class WebUIResourceBrowserTest : public InProcessBrowserTest {
std::string message;
ExecuteJavascriptOnCurrentTab("runTests()");
ASSERT_TRUE(message_queue.WaitForMessage(&message));
+ while (message.compare("\"PENDING\"") == 0) {
+ ASSERT_TRUE(message_queue.WaitForMessage(&message));
+ }
Dan Beam 2013/06/20 18:31:46 nit: use a do { } while () instead
EXPECT_STREQ("\"SUCCESS\"", message.c_str());
}
@@ -77,3 +80,8 @@ IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, LocalStringsTest) {
AddLibrary(IDR_WEBUI_JS_LOCAL_STRINGS);
RunTest(base::FilePath(FILE_PATH_LITERAL("local_strings_test.html")));
}
+
+IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ParseHtmlSubsetTest) {
+ AddLibrary(IDR_WEBUI_JS_PARSE_HTML_SUBSET);
+ RunTest(base::FilePath(FILE_PATH_LITERAL("parse_html_subset_test.html")));
+}

Powered by Google App Engine
This is Rietveld 408576698