Add some browser tests for net-internals

chrome/test/data/webui/net_internals/net_internals_test.js

 // 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.
 
 /**
  * @fileoverview The way these tests work is as follows:
  * C++ in net_internals_ui_browsertest.cc does any necessary setup, and then
  * calls the entry point for a test with RunJavascriptTest.  The called
  * function can then use the assert/expect functions defined in test_api.js.
  * All callbacks from the browser are wrapped in such a way that they can
  * also use the assert/expect functions.
  *
- * A test ends when an assert/expect test fails, an exception is thrown, or
- * |netInternalsTest.testDone| is called.  At that point, or soon afterwards,
- * the title is updated to 'Test Failed' if an assert/expect test fails, or
- * there was an exception.  Otherwise, it's set to 'Test Passed'.  The
- * behavior when an assert/expect test fails or an assertion is thrown only
- * after |netInternalsTest.testDone| is called is undefined.
+ * A test ends when asyncTestDone, which is done when the end of a test
+ * is reached runTestFunction reports a failure.
  */
 
 // Start of namespace.
 var netInternalsTest = (function() {
   /**
    * Use a shorter poll interval for tests, since a few tests wait for polled
    * values to change.
    * @type {number}
    * @const
    */
   var TESTING_POLL_INTERVAL_MS = 50;
 
   /**
-   * Indicates if the test is complete.
-   * @type {boolean}
-   */
-  var done = false;
-
-  /**
-   * Updates the title of the page to report success or failure.  Must be
-   * called at most once for each test.
-   * @param {boolean} success Description of success param.
-   */
-  function updateTitle(success) {
-    if (success) {
-      document.title = 'Test Passed';
-    } else {
-      document.title = 'Test Failed';
-    }
-    done = true;
-  }
-
-  /**
-   * Called to indicate a test is complete.
-   */
-  function testDone() {
-    done = true;
-  }
-
-  /**
    * Creates a test function that can use the expect and assert functions
-   * in test_api.js.  On failure, will set title to 'Test Failed', and when
-   * a test is done and there was no failure, will set title to 'Test Passed'.
-   * Calling expect/assert functions after done has been called has undefined
-   * behavior.  Returned test functions can safely call each other directly.
+   * in test_api.js.  Calls asyncTestDone when runTestFunction reports an
+   * error.  Tests also call asyncTestDone when complete.
    *
    * The resulting function has no return value.
    * @param {string} testName The name of the function, reported on error.
    * @param {Function} testFunction The function to run.
    * @return {function():void} Function that passes its parameters to
    *     testFunction, and passes the test result, if any, to the browser
    *     process by setting the window title.
    */
   function createTestFunction(testName, testFunction) {
     return function() {
       // Convert arguments to an array, as their map method may be called on
       // failure by runTestFunction.
       var testArguments = Array.prototype.slice.call(arguments, 0);
 
-      // If the test is already complete, do nothing.
-      if (done)
-        return;
-
       var result = runTestFunction(testName, testFunction, testArguments);
 
       // If the first value is false, the test failed.
-      if (!result[0]) {
-        // Print any error messages.
-        console.log(result[1]);
-        // Update title to indicate failure.
-        updateTitle(false);
-      } else if (done)  {
-        // If the first result is true, and |done| is also true, the test
-        // passed.  Update title to indicate success.
-        updateTitle(true);
-      }
+      if (!result[0])
+        asyncTestDone();
     };
   }
 
   /**
    * Dictionary of tests.
    * @type {Object.<string, Function>}
    */
   var tests = {};
 
   /**
@@ skipping 36 matching lines @@
         this.testStarted_ = true;
         startNetInternalsTest(testFunction, testArguments);
       }
     };
 
     g_browser.addConstantsObserver(new ConstantsObserver());
   }
 
   /**
    * Starts running the test.  A test is run until an assert/expect statement
-   * fails or testDone is called.  Those functions can only be called in the
+   * fails or testResult is called.  Those functions can only be called in the
    * test function body, or in response to a message dispatched by
    * |g_browser.receive|.
    * @param {string} testName The of the test to run.
    * @param {Function} testArguments The test arguments.
    */
   function startNetInternalsTest(testName, testArguments) {
     // Wrap g_browser.receive around a test function so that assert and expect
     // functions can be called from observers.
     g_browser.receive = createTestFunction('g_browser.receive', function() {
       BrowserBridge.prototype.receive.apply(g_browser, arguments);
@@ skipping 34 matching lines @@
    * @param {string}: viewId Id of the view to switch to.
    */
   function switchToView(viewId) {
     document.location.hash = '#' + viewId;
   }
 
   // Exported functions.
   return {
     test: test,
     runTest: runTest,
-    testDone:testDone,
     checkStyledTableRows: checkStyledTableRows,
     switchToView: switchToView
   };
 })();
 
 netInternalsTest.test('NetInternalsDone', function() {
-  netInternalsTest.testDone();
+  asyncTestDone();
 });
 
 netInternalsTest.test('NetInternalsExpectFail', function() {
   expectNotReached();
+  asyncTestDone();
 });
 
 netInternalsTest.test('NetInternalsAssertFail', function() {
   assertNotReached();
+  asyncTestDone();
 });
 
 netInternalsTest.test('NetInternalsObserverDone', function() {
   /**
-   * A HostResolverInfo observer that calls testDone() in response to the
+   * A HostResolverInfo observer that calls asyncTestDone() in response to the
    * first seen event.
    */
   function HostResolverInfoObserver() {
   }
 
   HostResolverInfoObserver.prototype.onHostResolverInfoChanged = function() {
-    netInternalsTest.testDone();
+    asyncTestDone();
   };
 
   // Create the observer and add it to |g_browser|.
   g_browser.addHostResolverInfoObserver(new HostResolverInfoObserver());
 
   // Needed to trigger an update.
   netInternalsTest.switchToView('dns');
 });
 
 netInternalsTest.test('NetInternalsObserverExpectFail', function() {
   /**
    * A HostResolverInfo observer that triggers an exception in response to the
    * first seen event.
    */
   function HostResolverInfoObserver() {
   }
 
   HostResolverInfoObserver.prototype.onHostResolverInfoChanged = function() {
     expectNotReached();
-    netInternalsTest.testDone();
+    asyncTestDone();
   };
 
   // Create the observer and add it to |g_browser|.
   g_browser.addHostResolverInfoObserver(new HostResolverInfoObserver());
 
   // Needed to trigger an update.
   netInternalsTest.switchToView('dns');
 });
 
 netInternalsTest.test('NetInternalsObserverAssertFail', function() {
   /**
    * A HostResolverInfo observer that triggers an assertion in response to the
    * first seen event.
    */
   function HostResolverInfoObserver() {
   }
 
   HostResolverInfoObserver.prototype.onHostResolverInfoChanged = function() {
     assertNotReached();
   };
 
   // Create the observer and add it to |g_browser|.
   g_browser.addHostResolverInfoObserver(new HostResolverInfoObserver());
 
   // Needed to trigger an update.
   netInternalsTest.switchToView('dns');
 });