Remove string concatenation using + from test_suite.dart. Simplify output directory recursive dire…

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 95 matching lines @@
   Function doDone;
   ReceivePort receiveTestName;
   TestExpectations testExpectations;
 
   CCTestSuite(Map this.configuration,
               String this.suiteName,
               String runnerName,
               List<String> this.statusFilePaths,
               [this.testPrefix = ''])
       : dartDir = TestUtils.dartDir() {
-    runnerPath = TestUtils.buildDir(configuration) + '/' + runnerName;
+    runnerPath = '${TestUtils.buildDir(configuration)}/$runnerName';
   }
 
   void testNameHandler(String testName, ignore) {
     if (testName == "") {
       receiveTestName.close();
       doDone(true);
     } else {
       // Only run the tests that match the pattern. Use the name
       // "suiteName/testName" for cc tests.
       RegExp pattern = configuration['selectors'][suiteName];
@@ skipping 233 matching lines @@
     // See if there's a 'src' directory inside the 'tests' one.
     int testsStart = filename.lastIndexOf('tests/');
     int start = filename.lastIndexOf('src/');
     if (start > testsStart) {
       // TODO(sigmund): delete this branch once all tests stop using the src/
       // directory
       testName = filename.substring(start + 4, filename.length - 5);
     } else if (optionsFromFile['isMultitest']) {
       start = filename.lastIndexOf('/');
       int middle = filename.lastIndexOf('_');
-      testName = filename.substring(start + 1, middle) + '/' +
-          filename.substring(middle + 1, filename.length - 5);
+      var multitestBase = filename.substring(start + 1, middle);
+      var multitestKey = filename.substring(middle + 1, filename.length - 5);
+      testName = '$multitestBase/$multitestKey';
     } else {
       // This branch is hit in two cases: standard test suites created with
       // forDirectory and dartc code compilation tests.
 
       // Dartc compilation tests are pretty broken compared to the
       // rest. They use the .dart suffix in the status files. They
       // find tests in weird ways (testing that they contain "#").
       // They need to be redone.
       // TODO(1058): This does not work on Windows.
       start = filename.indexOf(directoryPath);
@@ skipping 66 matching lines @@
                           isNegative,
                           info));
     }
   }
 
   List<Command> makeCommands(TestInformation info, var args) {
     if (configuration['compiler'] == 'dart2js') {
       args = new List.from(args);
       String testPath =
           new File(info.filename).fullPathSync().replaceAll('\\', '/');
-      Directory tempDir = createOutputDirectory(testPath, '');
-      args.add('--out=${tempDir.path}/out.js');
+      String tempDir = createOutputDirectory(testPath, '');
+      args.add('--out=$tempDir/out.js');
       List<Command> commands = <Command>[new Command(shellPath(), args)];
       if (configuration['runtime'] == 'd8') {
         var d8 = TestUtils.d8FileName(configuration);
-        commands.add(new Command(d8, ['${tempDir.path}/out.js']));
+        commands.add(new Command(d8, ['$tempDir/out.js']));
       }
       return commands;
     } else {
       return <Command>[new Command(shellPath(), args)];
     }
   }
 
   Function makeTestCaseCreator(Map optionsFromFile) {
     return (String filename,
             bool isNegative,
@@ skipping 50 matching lines @@
    */
   void enqueueBrowserTest(TestInformation info,
                           String testName,
                           Set<String> expectations) {
     Map optionsFromFile = info.optionsFromFile;
     String filename = info.filename;
     if (optionsFromFile['isMultitest']) return;
     bool isWebTest = optionsFromFile['containsDomImport'];
     bool isLibraryDefinition = optionsFromFile['isLibraryDefinition'];
     if (!isLibraryDefinition && optionsFromFile['containsSourceOrImport']) {
-      print('Warning for $filename: Browser tests require #library ' +
+      print('Warning for $filename: Browser tests require #library '
             'in any file that uses #import, #source, or #resource');
     }
 
     final String compiler = configuration['compiler'];
     final String runtime = configuration['runtime'];
     final String testPath =
         new File(filename).fullPathSync().replaceAll('\\', '/');
 
     for (var vmOptions in getVmOptions(optionsFromFile)) {
       // Create a unique temporary directory for each set of vmOptions.
       // TODO(dart:429): Replace separate replaceAlls with a RegExp when
       // replaceAll(RegExp, String) is implemented.
       String optionsName = '';
       if (getVmOptions(optionsFromFile).length > 1) {
           optionsName = Strings.join(vmOptions, '-').replaceAll('-','')
                                                     .replaceAll('=','')
                                                     .replaceAll('/','');
       }
-      Directory tempDir = createOutputDirectory(testPath, optionsName);
+      final String tempDir = createOutputDirectory(testPath, optionsName);
 
-      String dartWrapperFilename = '${tempDir.path}/test.dart';
-      String compiledDartWrapperFilename = '${tempDir.path}/test.js';
+      String dartWrapperFilename = '$tempDir/test.dart';
+      String compiledDartWrapperFilename = '$tempDir/test.js';
 
-      String htmlPath = '${tempDir.path}/test.html';
+      String htmlPath = '$tempDir/test.html';
       if (!isWebTest) {
         // test.dart will import the dart test directly, if it is a library,
         // or indirectly through test_as_library.dart, if it is not.
         String dartLibraryFilename;
         if (isLibraryDefinition) {
           dartLibraryFilename = testPath;
         } else {
           dartLibraryFilename = 'test_as_library.dart';
-          File file = new File('${tempDir.path}/$dartLibraryFilename');
+          File file = new File('$tempDir/$dartLibraryFilename');
           RandomAccessFile dartLibrary = file.openSync(FileMode.WRITE);
           dartLibrary.writeStringSync(WrapDartTestInLibrary(testPath));
           dartLibrary.closeSync();
         }
 
         File file = new File(dartWrapperFilename);
         RandomAccessFile dartWrapper = file.openSync(FileMode.WRITE);
         dartWrapper.writeStringSync(
             DartTestWrapper(dartDir, dartLibraryFilename));
         dartWrapper.closeSync();
       } else {
         dartWrapperFilename = testPath;
         // TODO(whesse): Once test.py is retired, adjust the relative path in
         // the client/samples/dartcombat test to its css file, remove the
         // "../../" from this path, and move this out of the isWebTest guard.
         // Also remove getHtmlName, and just use test.html.
         // TODO(efortuna): this shortening of htmlFilename is a band-aid until
         // the above TODO gets fixed. Windows cannot have paths that are longer
         // than 260 characters, and without this hack, we were running past the
         // the limit.
         String htmlFilename = getHtmlName(filename);
-        while ('${tempDir.path}/../$htmlFilename'.length >= 260) {
+        while ('$tempDir/../$htmlFilename'.length >= 260) {
           htmlFilename = htmlFilename.substring(htmlFilename.length~/2);
         }
-        htmlPath = '${tempDir.path}/../$htmlFilename';
+        htmlPath = '$tempDir/../$htmlFilename';
       }
       final String scriptPath = (compiler == 'none') ?
           dartWrapperFilename : compiledDartWrapperFilename;
       // Create the HTML file for the test.
       RandomAccessFile htmlTest = new File(htmlPath).openSync(FileMode.WRITE);
       String filePrefix = '';
       if (Platform.operatingSystem == 'windows') {
         // Firefox on Windows does not like absolute file path names that start
         // with 'C:' adding 'file:///' solves the problem.
         filePrefix = 'file:///';
       }
       htmlTest.writeStringSync(GetHtmlContents(
           filename,
           '$filePrefix$dartDir/lib/unittest/test_controller.js',
           scriptType,
-          filePrefix + scriptPath));
+          '$filePrefix$scriptPath'));
       htmlTest.closeSync();
 
       // Construct the command(s) that compile all the inputs needed by the
       // browser test. For running Dart in DRT, this will be noop commands.
       List<Command> commands = [];
       if (compiler != 'none') {
         commands.add(_compileCommand(
             dartWrapperFilename, compiledDartWrapperFilename,
-            compiler, tempDir.path, vmOptions));
+            compiler, tempDir, vmOptions));
 
         // some tests require compiling multiple input scripts.
         List<String> otherScripts = optionsFromFile['otherScripts'];
         for (String name in otherScripts) {
           int end = filename.lastIndexOf('/');
           if (end == -1) {
             print('Warning: error processing "OtherScripts" of $filename.');
             print('Skipping test ($testName).');
             return;
           }
           String dir = filename.substring(0, end);
           end = name.lastIndexOf('.dart');
           if (end == -1) {
             print('Warning: error processing "OtherScripts" in $filename.');
             print('Skipping test ($testName).');
             return;
           }
           String compiledName = '${name.substring(0, end)}.js';
           commands.add(_compileCommand(
-              '$dir/$name', '${tempDir.path}/$compiledName',
-              compiler, tempDir.path, vmOptions));
+              '$dir/$name', '$tempDir/$compiledName',
+              compiler, tempDir, vmOptions));
         }
       }
 
       // Construct the command that executes the browser test
       List<String> args;
       if (runtime == 'ie' || runtime == 'ff' || runtime == 'chrome' ||
           runtime == 'safari' || runtime == 'opera' || runtime == 'dartium') {
         args = ['$dartDir/tools/testing/run_selenium.py',
             '--browser=$runtime',
             '--timeout=${configuration["timeout"] - 2}',
@@ skipping 66 matching lines @@
    * an HTML page, with a testing framework based on scripting and DOM events.
    * These scripts and pages are written to a generated_test directory
    * inside the build directory of the checkout.
    *
    * Those tests which are already HTML web applications (web tests), with
    * resources including CSS files and HTML files, need to be compiled into
    * a work directory where the relative URLS to the resources work.
    * We use a subdirectory of the build directory that is the same number
    * of levels down in the checkout as the original path of the web test.
    */
-  Directory createOutputDirectory(String testPath, String optionsName) {
+  String createOutputDirectory(String testPath, String optionsName) {
     String testUniqueName =
         testPath.substring(dartDir.length + 1, testPath.length - 5);
     testUniqueName = testUniqueName.replaceAll('/', '_');
     if (!optionsName.isEmpty()) {
-      testUniqueName += '-$optionsName';
+      testUniqueName = '$testUniqueName-$optionsName';
     }
 
     // Create '[build dir]/generated_tests/$compiler-$runtime/$testUniqueName',
     // including any intermediate directories that don't exist.
-    var generatedTestPath = ['generated_tests',
-                             configuration['compiler'] + '-' +
-                             configuration['runtime'],
-                             testUniqueName];
+    var generatedTestPath = Strings.join(
+        [TestUtils.buildDir(configuration),
+         'generated_tests',
+         "${configuration['compiler']}-${configuration['runtime']}",
+         testUniqueName], '/');
 
-    String tempDirPath = TestUtils.buildDir(configuration);
-    Directory tempDir = new Directory(tempDirPath);
-    if (!tempDir.existsSync()) {
-      // TODO(whesse): Replace this with mkdirRecursive.
-      // Dartium tests can be run with no build step, with no output directory.
-      // This special case builds the build directory that should be there.
-      var buildPath = tempDirPath.split('/');
-      tempDirPath = buildPath[0];
-      if (tempDirPath == '') {
-        throw new Exception(
-            'Non-relative path to build directory in test_suite.dart');
-      }
-      if (buildPath.length > 1) {
-        buildPath.removeRange(0, 1);
-        if (buildPath.last() == '') buildPath.removeLast();
-        buildPath.addAll(generatedTestPath);
-        generatedTestPath = buildPath;
-      }
-      tempDir = new Directory(tempDirPath);
-      if (!tempDir.existsSync()) {
-        tempDir.createSync();
-      }
-    }
-    tempDirPath = new File(tempDirPath).fullPathSync().replaceAll('\\', '/');
-    return TestUtils.mkdirRecursive(tempDirPath,
-                                    Strings.join(generatedTestPath, '/'));
+    TestUtils.mkdirRecursive('.', generatedTestPath);
+    return new File(generatedTestPath).fullPathSync().replaceAll('\\', '/');
   }
 
   String get scriptType() {
     switch (configuration['compiler']) {
       case 'none':
         return 'application/dart';
       case 'frog':
       case 'dart2js':
       case 'dartc':
         return 'text/javascript';
       default:
-        Expect.fail('Non-web runtime, so no scriptType for: ' +
-            '${configuration["compiler"]}');
+        Expect.fail('Non-web runtime, so no scriptType for: '
+                    '${configuration["compiler"]}');
         return null;
     }
   }
 
   bool get hasRuntime() {
     switch(configuration['runtime']) {
       case null:
         Expect.fail("configuration['runtime'] is not set");
       case 'none':
         return false;
       default:
         return true;
     }
   }
 
   String getHtmlName(String filename) {
-    return filename.replaceAll('/', '_').replaceAll(':', '_')
-        .replaceAll('\\', '_') + configuration['compiler'] + '-' +
-        configuration['runtime'] + '.html';
+    var cleanFilename =  filename.replaceAll('/', '_')
+                                 .replaceAll(':', '_')
+                                 .replaceAll('\\', '_');
+
+    return "$cleanFilename"
+        "${configuration['compiler']}-${configuration['runtime']}.html";
   }
 
   String get dumpRenderTreeFilename() {
     if (configuration['drt'] != '') {
       return configuration['drt'];
     }
     if (Platform.operatingSystem == 'macos') {
       return '$dartDir/client/tests/drt/DumpRenderTree.app/Contents/'
           'MacOS/DumpRenderTree';
     }
@@ skipping 308 matching lines @@
       testClasses.add(testClass);
     }
   }
 
   void createTest(successIgnored) {
     var sdkDir = "$buildDir/dart-sdk".trim();
     List<String> args = <String>[
         '-ea',
         '-classpath', classPath,
         '-Dcom.google.dart.sdk=$sdkDir',
-        '-Dcom.google.dart.corelib.SharedTests.test_py=' +
-            dartDir + '/tools/test.py',
+        '-Dcom.google.dart.corelib.SharedTests.test_py=$dartDir/tools/test.py',
         'org.junit.runner.JUnitCore'];
     args.addAll(testClasses);
 
     // Lengthen the timeout for JUnit tests.  It is normal for them
     // to run for a few minutes.
     Map updatedConfiguration = new Map();
     configuration.forEach((key, value) {
       updatedConfiguration[key] = value;
     });
     updatedConfiguration['timeout'] *= 2;
@@ skipping 150 matching lines @@
     var system = configuration['system'];
     if (system == 'linux') {
       result = 'out/';
     } else if (system == 'macos') {
       result = 'xcodebuild/';
     }
     return result;
   }
 
   static String buildDir(Map configuration) {
-    var result = outputDir(configuration);
-    result += (configuration['mode'] == 'debug') ? 'Debug_' : 'Release_';
-    result += configuration['arch'];
-    return result;
-  }
+    String debugMode =
+        (configuration['mode'] == 'debug') ? 'Debug_' : 'Release_';
+    return "${outputDir(configuration)}$debugMode${configuration['arch']}";
+ }
 
   static String dartDir() {
     String scriptPath = new Options().script.replaceAll('\\', '/');
     String toolsDir = scriptPath.substring(0, scriptPath.lastIndexOf('/'));
     return new File('$toolsDir/..').fullPathSync().replaceAll('\\', '/');
   }
 
   static List<String> standardOptions(Map configuration) {
     List args = ["--ignore-unrecognized-flags"];
     if (configuration["checked"]) {
@@ skipping 67 matching lines @@
  * $noCrash tests are expected to be flaky but not crash
  * $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
 """;
     print(report);
    }
 }