Change Multitest files to preserve line numbers.

tools/testing/dart/multitest.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.
 
 library multitest;
 
 import "dart:async";
 import "dart:io";
 
 import "path.dart";
@@ skipping 66 matching lines @@
   List<String> lines = contents.split(line_separator);
   if (lines.last == '') lines.removeLast();
   bytes = null;
   contents = null;
   Set<String> validMultitestOutcomes = new Set<String>.from(
       ['ok', 'compile-time error', 'runtime error',
        'static type warning', 'dynamic type error',
        'checked mode compile-time error']);
 
   List<String> testTemplate = new List<String>();
-  testTemplate.add(
-      '// Test created from multitest named ${filePath.toNativePath()}.');
   // Create the set of multitests, which will have a new test added each
   // time we see a multitest line with a new key.
   Map<String, List<String>> testsAsLines = new Map<String, List<String>>();
 
+  // Add the template, with no multitest lines, as a test with key 'none'.

[Bill Hesse, 2015/03/20 10:32:57]

Maybe drop the testTemplate variable completely, and just use
testsAsLines['none']?

[Lasse Reichstein Nielsen, 2015/03/20 13:06:30]

Done.

+  testsAsLines['none'] = testTemplate;
+  outcomes['none'] = new Set<String>();
+
   int lineCount = 0;
   for (String line in lines) {
     lineCount++;
     var annotation = new _Annotation.from(line);
     if (annotation != null) {
-      testsAsLines.putIfAbsent(annotation.key,
-          () => new List<String>.from(testTemplate)).add(line);
-      outcomes.putIfAbsent(annotation.key,
-          () => new Set<String>());
-      if (annotation.rest == 'continued') {
-        continue;
-      } else {
+      // Add empty line to all tests.
+      for (var test in testsAsLines.values) test.add("");
+      var testLines = testsAsLines.putIfAbsent(annotation.key,
+          () => new List<String>.from(testTemplate));
+      // Replace empty line with actual line only in matching test.
+      testLines[testLines.length - 1] = line;
+      outcomes.putIfAbsent(annotation.key, () => new Set<String>());
+      if (annotation.rest != 'continued') {

[Bill Hesse, 2015/03/20 10:32:57]

I think the code is clearer if we remove the testLines variable, move the loop
after, with a test in it:

outcomes.putIfAbsent(annotation.key, () => new Set<String>());
testsAsLines.putIfAbsent(annotation.key,
   () => new List<String>.from(testsAsLines['none']));
// Add an empty line to all the other tests, to preserve line numbers.
for (var key in testsAsLines.keys) {
  testsAsLines[key].add((key == annotation.key) ? line : "");
}

[Lasse Reichstein Nielsen, 2015/03/20 13:06:30]

That is more readable. Done.

         for (String nextOutcome in annotation.outcomesList) {
           if (validMultitestOutcomes.contains(nextOutcome)) {
             outcomes[annotation.key].add(nextOutcome);
           } else {
             DebugLogger.warning(
                 "Warning: Invalid test directive '$nextOutcome' on line "
                 "${lineCount}:\n${annotation.rest} ");
           }
         }
       }
     } else {
-      testTemplate.add(line);
       for (var test in testsAsLines.values) test.add(line);
     }
   }
+  // End marker, has a final line separator so we don't need to add it after
+  // joining the lines.
+  var marker =
+      '// Test created from multitest named ${filePath.toNativePath()}.'
+      '$line_separator';
+  for (var test in testsAsLines.values) test.add(marker);
 
   var keysToDelete = [];
   // Check that every key (other than the none case) has at least one outcome
   for (var outcomeKey in outcomes.keys) {
     if (outcomeKey != 'none' && outcomes[outcomeKey].isEmpty) {
       DebugLogger.warning(
           "Warning: Test ${outcomeKey} has no valid annotated outcomes.\n"
           "Expected one of: ${validMultitestOutcomes.toString()}");
       // If this multitest doesn't have an outcome, mark the multitest for
       // deletion.
       keysToDelete.add(outcomeKey);
     }
   }
   // If a key/multitest was marked for deletion, do the necessary cleanup.
-  keysToDelete.forEach((key) => outcomes.remove(key));
-  keysToDelete.forEach((key) => testsAsLines.remove(key));
-
-  // Add the template, with no multitest lines, as a test with key 'none'.
-  testsAsLines['none'] = testTemplate;
-  outcomes['none'] = new Set<String>();
+  keysToDelete.forEach(outcomes.remove);
+  keysToDelete.forEach(testsAsLines.remove);
 
   // Copy all the tests into the output map tests, as multiline strings.
   for (String key in testsAsLines.keys) {
-    tests[key] = testsAsLines[key].join(line_separator) + line_separator;
+    tests[key] = testsAsLines[key].join(line_separator);
   }
 }
 
 // Represents a mutlitest annotation in the special /// comment.
 class _Annotation {
   String key;
   String rest;
   List<String> outcomesList;
   _Annotation() {}
   factory _Annotation.from(String line) {
@@ skipping 144 matching lines @@
     // TestSuite.forDirectory.
     split.removeLast();
   }
   String path = '${generatedTestDir.path}/${split.last}';
   Directory dir = new Directory(path);
   if (!dir.existsSync()) {
     dir.createSync();
   }
   return new Path(new File(path).absolute.path);
 }