DevTools: fix script tests broken by WebKit change 50431

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.
@@ skipping 510 matching lines @@
  */
 TestSuite.prototype.testNoScriptDuplicatesOnPanelSwitch = function() {
   var test = this;
 
   // There should be two scripts: one for the main page and another
   // one which is source of console API(see
   // InjectedScript._ensureCommandLineAPIInstalled).
   var expectedScriptsCount = 2;
   var parsedScripts = [];
 
+  this.showPanel('scripts');
+
 
   function switchToElementsTab() {
     test.showPanel('elements');
     setTimeout(switchToScriptsTab, 0);
   }
 
   function switchToScriptsTab() {
     test.showPanel('scripts');
     setTimeout(checkScriptsPanel, 0);
   }
 
   function checkScriptsPanel() {
     test.assertTrue(!!WebInspector.panels.scripts.visibleView,
                     'No visible script view.');
-    var select = WebInspector.panels.scripts.filesSelectElement;
-    test.assertEquals(expectedScriptsCount, select.options.length,
-                      'Unexpected options count');
+    test.assertTrue(test._scriptsAreParsed(['debugger_test_page.html$']),
+                    'Some scripts are missing.');
+    checkNoDuplicates();
     test.releaseControl();
   }
 
-  this.addSniffer(WebInspector, 'parsedScriptSource',
-      function(sourceID, sourceURL, source, startingLine) {
-        test.assertTrue(
-            parsedScripts.indexOf(sourceURL) == -1,
-            'Duplicated script: ' + sourceURL);
-        test.assertTrue(
-           parsedScripts.length < expectedScriptsCount,
-           'Too many scripts: ' + sourceURL);
-        parsedScripts.push(sourceURL);
+  function checkNoDuplicates() {
+    var scriptSelect = document.getElementById('scripts-files');
+    var options = scriptSelect.options;
+    for (var i = 0; i < options.length; i++) {
+      var scriptName = options[i].text;
+      for (var j = i + 1; j < options.length; j++) {
+        test.assertTrue(scriptName != options[j].text,
+            'Found script duplicates: ' + test.optionsToString_(options));
+      }
+    }
+  }
 
-        if (parsedScripts.length == expectedScriptsCount) {
-          setTimeout(switchToElementsTab, 0);
-        }
-      }, true /* sticky */);
+  test._waitUntilScriptsAreParsed(
+      ['debugger_test_page.html$'],
+      function() {
+        checkNoDuplicates();
+        setTimeout(switchToElementsTab, 0);
+      });
 
-  this.showPanel('scripts');
 
   // Wait until all scripts are added to the debugger.
   this.takeControl();
 };
 
 
 /**
  * Tests that a breakpoint can be set.
  */
 TestSuite.prototype.testSetBreakpoint = function() {
-  var parsedDebuggerTestPageHtml = false;
-  var parsedDebuggerTestJs = false;
-
+  var test = this;
   this.showPanel('scripts');
 
-  var scriptUrl = null;
   var breakpointLine = 12;
 
-  var test = this;
-  this.addSniffer(devtools.DebuggerAgent.prototype, 'handleScriptsResponse_',
-      function(msg) {
-        var scriptSelect = document.getElementById('scripts-files');
-        var options = scriptSelect.options;
-
-        // There should be console API source (see
-        // InjectedScript._ensureCommandLineAPIInstalled) and the page script.
-        test.assertEquals(2, options.length, 'Unexpected number of scripts(' +
-            test.optionsToString_(options) + ')');
-
+  this._waitUntilScriptsAreParsed(['debugger_test_page.html'],
+      function() {
         test.showMainPageScriptSource_(
             'debugger_test_page.html',
             function(view, url) {
               view._addBreakpoint(breakpointLine);
               // Force v8 execution.
               RemoteToolsAgent.ExecuteVoidJavaScript();
               test.waitForSetBreakpointResponse_(url, breakpointLine,
                   function() {
                     test.releaseControl();
                   });
             });
       });
 
-
   this.takeControl();
 };
 
 
 /**
  * Serializes options collection to string.
  * @param {HTMLOptionsCollection} options
  * @return {string}
  */
 TestSuite.prototype.optionsToString_ = function(options) {
@@ skipping 10 matching lines @@
  * source frame is setup. Invokes the callback when the condition is satisfied.
  * @param {HTMLOptionsCollection} options
  * @param {function(WebInspector.SourceView,string)} callback
  */
 TestSuite.prototype.showMainPageScriptSource_ = function(scriptName, callback) {
   var test = this;
 
   var scriptSelect = document.getElementById('scripts-files');
   var options = scriptSelect.options;
 
-  // There should be console API source (see
-  // InjectedScript._ensureCommandLineAPIInstalled) and the page script.
-  test.assertEquals(2, options.length,
-      'Unexpected number of scripts(' + test.optionsToString_(options) + ')');
+  test.assertTrue(options.length, 'Scripts list is empty');
 
   // Select page's script if it's not current option.
   var scriptResource;
   if (options[scriptSelect.selectedIndex].text === scriptName) {
     scriptResource = options[scriptSelect.selectedIndex].representedObject;
   } else {
     var pageScriptIndex = -1;
     for (var i = 0; i < options.length; i++) {
       if (options[i].text === scriptName) {
         pageScriptIndex = i;
@@ skipping 1099 matching lines @@
 /**
  * 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);
 };
 
 
 }