Added support for layout render tests. These use expected values for the text render output from Du…

pkg/unittest/interactive_html_config.dart

 // Copyright (c) 2012, 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.
 
 /**
  * This configuration can be used to rerun selected tests, as well
  * as see diagnostic output from tests. It runs each test in its own
- * IFrame, so the configuration consists of two parts - a 'master'
- * config that manages all the tests, and a 'slave' config for the
+ * IFrame, so the configuration consists of two parts - a 'parent'
+ * config that manages all the tests, and a 'child' config for the
  * IFrame that runs the individual tests.
  */
 #library('interactive_config');
 
 // TODO(gram) - add options for: remove IFrame on done/keep
 // IFrame for failed tests/keep IFrame for all tests.
 
 #import('dart:html');
 #import('dart:math');
 #import('unittest.dart');
 
-/** The messages exchanged between master and slave. */
+/** The messages exchanged between parent and child. */
 
 class _Message {
   static final START = 'start';
   static final LOG = 'log';
   static final STACK = 'stack';
   static final PASS = 'pass';
   static final FAIL = 'fail';
   static final ERROR = 'error';
 
   String messageType;
@@ skipping 13 matching lines @@
     int idx2 = msg.indexOf(' ', idx);
     elapsed = parseInt(msg.substring(idx, idx2));
     ++idx2;
     body = msg.substring(idx2);
   }
 
   String toString() => text(messageType, elapsed, body);
 }
 
 /**
- * The slave configuration that is used to run individual tests in
- * an IFrame and post the results back to the master. In principle
+ * The child configuration that is used to run individual tests in
+ * an IFrame and post the results back to the parent. In principle
  * this can run more than one test in the IFrame but currently only
  * one is used.
  */
