Remove hackish way of getting the url for browser testing

tools/testing/dart/test_runner.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.
 
 /**
  * Classes and methods for executing tests.
  *
  * This module includes:
  * - Managing parallel execution of tests, including timeout checks.
  * - Evaluating the output of each test as pass/fail/crash/timeout.
@@ skipping 375 matching lines @@
    */
   bool waitingForOtherTest;
 
   /**
    * The set of test cases that wish to be notified when this test has
    * completed.
    */
   List<BrowserTestCase> observers;
 
   BrowserTestCase(displayName, commands, configuration, completedHandler,
-      expectedOutcomes, info, isNegative, [this.waitingForOtherTest = false])
+                  expectedOutcomes, info, isNegative, this.testingUrl,

[kustermann, 2013/05/29 08:46:41]

this.testingUrl -> this._testingUrl

+                  [this.waitingForOtherTest = false])
     : super(displayName, commands, configuration, completedHandler,
         expectedOutcomes, isNegative: isNegative, info: info) {
     numRetries = 2; // Allow two retries to compensate for flaky browser tests.
     observers = [];
   }
 
   List<String> get _lastArguments => commands.last.arguments;
 
   List<String> get batchRunnerArguments => [_lastArguments[0], '--batch'];
 
   List<String> get batchTestArguments => _lastArguments.sublist(1);
 
+  String _testingUrl;
+
   /** Add a test case to listen for when this current test has completed. */
   void addObserver(BrowserTestCase testCase) {
     observers.add(testCase);
   }
 
   /**
    * Notify all of the test cases that are dependent on this one that they can
    * proceed.
    */
   void notifyObservers() {
     for (BrowserTestCase testCase in observers) {
       testCase.waitingForOtherTest = false;
     }
   }
+
+  String get testingUrl => _testingUrl;
 }
 
 
 /**
  * CommandOutput records the output of a completed command: the process's exit
  * code, the standard output and standard error, whether the process timed out,
  * and the time the process took to run.  It also contains a pointer to the
  * [TestCase] this is the output of.
  */
 abstract class CommandOutput {
@@ skipping 1221 matching lines @@
           return testRunner;
         }
         print("Issue starting browser test runner");
         io.exit(1);
       });
     }
     return new Future.immediate(_browserTestRunners[runtime]);
   }
 
   void _startBrowserControllerTest(var test) {
-    // Get the url.
-    // TODO(ricow): This is not needed when we have eliminated selenium.
-    var nextCommandIndex = test.commandOutputs.keys.length;
-    var url = test.commands[nextCommandIndex].toString().split("--out=")[1];
-    // Remove trailing "
-    url = url.split('"')[0];
     var callback = (var output) {
+      var nextCommandIndex = test.commandOutputs.keys.length;
       new CommandOutput.fromCase(test,
                                  test.commands[nextCommandIndex],
                                  0,
                                  false,
                                  output == "TIMEOUT",
                                  encodeUtf8(output),
                                  [],
                                  const Duration(seconds: 1),
                                  false);
       test.completedHandler(test);
     };
-    BrowserTest browserTest = new BrowserTest(url, callback, test.timeout);
+    BrowserTest browserTest = new BrowserTest(test.testingUrl,
+                                              callback,
+                                              test.timeout);
     _getBrowserTestRunner(test).then((testRunner) {
       testRunner.queueTest(browserTest);
     });
   }
 
   void _tryRunTest() {
     _checkDone();
     // TODO(ricow): remove most of the hacked selenium code below when
     // we have eliminated the need.
 
@@ skipping 214 matching lines @@
     }
   }
 
   void eventAllTestsDone() {
     for (var listener in _eventListener) {
       listener.allDone();
     }
   }
 }