DevTools: merge TestSuite.Controller into TestSuite

webkit/glue/devtools/js/tests.js

 // Copyright (c) 2009 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 This file contains small testing framework along with the
  * test suite for the frontend. These tests are a part of the continues build
  * and are executed by the devtools_sanity_unittest.cc as a part of the
  * Interactive UI Test suite.
  */
 
 if (window.domAutomationController) {
 
 
 /**
  * Test suite for interactive UI tests.
  * @constructor
  */
 TestSuite = function() {
+  this.controlTaken_ = false;
+  this.timerId_ = -1;
 };
 
 
 /**
  * Reports test failure.
  * @param {string} message Failure description.
  */
 TestSuite.prototype.fail = function(message) {
-  throw message;
+  if (this.controlTaken_) {
+    this.reportFailure_(message);
+  } else {
+    throw message;
+  }
 };
 
 
 /**
  * Equals assertion tests that expected == actual.
  * @param {Object} expected Expected object.
  * @param {Object} actual Actual object.
  */
 TestSuite.prototype.assertEquals = function(expected, actual) {
   if (expected != actual) {
@@ skipping 18 matching lines @@
  * @param {string} substring Inner.
  */
 TestSuite.prototype.assertContains = function(string, substring) {
   if (string.indexOf(substring) == -1) {
     this.fail('Expected to: "' + string + '" to contain "' + substring + '"');
   }
 };
 
 
 /**
- * Runs all global functions starting with 'test' as unit tests.
- */
-TestSuite.prototype.runAllTests = function() {
-  // For debugging purposes.
-  for (var name in this) {
-    if (name.substring(0, 4) == 'test' &&
-        typeof this[name] == 'function') {
-      this.runTest(name);
-    }
-  }
-};
-
-
-/**
- * Manual controller for async tests.
- * @constructor.
- */
-TestSuite.Controller = function() {
-  this.controlTaken_ = false;
-  this.timerId_ = -1;
-};
-
-
-/**
  * Takes control over execution.
  */
-TestSuite.Controller.prototype.takeControl = function() {
+TestSuite.prototype.takeControl = function() {
   this.controlTaken_ = true;
   // Set up guard timer.
   var self = this;
   this.timerId_ = setTimeout(function() {
     self.reportFailure_('Timeout exceeded: 20 sec');
   }, 20000);
 };
 
 
 /**
  * Releases control over execution.
  */
-TestSuite.Controller.prototype.releaseControl = function() {
-  this.controlTaken_ = false;
+TestSuite.prototype.releaseControl = function() {
   if (this.timerId_ != -1) {
+    clearTimeout(this.timerId_);
     this.timerId_ = -1;
-    clearTimeout(this.timerId_);
   }
   this.reportOk_();
 };
 
 
 /**
  * Async tests use this one to report that they are completed.
  */
-TestSuite.Controller.prototype.reportOk_ = function() {
+TestSuite.prototype.reportOk_ = function() {
   window.domAutomationController.send('[OK]');
 };
 
 
 /**
  * Async tests use this one to report failures.
  */
-TestSuite.Controller.prototype.reportFailure_ = function(error) {
+TestSuite.prototype.reportFailure_ = function(error) {
   if (this.timerId_ != -1) {
+    clearTimeout(this.timerId_);
     this.timerId_ = -1;
-    clearTimeout(this.timerId_);
   }
   window.domAutomationController.send('[FAILED] ' + error);
 };
 
 
 /**
  * Runs all global functions starting with 'test' as unit tests.
  */
 TestSuite.prototype.runTest = function(testName) {
-  var controller = new TestSuite.Controller();
   try {
-    this[testName](controller);
-    if (!controller.controlTaken_) {
-      controller.reportOk_();
+    this[testName]();
+    if (!this.controlTaken_) {
+      this.reportOk_();
     }
   } catch (e) {
-    controller.reportFailure_(e);
+    this.reportFailure_(e);
   }
 };
 
 
 /**
  * @param {string} panelName Name of the panel to show.
  */
 TestSuite.prototype.showPanel = function(panelName) {
   // Open Scripts panel.
   var toolbar = document.getElementById('toolbar');
@@ skipping 38 matching lines @@
   for (var id in resources) {
     tokens.push(resources[id].lastPathComponent);
   }
   this.assertEquals('simple_page.html', tokens.join(','));
 };
 
 
 /**
  * Tests that resources tab is enabled when corresponding item is selected.
  */
-TestSuite.prototype.testEnableResourcesTab = function(controller) {
+TestSuite.prototype.testEnableResourcesTab = function() {
   this.showPanel('resources');
 
   var test = this;
   var oldAddResource = WebInspector.addResource;
   WebInspector.addResource = function(identifier, payload) {
     WebInspector.addResource = oldAddResource;
     oldAddResource.call(this, identifier, payload);
     test.assertEquals('simple_page.html', payload.lastPathComponent);
     WebInspector.panels.resources.refresh();
     WebInspector.resources[identifier]._resourcesTreeElement.select();
 
-    controller.releaseControl();
+    test.releaseControl();
   };
 
   // Following call should lead to reload that we capture in the
   // addResource override.
   WebInspector.panels.resources._enableResourceTracking();
 
   // We now have some time to report results to controller.
-  controller.takeControl();
+  this.takeControl();
 };
 
 
 /**
  * Tests resource headers.
  */
-TestSuite.prototype.testResourceHeaders = function(controller) {
+TestSuite.prototype.testResourceHeaders = function() {
   this.showPanel('resources');
 
   var test = this;
   var oldAddResource = WebInspector.addResource;
   var oldUpdateResource = WebInspector.updateResource;
 
   var requestOk = false;
   var responseOk = false;
   var timingOk = false;
 
@@ skipping 29 matching lines @@
     if (payload.didTimingChange) {
       test.assertTrue(typeof resource.startTime != 'undefnied');
       timingOk = true;
     }
 
     if (payload.didCompletionChange) {
       test.assertTrue(requestOk);
       test.assertTrue(responseOk);
       test.assertTrue(timingOk);
       test.assertTrue(typeof resource.endTime != 'undefnied');
-      controller.releaseControl();
+      test.releaseControl();
     }
   };
 
   WebInspector.panels.resources._enableResourceTracking();
-  controller.takeControl();
+  this.takeControl();
 };
 
 
 /**
  * Test that profiler works.
  */
-TestSuite.prototype.testProfilerTab = function(controller) {
+TestSuite.prototype.testProfilerTab = function() {
   this.showPanel('profiles');
 
   var test = this;
   var oldAddProfile = WebInspector.addProfile;
   WebInspector.addProfile = function(profile) {
     WebInspector.addProfile = oldAddProfile;
     oldAddProfile.call(this, profile);
 
     var panel = WebInspector.panels.profiles;
     panel.showProfile(profile);
     var node = panel.visibleView.profileDataGridTree.children[0];
     // Iterate over displayed functions and search for a function
     // that is called 'fib' or 'eternal_fib'. If found, it will mean
     // that we actually have profiled page's code.
     while (node) {
       if (node.functionName.indexOf("fib") != -1) {
-        controller.releaseControl();
+        test.releaseControl();
       }
       node = node.traverseNextNode(true, null, true);
     }
 
     test.fail();
   };
 
   InspectorController.startProfiling();
   window.setTimeout('InspectorController.stopProfiling();', 1000);
-  controller.takeControl();
+  this.takeControl();
 };
 
 
 /**
  * Tests that scripts tab can be open and populated with inspected scripts.
  */
-TestSuite.prototype.testShowScriptsTab = function(controller) {
+TestSuite.prototype.testShowScriptsTab = function() {
   var parsedDebuggerTestPageHtml = false;
   var parsedDebuggerTestJs = false;
 
   // Intercept parsedScriptSource calls to check that all expected scripts are
   // added to the debugger.
   var test = this;
   var originalParsedScriptSource = WebInspector.parsedScriptSource;
   WebInspector.parsedScriptSource = function(sourceID, sourceURL, source,
       startingLine) {
     if (sourceURL.search(/debugger_test_page.html$/) != -1) {
       if (parsedDebuggerTestPageHtml) {
         test.fail('Unexpected parse event: ' + sourceURL);
       }
       parsedDebuggerTestPageHtml = true;
     } else if (sourceURL.search(/debugger_test.js$/) != -1) {
       if (parsedDebuggerTestJs) {
         test.fail('Unexpected parse event: ' + sourceURL);
       }
       parsedDebuggerTestJs = true;
     } else {
       test.fail('Unexpected script URL: ' + sourceURL);
     }
     originalParsedScriptSource.apply(this, arguments);
 
     if (!WebInspector.panels.scripts.visibleView) {
       test.fail('No visible script view: ' + sourceURL);
     }
 
     if (parsedDebuggerTestJs && parsedDebuggerTestPageHtml) {
-       controller.releaseControl();
+       test.releaseControl();
     }
   };
 
   this.showPanel('scripts');
 
   // Wait until all scripts are added to the debugger.
-  controller.takeControl();
+  this.takeControl();
 };
 
 
 /**
  * Key event with given key identifier.
  */
 TestSuite.KeyEvent = function(key) {
   this.keyIdentifier = key;
 };
 TestSuite.KeyEvent.prototype.preventDefault = function() {};
 TestSuite.KeyEvent.prototype.stopPropagation = function() {};
 
 
 /**
  * Tests console eval.
  */
-TestSuite.prototype.testConsoleEval = function(controller) {
+TestSuite.prototype.testConsoleEval = function() {
   WebInspector.console.visible = true;
   WebInspector.console.prompt.text = '123';
   WebInspector.console.promptElement.handleKeyEvent(
       new TestSuite.KeyEvent('Enter'));
 
   var test = this;
   var originalConsoleAddMessage = WebInspector.Console.prototype.addMessage;
   WebInspector.Console.prototype.addMessage = function(commandResult) {
     originalConsoleAddMessage.call(this, commandResult);
     WebInspector.Console.prototype.addMessage = originalConsoleAddMessage;
     test.assertEquals('123', commandResult.toMessageElement().textContent);
-    controller.releaseControl();
+    test.releaseControl();
   };
 
-  controller.takeControl();
+  this.takeControl();
 };
 
 
 /**
  * Tests console log.
  */
-TestSuite.prototype.testConsoleLog = function(controller) {
+TestSuite.prototype.testConsoleLog = function() {
   WebInspector.console.visible = true;
   var messages = WebInspector.console.messages;
   var index = 0;
 
   var test = this;
   var assertNext = function(line, message, opt_level, opt_count, opt_substr) {
     var elem = messages[index++].toMessageElement();
     var clazz = elem.getAttribute('class');
     var expectation = (opt_count || '') + 'console_test_page.html:' +
         line + message;
@@ skipping 20 matching lines @@
   assertNext('26', 'count: 2');
   assertNext('29', 'group', 'group-title');
   index++;
   assertNext('33', 'timer:', 'log', '', true);
 };
 
 
 /**
  * Tests eval of global objects.
  */
-TestSuite.prototype.testEvalGlobal = function(controller) {
+TestSuite.prototype.testEvalGlobal = function() {
   WebInspector.console.visible = true;
   WebInspector.console.prompt.text = 'foo';
   WebInspector.console.promptElement.handleKeyEvent(
       new TestSuite.KeyEvent('Enter'));
 
   var test = this;
   var originalConsoleAddMessage = WebInspector.Console.prototype.addMessage;
   WebInspector.Console.prototype.addMessage = function(commandResult) {
     originalConsoleAddMessage.call(this, commandResult);
     test.assertEquals('fooValue', commandResult.toMessageElement().textContent);
-    controller.releaseControl();
+    test.releaseControl();
   };
 
-  controller.takeControl();
+  this.takeControl();
 };
 
 
 /**
  * Tests eval on call frame.
  */
-TestSuite.prototype.testEvalCallFrame = function(controller) {
+TestSuite.prototype.testEvalCallFrame = function() {
 };
 
 
-var uiTests = new TestSuite();
+/**
+ * Test runner for the test suite.
+ */
+var uiTests = {};
+
+
+/**
+ * Run each test from the test suit on a fresh instance of the suite.
+ */
+uiTests.runAllTests = function() {
+  // For debugging purposes.
+  for (var name in TestSuite.prototype) {
+    if (name.substring(0, 4) == 'test' &&
+        typeof TestSuite.prototype[name] == 'function') {
+      uiTests.runTest(name);
+    }
+  }
+};
+
+
+/**
+ * Run specified test on a fresh instance of the test suite.
+ * @param {string} name Name of a test method from TestSuite class.
+ */
+uiTests.runTest = function(name) {
+  new TestSuite().runTest(name);
+};
+
+
 }