Add div displaying the currently executing test.

tools/testing/dart/browser_controller.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 library browser;
 
 import "dart:async";
 import "dart:convert" show LineSplitter, UTF8;
 import "dart:core";
 import "dart:io";
 
@@ skipping 30 matching lines @@
 
   /** Print everything (stdout, stderr, usageLog) whenever we add to it */
   bool debugPrint = false;
 
   // This future returns when the process exits. It is also the return value
   // of close()
   Future done;
 
   Browser();
 
-  factory Browser.byName(String name) {
+  factory Browser.byName(String name, [String binaryLocation]) {

[kustermann, 2013/09/03 07:35:15]

Unused variable!

     if (name == 'ff' || name == 'firefox') {
       return new Firefox();
     } else if (name == 'chrome') {
       return new Chrome();
     } else if (name == 'safari') {
       return new Safari();
     } else if (name.startsWith('ie')) {
       return new IE();
     } else {
       throw "Non supported browser";
@@ skipping 390 matching lines @@
   }
 
   String toString() => "chromeOnAndroid";
 }
 
 class Firefox extends Browser {
   /**
    * The binary used to run firefox - changing this can be nececcary for
    * testing or using non standard firefox installation.
    */
-  static const String binary = "firefox";
+  static const String _binary = "firefox";

[kustermann, 2013/09/03 07:35:15]

You still use 'binary'!

 
   static const String enablePopUp =
       'user_pref("dom.disable_open_during_load", false);';
   static const String disableDefaultCheck =
       'user_pref("browser.shell.checkDefaultBrowser", false);';
   static const String disableScriptTimeLimit =
       'user_pref("dom.max_script_run_time", 0);';
 
   Future _createPreferenceFile(var path) {
     var file = new File("${path.toString()}/user.js");
@@ skipping 525 matching lines @@
     function startTesting() {
       var number_of_tests = 0;
       var current_id;
       var next_id;
       // Describes a state where we are currently fetching the next test
       // from the server. We use this to never double request tasks.
       var test_completed = true;
       var testing_window;
 
       var embedded_iframe = document.getElementById('embedded_iframe');
+      var number_div = document.getElementById('number');
+      var executing_div = document.getElementById('currently_executing');
+      var error_div = document.getElementById('unhandled_error');
       var use_iframe = ${useIframe};
       var start = new Date();
 
       function newTaskHandler() {
         if (this.readyState == this.DONE) {
           if (this.status == 200) {
             if (this.responseText == '$waitSignal') {
               setTimeout(getNextTask, 500);
             } else if (this.responseText == '$terminateSignal') {
               // Don't do anything, we will be killed shortly.
@@ skipping 29 matching lines @@
 
       function getNextTask() {
         // Until we have the next task we set the current_id to a specific
         // negative value.
         contactBrowserController(
             'GET', '$nextTestPath/$browserId', newTaskHandler, "", false); 
       }
 
       function run(url) {
         number_of_tests++;
-        document.getElementById('number').innerHTML = number_of_tests;
+        number_div.innerHTML = number_of_tests;
+        executing_div.innerHTML = url;
         if (use_iframe) {
           embedded_iframe.src = url;
         } else {
           if (testing_window == undefined) {
             testing_window = window.open(url);
           } else {
             testing_window.location = url;
           }
         }
       }
 
       window.onerror = function (message, url, lineNumber) {
         if (url) {
           reportError(url + ':' + lineNumber + ':' + message);
         } else {
           reportError(message);
         }
       }
 
       function reportError(msg) {
         function handleReady() {
           if (this.readyState == this.DONE && this.status != 200) {
-            // We could not report, pop up to notify if running interactively.
-            alert(this.status);
+            var error = 'Sending back error did not succeeed: ' + this.status;
+            error = error + '. Failed to send msg: ' + msg;
+            error_div.innerHTML = error;
           }
         }
         contactBrowserController(
             'POST', '$errorReportingUrl?test=1', handleReady, msg, true); 
       }
 
       function reportMessage(msg) {
         if (msg == 'STARTING') {
           test_completed = false;
           current_id = next_id;
@@ skipping 30 matching lines @@
 
       window.addEventListener('message', messageHandler, false);
       waitForDone = false;
 
       getNextTask();
     }
 
   </script>
 </head>
   <body onload="startTesting()">
-    Dart test driver, number of tests: <div id="number"></div>
+    Dart test driver, number of tests: <div id="number"></div><br>
+    Currently executing: <div id="currently_executing"></div><br>
+    Unhandled error: <div id="unhandled_error"></div>
     <iframe id="embedded_iframe"></iframe>
   </body>
 </html>
 """;
     return driverContent;
   }
 }