-class SlaveInteractiveHtmlConfiguration extends Configuration {
+class ChildInteractiveHtmlConfiguration extends Configuration {
   // TODO(rnystrom): Get rid of this if we get canonical closures for methods.
   EventListener _onErrorClosure;
 
   /** The window to which results must be posted. */
-  Window masterWindow;
+  Window parentWindow;
 
   /** The time at which tests start. */
   Map<int,Date> _testStarts;
 
-  SlaveInteractiveHtmlConfiguration() :
+  ChildInteractiveHtmlConfiguration() :
       _testStarts = new Map<int,Date>();
 
   /** Don't start running tests automatically. */
   get autoStart() => false;
 
   void onInit() {
     _onErrorClosure =
         (e) => handleExternalError(e, '(DOM callback has errors)');
 
     /**
-     *  The master posts a 'start' message to kick things off,
-     *  which is handled by this handler. It saves the master
+     *  The parent posts a 'start' message to kick things off,
+     *  which is handled by this handler. It saves the parent
      *  window, gets the test ID from the query parameter in the
      *  IFrame URL, sets that as a solo test and starts test execution.
      */
     window.on.message.add((MessageEvent e) {
       // Get the result, do any logging, then do a pass/fail.
       var m = new _Message.fromString(e.data);
       if (m.messageType == _Message.START) {
-        masterWindow = e.source;
+        parentWindow = e.source;
         String search = window.location.search;
         int pos = search.indexOf('t=');
         String ids = search.substring(pos+2);
         int id = parseInt(ids);
         setSoloTest(id);
         runTests();
       }
     });
   }
 
   void onStart() {
     // Listen for uncaught errors.
     window.on.error.add(_onErrorClosure);
   }
 
   /** Record the start time of the test. */
   void onTestStart(TestCase testCase) {
     super.onTestStart(testCase);
     _testStarts[testCase.id]= new Date.now();
   }
 
   /**
    * Tests can call [log] for diagnostic output. These log
    * messages in turn get passed to this method, which adds
-   * a timestamp and posts them back to the master window.
+   * a timestamp and posts them back to the parent window.
    */
   void logMessage(TestCase testCase, String message) {
     int elapsed;
     if (testCase == null) {
       elapsed = -1;
     } else {
       Date end = new Date.now();
       elapsed = end.difference(_testStarts[testCase.id]).inMilliseconds;
     }
-    masterWindow.postMessage(
+    parentWindow.postMessage(
       _Message.text(_Message.LOG, elapsed, message).toString(), '*');
   }
 
   /**
    * Get the elapsed time for the test, anbd post the test result
-   * back to the master window. If the test failed due to an exception
+   * back to the parent window. If the test failed due to an exception
    * the stack is posted back too (before the test result).
    */
   void onTestResult(TestCase testCase) {
     super.onTestResult(testCase);
     Date end = new Date.now();
     int elapsed = end.difference(_testStarts[testCase.id]).inMilliseconds;
     if (testCase.stackTrace != null) {
-      masterWindow.postMessage(
+      parentWindow.postMessage(
           _Message.text(_Message.STACK, elapsed, testCase.stackTrace), '*');
     }
-    masterWindow.postMessage(
+    parentWindow.postMessage(
         _Message.text(testCase.result, elapsed, testCase.message), '*');
   }
 
   void onDone(int passed, int failed, int errors, List<TestCase> results,
               String uncaughtError) {
     window.on.error.remove(_onErrorClosure);
   }
 }
 
 /**
- * The master configuration runs in the top-level window; it wraps the tests
- * in new functions that create slave IFrames and run the real tests.
+ * The parent configuration runs in the top-level window; it wraps the tests
+ * in new functions that create child IFrames and run the real tests.
  */
-class MasterInteractiveHtmlConfiguration extends Configuration {
+class ParentInteractiveHtmlConfiguration extends Configuration {
   Map<int,Date> _testStarts;
   // TODO(rnystrom): Get rid of this if we get canonical closures for methods.
   EventListener _onErrorClosure;
 
-  /** The stack that was posted back from the slave, if any. */
+  /** The stack that was posted back from the child, if any. */
   String _stack;
 
   int _testTime;
   /**
    * Whether or not we have already wrapped the TestCase test functions
    * in new closures that instead create an IFrame and get it to run the
    * test.
    */
   bool _doneWrap = false;
 
   /**
    * We use this to make a single closure from _handleMessage so we
    * can remove the handler later.
    */
   Function _messageHandler;
 
-  MasterInteractiveHtmlConfiguration() :
+  ParentInteractiveHtmlConfiguration() :
       _testStarts = new Map<int,Date>();
 
   // We need to block until the test is done, so we make a
   // dummy async callback that we will use to flag completion.
   Function completeTest = null;
 
   wrapTest(TestCase testCase) {
     String baseUrl = window.location.toString();
     String url = '${baseUrl}?t=${testCase.id}';
     return () {
-      // Rebuild the slave IFrame.
-      Element slaveDiv = document.query('#slave');
-      slaveDiv.nodes.clear();
-      IFrameElement slave = new Element.html("""
-          <iframe id='slaveFrame${testCase.id}' src='$url' style='display:none'>
+      // Rebuild the child IFrame.
+      Element childDiv = document.query('#child');
+      childDiv.nodes.clear();
+      IFrameElement child = new Element.html("""
+          <iframe id='childFrame${testCase.id}' src='$url' style='display:none'>
           </iframe>""");
-      slaveDiv.nodes.add(slave);
+      childDiv.nodes.add(child);
       completeTest = expectAsync0((){ });
       // Kick off the test when the IFrame is loaded.
-      slave.on.load.add((e) {
-        slave.contentWindow.postMessage(_Message.text(_Message.START), '*');
+      child.on.load.add((e) {
+        child.contentWindow.postMessage(_Message.text(_Message.START), '*');
       });
     };
   }
 
   void _handleMessage(MessageEvent e) {
     // Get the result, do any logging, then do a pass/fail.
     var msg = new _Message.fromString(e.data);
     if (msg.messageType == _Message.LOG) {
-      log(e.data);
+      trace(e.data);
     } else if (msg.messageType == _Message.STACK) {
       _stack = msg.body;
     } else {
       _testTime = msg.elapsed;
-      log(_Message.text(_Message.LOG, _testTime, 'Complete'));
+      trace(_Message.text(_Message.LOG, _testTime, 'Complete'));
       if (msg.messageType == _Message.PASS) {
         currentTestCase.pass();
       } else if (msg.messageType == _Message.FAIL) {
         currentTestCase.fail(msg.body, _stack);
       } else if (msg.messageType == _Message.ERROR) {
         currentTestCase.error(msg.body, _stack);
       }
       completeTest();
     }
   }
@@ skipping 113 matching lines @@
         }
       });
     } else { // Reset the test element.
       testItem.classes.clear();
       testItem.classes.add('test-it');
       testItem.classes.add('status-pending');
       testItem.query('#$_actionIdPrefix$id').innerHTML = '';
     }
   }
 
-  // Actually test logging is handled by the slave, then posted
-  // back to the master. So here we know that the [message] argument
+  // Actually test logging is handled by the child, then posted
+  // back to the parent. So here we know that the [message] argument
   // is in the format used by [_Message].
   void logMessage(TestCase testCase, String message) {
     var msg = new _Message.fromString(message);
     if (msg.elapsed < 0) { // No associated test case.
       document.query('#otherlogs').nodes.add(
           new Element.html('<p>${msg.body}</p>'));
     } else {
       var actions = document.query('#$_testIdPrefix${testCase.id}').
           query('.test-actions');
       String elapsedText = msg.elapsed >= 0 ? "${msg.elapsed}ms" : "";
@@ skipping 38 matching lines @@
     window.on.error.remove(_onErrorClosure);
     document.query('#busy').style.display = 'none';
     InputElement startButton = document.query('#start');
     startButton.disabled = false;
   }
 }
 
 /**
  * Add the divs to the DOM if they are not present. We have a 'controls'
  * div for control, 'specs' div with test results, a 'busy' div for the
- * animated GIF used to indicate tests are running, and a 'slave' div to
+ * animated GIF used to indicate tests are running, and a 'child' div to
  * hold the iframe for the test.
  */
 void _prepareDom() {
   if (document.query('#control') == null) {
     // Use this as an opportunity for adding the CSS too.
     // I wanted to avoid having to include a css element explicitly
     // in the main html file. I considered moving all the styles
     // inline as attributes but that started getting very messy,
     // so we do it this way.
     document.body.nodes.add(new Element.html("<style>$_CSS</style>"));
@@ skipping 13 matching lines @@
   }
   if (document.query('#specs') == null) {
     document.body.nodes.add(new Element.html(
         "<div id='specs'><div id='group-divs'></div></div>"));
   }
   if (document.query('#busy') == null) {
     document.body.nodes.add(new Element.html(
         "<div id='busy' style='display:none'><img src='googleballs.gif'>"
         "</img></div>"));
   }
-  if (document.query('#slave') == null) {
-    document.body.nodes.add(new Element.html("<div id='slave'></div>"));
+  if (document.query('#child') == null) {
+    document.body.nodes.add(new Element.html("<div id='child'></div>"));
   }
 }
 
 /**
- * Allocate a Configuration. We allocate either a master or
- * slave, depedning on whether the URL has a search part.
+ * Allocate a Configuration. We allocate either a parent or
+ * child, depedning on whether the URL has a search part.
  */
 void useInteractiveHtmlConfiguration() {
-  if (window.location.search == '') { // This is the master.
+  if (window.location.search == '') { // This is the parent.
     _prepareDom();
-    configure(new MasterInteractiveHtmlConfiguration());
+    configure(new ParentInteractiveHtmlConfiguration());
   } else {
-    configure(new SlaveInteractiveHtmlConfiguration());
+    configure(new ChildInteractiveHtmlConfiguration());
   }
 }
 
 String _CSS = """
 body {
 font-family: Arial, sans-serif;
 margin: 0;
 font-size: 14px;
 }
 
@@ skipping 182 matching lines @@
 display: block;
 list-style-type: disc;
 -webkit-margin-before: 1em;
 -webkit-margin-after: 1em;
 -webkit-margin-start: 0px;
 -webkit-margin-end: 0px;
 -webkit-padding-start: 40px;
 }
 
   """;