Refactor test scripts browser multitest loop.

tools/testing/dart/test_suite.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 enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 1083 matching lines @@
       return "/$PREFIX_BUILDDIR/$fileRelativeToBuildDir";
     } else if (fileString.startsWith(dartDir.toString())) {
       var fileRelativeToDartDir = file.relativeTo(dartDir);
       return "/$PREFIX_DARTDIR/$fileRelativeToDartDir";
     }
     // Unreachable
     print("Cannot create URL for path $file. Not in build or dart directory.");
     exit(1);
   }
 
-  String _getUriForBrowserTest(TestInformation info,
-                            String pathComponent,
-                            subtestNames,
-                            subtestIndex) {
-    // Note: If we run test.py with the "--list" option, no http servers
-    // will be started. So we use PORT/CROSS_ORIGIN_PORT instead of real ports.
-    var serverPort = "PORT";
-    var crossOriginPort = "CROSS_ORIGIN_PORT";
-    if (!configuration['list']) {
-      assert(configuration.containsKey('_servers_'));
-      serverPort = configuration['_servers_'].port;
-      crossOriginPort = configuration['_servers_'].crossOriginPort;
+  Uri _getUriForBrowserTest(String pathComponent, String subtestName) {
+    if (configuration['list']) {

[ricow1, 2014/11/10 13:55:24]

maybe copy over the existing comment and change the last sentence to "So we use
a dummy uri instead.

+      return Uri.parse('http://listing_the_tests_only');
     }
-
-    var localIp = configuration['local_ip'];
-    var url= 'http://$localIp:$serverPort$pathComponent'
-        '?crossOriginPort=$crossOriginPort';
-    if (info.optionsFromFile['isMultiHtmlTest'] && subtestNames.length > 0) {
-      url= '${url}&group=${subtestNames[subtestIndex]}';
+    assert(configuration.containsKey('_servers_'));
+    int serverPort = configuration['_servers_'].port;
+    int crossOriginPort = configuration['_servers_'].crossOriginPort;
+    Map parameters = {'crossOriginPort': crossOriginPort.toString()};
+    if (subtestName != null) {
+      parameters['group'] = subtestName;
     }
-    return url;
+    return new Uri(scheme: 'http',
+                   host: configuration['local_ip'],
+                   port: serverPort,
+                   path: pathComponent,
+                   queryParameters: parameters);
   }
 
   void _createWrapperFile(String dartWrapperFilename,
                           Path localDartLibraryFilename) {
     File file = new File(dartWrapperFilename);
     RandomAccessFile dartWrapper = file.openSync(mode: FileMode.WRITE);
 
     var usePackageImport = localDartLibraryFilename.segments().contains("pkg");
     var libraryPathComponent = _createUrlPathFromFile(localDartLibraryFilename);
     var generatedSource = dartTestWrapper(libraryPathComponent);
@@ skipping 174 matching lines @@
         // For the tests that require multiple input scripts but are not
         // compiled, move the input scripts over with the script so they can
         // be accessed.
         String result = new File(fromPath.toNativePath()).readAsStringSync();
         new File('$tempDir/$fileName').writeAsStringSync(result);
       }
     }
 
 
     // Variables for browser multi-tests.
-    List<String> subtestNames = info.optionsFromFile['subtestNames'];
-    int subtestIndex = 0;
+    bool multitest = info.optionsFromFile['isMultiHtmlTest'];
+    List<String> subtestNames =
+        multitest ? info.optionsFromFile['subtestNames'] : [null];
+    for (String subtestName in subtestNames) {
     // Construct the command that executes the browser test
-    do {
       List<Command> commandSet = new List<Command>.from(commands);
 
       var htmlPath_subtest = _createUrlPathFromFile(new Path(htmlPath));
-      var fullHtmlPath = _getUriForBrowserTest(
-          info, htmlPath_subtest, subtestNames, subtestIndex);
+      var fullHtmlPath =
+          _getUriForBrowserTest(htmlPath_subtest, subtestName).toString();
 
       List<String> args = <String>[];
 
       if (runtime == "drt") {
         var dartFlags = [];
         var contentShellOptions = [];
 
         contentShellOptions.add('--no-timeout');
         contentShellOptions.add('--dump-render-tree');
 
@@ skipping 15 matching lines @@
                 environmentOverrides));
       } else {
         commandSet.add(
             CommandBuilder.instance.getBrowserTestCommand(
                 runtime,
                 fullHtmlPath,
                 configuration));
       }
 
       // Create BrowserTestCase and queue it.
-      String testDisplayName = '$suiteName/$testName';
-      var testCase;
-      if (info.optionsFromFile['isMultiHtmlTest']) {
-        testDisplayName = '$testDisplayName/${subtestNames[subtestIndex]}';
-        testCase = new BrowserTestCase(
-            testDisplayName,
+      var fullTestName = multitest ? '$testName/$subtestName' : testName;
+      var expectation = multitest ? expectations[fullTestName] : expectations;
+      var testCase = new BrowserTestCase(
+            '$suiteName/$fullTestName',
             commandSet,
             configuration,
-            expectations['$testName/${subtestNames[subtestIndex]}'],
+            expectation,
             info,
             isNegative(info),
             fullHtmlPath);
-      } else {
-        testCase = new BrowserTestCase(
-            testDisplayName,
-            commandSet,
-            configuration,
-            expectations,
-            info,
-            isNegative(info),
-            fullHtmlPath);
-      }
 
       enqueueNewTestCase(testCase);
-      subtestIndex++;
-    } while (subtestIndex < subtestNames.length);
+    }
   }
 
   void enqueueHtmlTest(
       HtmlTestInformation info,
       String testName,
       expectations) {
     final String compiler = configuration['compiler'];
     final String runtime = configuration['runtime'];
     // Html tests work only with the browser controller.
     if (!TestUtils.isBrowserRuntime(runtime) || runtime == 'drt') {
@@ skipping 36 matching lines @@
           // TODO(21514): Compile scripts into output directory.
           Fail('HTML test scripts don\'t support dart2js yet');
           break;
         }
       }
     }
     final Uri htmlFile = tempUri.resolve(filePath.filename);
     new File.fromUri(htmlFile).writeAsStringSync(contents);
 
     var htmlPath = _createUrlPathFromFile(new Path(htmlFile.toFilePath()));
-    var fullHtmlPath = _getUriForBrowserTest(info, htmlPath, null, null);
+    var fullHtmlPath = _getUriForBrowserTest(htmlPath, null).toString();
     var commands = [
         CommandBuilder.instance.getBrowserHtmlTestCommand(
             runtime,
             fullHtmlPath,
             configuration,
             info.expectedMessages)];
     String testDisplayName = '$suiteName/$testName';
     var testCase = new BrowserTestCase(
         testDisplayName,
         commands,
@@ skipping 1035 matching lines @@
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
   }
 }