Provide ability for WebUIBrowserTests to run asynchronous tests.

chrome/browser/ui/webui/web_ui_test_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/web_ui_test_handler.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 17 matching lines @@
 bool WebUITestHandler::RunJavaScriptTestWithResult(const string16& js_text) {
   NotificationRegistrar notification_registrar;
   notification_registrar.Add(
       this, content::NOTIFICATION_EXECUTE_JAVASCRIPT_RESULT,
       Source<RenderViewHost>(web_ui_->GetRenderViewHost()));
   web_ui_->GetRenderViewHost()->ExecuteJavascriptInWebFrameNotifyResult(
       string16(), js_text);
   return WaitForResult();
 }
 
+bool WebUITestHandler::WaitForAsyncResult() {
+  is_waiting_async_ = true;
+  ui_test_utils::RunMessageLoop();

[mmenke, 2011/08/05 00:47:22]

You need to check |test_done_async_| here, and not enter the message loop if
it's already done.

[Sheridan Rawlins, 2011/08/05 01:15:48]

Done.

+  is_waiting_async_ = false;
+  return test_succeeded_async_;
+};
+
+void WebUITestHandler::RegisterMessages() {
+  web_ui_->RegisterMessageCallback("asyncTestResult", NewCallback(
+      this, &WebUITestHandler::HandleAsyncTestResult));
+}
+
+void WebUITestHandler::HandleAsyncTestResult(const ListValue* test_result) {
+  EXPECT_FALSE(test_done_async_);
+  test_done_async_ = true;

[mmenke, 2011/08/05 00:47:22]

Neither this nor |is_waiting_async_| is ever initialized to false.

[Sheridan Rawlins, 2011/08/05 01:15:48]

Done.

+
+  if (is_waiting_async_)
+    MessageLoopForUI::current()->Quit();
+
+  SCOPED_TRACE("WebUITestHandler::HandleAsyncTestResult");
+  HandleTestResult(test_result, &test_succeeded_async_);
+}
+
+void WebUITestHandler::HandleTestResult(const ListValue* test_result,
+                                        bool* success) {
+  ASSERT_TRUE(test_result->GetBoolean(0, success));

[mmenke, 2011/08/05 00:47:22]

You should probably initialize success to false, before this call, just to be
paranoid.

[Sheridan Rawlins, 2011/08/05 01:15:48]

Done.

+  if (!success) {
+    std::string message;
+    ASSERT_TRUE(test_result->GetString(1, &message));
+    LOG(ERROR) << message;
+  }
+}
+
 void WebUITestHandler::Observe(int type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
   // Quit the message loop if we were waiting so Waiting process can get result
   // or error. To ensure this gets done, do this before ASSERT* calls.
   if (is_waiting_)
     MessageLoopForUI::current()->Quit();
 
   SCOPED_TRACE("WebUITestHandler::Observe");
   Value* value = Details<std::pair<int, Value*> >(details)->second;
-  ListValue* list_value;
-  ASSERT_TRUE(value->GetAsList(&list_value));
-  ASSERT_TRUE(list_value->GetBoolean(0, &test_succeeded_));
-  if (!test_succeeded_) {
-    std::string message;
-    ASSERT_TRUE(list_value->GetString(1, &message));
-    LOG(ERROR) << message;
-  }
+  ListValue* test_result;
+  ASSERT_TRUE(value->GetAsList(&test_result));
+  HandleTestResult(test_result, &test_succeeded_);
 }
 
 bool WebUITestHandler::WaitForResult() {
   is_waiting_ = true;
   ui_test_utils::RunMessageLoop();
   is_waiting_ = false;
   return test_succeeded_;
 }