Revert "Update all tests"

This reverts commit ce76e9c30beaf9a193d3677b88c20a1ebb3fae8c.

Author: jacob314

pkg/dev_compiler/test/multitest.dart

@@ -15,11 +15,8 @@ final validMultitestOutcomes = new Set<String>.from([
   'checked mode compile-time error'
 ]);
 
-// Require at least one non-space character before '//#'
-// Handle both //# and the legacy /// multitest regexp patterns.
-final _multiTestRegExp = new RegExp(r"\S *//[#/] \w+:(.*)");
-
-final _multiTestRegExpSeperator = new RegExp(r"//[#/]");
+// Require at least one non-space character before '///'
+final _multiTestRegExp = new RegExp(r"\S */// \w+:(.*)");
 
 bool isMultiTest(String contents) => _multiTestRegExp.hasMatch(contents);
 
@@ -40,10 +37,10 @@ bool isMultiTest(String contents) => _multiTestRegExp.hasMatch(contents);
 //
 // For example: file I_am_a_multitest.dart
 //   aaa
-//   bbb //# 02: runtime error
-//   ccc //# 02: continued
-//   ddd //# 07: static type warning
-//   eee //# 10: ok
+//   bbb /// 02: runtime error
+//   ccc /// 02: continued
+//   ddd /// 07: static type warning
+//   eee /// 10: ok
 //   fff
 //
 // should create four tests:
@@ -53,24 +50,24 @@ bool isMultiTest(String contents) => _multiTestRegExp.hasMatch(contents);
 //
 // I_am_a_multitest_02.dart
 //   aaa
-//   bbb //# 02: runtime error
-//   ccc //# 02: continued
+//   bbb /// 02: runtime error
+//   ccc /// 02: continued
 //   fff
 //
 // I_am_a_multitest_07.dart
 //   aaa
-//   ddd //# 07: static type warning
+//   ddd /// 07: static type warning
 //   fff
 //
 // and I_am_a_multitest_10.dart
 //   aaa
-//   eee //# 10: ok
+//   eee /// 10: ok
 //   fff
 //
 // Note that it is possible to indicate more than one acceptable outcome
 // in the case of dynamic and static type warnings
 //   aaa
-//   ddd //# 07: static type warning, dynamic type error
+//   ddd /// 07: static type warning, dynamic type error
 //   fff
 
 void extractTestsFromMultitest(String filePath, String contents,
@@ -145,7 +142,7 @@ void extractTestsFromMultitest(String filePath, String contents,
   }
 }
 
-// Represents a mutlitest annotation in the special //# comment.
+// Represents a mutlitest annotation in the special /// comment.
 class _Annotation {
   String key;
   String rest;
@@ -154,11 +151,11 @@ class _Annotation {
   factory _Annotation.from(String line) {
     // Do an early return with "null" if this is not a valid multitest
     // annotation.
-    if (!line.contains(_multiTestRegExpSeperator)) {
+    if (!line.contains('///')) {
       return null;
     }
     var parts = line
-        .split(_multiTestRegExpSeperator)[1]
+        .split('///')[1]
         .split(':')
         .map((s) => s.trim())
         .where((s) => s.length > 0)

pkg/testing/lib/src/multitest.dart

@@ -4,13 +4,19 @@
 
 library testing.multitest;
 
-import 'dart:async' show Stream, StreamTransformer;
+import 'dart:async' show
+    Stream,
+    StreamTransformer;
 
-import 'dart:io' show Directory, File;
+import 'dart:io' show
+    Directory,
+    File;
 
-import 'log.dart' show splitLines;
+import 'log.dart' show
+    splitLines;
 
-import 'test_description.dart' show TestDescription;
+import 'test_description.dart' show
+    TestDescription;
 
 bool isError(Set<String> expectations) {
   if (expectations.contains("compile-time error")) return true;
@@ -26,17 +32,16 @@ bool isCheckedModeError(Set<String> expectations) {
 
 class MultitestTransformer
     implements StreamTransformer<TestDescription, TestDescription> {
-  static RegExp multitestMarker = new RegExp(r"//[#/]");
-  static int _multitestMarkerLength = 3;
+  static const String multitestMarker = "///";
 
   static const List<String> validOutcomesList = const <String>[
-    "ok",
-    "compile-time error",
-    "runtime error",
-    "static type warning",
-    "dynamic type error",
-    "checked mode compile-time error",
-  ];
+      "ok",
+      "compile-time error",
+      "runtime error",
+      "static type warning",
+      "dynamic type error",
+      "checked mode compile-time error",
+    ];
 
   static final Set<String> validOutcomes =
       new Set<String>.from(validOutcomesList);
@@ -47,9 +52,7 @@ class MultitestTransformer
       errors.add(error);
       print(error);
     }
-
-    nextTest:
-    await for (TestDescription test in stream) {
+    nextTest: await for (TestDescription test in stream) {
       String contents = await test.file.readAsString();
       if (!contents.contains(multitestMarker)) {
         yield test;
@@ -71,23 +74,20 @@ class MultitestTransformer
         List<String> subtestOutcomesList;
         if (index != -1) {
           String annotationText =
-              line.substring(index + _multitestMarkerLength).trim();
+              line.substring(index + multitestMarker.length).trim();
           index = annotationText.indexOf(":");
           if (index != -1) {
             subtestName = annotationText.substring(0, index).trim();
-            subtestOutcomesList = annotationText
-                .substring(index + 1)
-                .split(",")
-                .map((s) => s.trim())
-                .toList();
+            subtestOutcomesList = annotationText.substring(index + 1).split(",")
+                .map((s) => s.trim()).toList();
             if (subtestName == "none") {
               reportError(test.formatError(
-                  "$lineNumber: $subtestName can't be used as test name."));
+                      "$lineNumber: $subtestName can't be used as test name."));
               continue nextTest;
             }
             if (subtestOutcomesList.isEmpty) {
-              reportError(test
-                  .formatError("$lineNumber: Expected <testname>:<outcomes>"));
+              reportError(test.formatError(
+                      "$lineNumber: Expected <testname>:<outcomes>"));
               continue nextTest;
             }
           }
@@ -96,16 +96,16 @@ class MultitestTransformer
           List<String> lines = testsAsLines.putIfAbsent(subtestName,
               () => new List<String>.from(linesWithoutAnnotations));
           lines.add(line);
-          Set<String> subtestOutcomes =
-              outcomes.putIfAbsent(subtestName, () => new Set<String>());
+          Set<String> subtestOutcomes = outcomes.putIfAbsent(subtestName,
+              () => new Set<String>());
           if (subtestOutcomesList.length != 1 ||
               subtestOutcomesList.single != "continued") {
             for (String outcome in subtestOutcomesList) {
               if (validOutcomes.contains(outcome)) {
                 subtestOutcomes.add(outcome);
               } else {
                 reportError(test.formatError(
-                    "$lineNumber: '$outcome' isn't a recognized outcome."));
+                        "$lineNumber: '$outcome' isn't a recognized outcome."));
                 continue nextTest;
               }
             }

tests/compiler/dart2js_extra/23486_test.dart

@@ -16,7 +16,7 @@ class B {
 
 class A extends B {
   m() {
-    (super).field = 1; //# 01: compile-time error
+    (super).field = 1; /// 01: compile-time error
   }
 }
 
@@ -27,12 +27,12 @@ class C {
 
 class D extends C {
   D() : super();
-  D.name() : (super).name(); //# 02: compile-time error
+  D.name() : (super).name(); /// 02: compile-time error
 }
 
 main() {
-  Expect.throws(new A().m); //       //# 01: continued
-  Expect.throws(() => new D.name()); //# 02: continued
-  Expect.throws(() => (p).x); //     //# 03: compile-time error
+  Expect.throws(new A().m); //       /// 01: continued
+  Expect.throws(() => new D.name()); /// 02: continued
+  Expect.throws(() => (p).x); //     /// 03: compile-time error
 }
 

tests/compiler/dart2js_extra/LayoutTests_fast_mediastream_getusermedia_t01_test.dart

@@ -10,7 +10,7 @@ foo() {}
 
 gotStream1(stream) {
   foo()
-      . //# 01: compile-time error
+      . /// 01: compile-time error
       .then();
 }
 

tests/compiler/dart2js_extra/basic_class_test.dart

@@ -17,11 +17,11 @@ void main() {
   B b;
   a = a;
   a = subA;
-  a = b; //# 01: static type warning
+  a = b; /// 01: static type warning
   subA = a;
   subA = subA;
-  subA = b; //# 02: static type warning
-  b = a; //# 03: static type warning
-  b = subA; //# 04: static type warning
+  subA = b; /// 02: static type warning
+  b = a; /// 03: static type warning
+  b = subA; /// 04: static type warning
   b = b;
 }

tests/compiler/dart2js_extra/bounds_check_test.dart

@@ -4,14 +4,14 @@
 
 main() {
   var a = [0, 1];
-  a[-1]; //                         //# 01: runtime error
-  a[-1] = 4; //                     //# 02: runtime error
-  a[2]; //                          //# 03: runtime error
-  a[2] = 4; //                      //# 04: runtime error
-  checkIndex(a, -1); //             //# 05: runtime error
-  checkIndexedAssignment(a, -1); // //# 06: runtime error
-  checkIndex(a, 2); //              //# 07: runtime error
-  checkIndexedAssignment(a, 2); //  //# 08: runtime error
+  a[-1]; //                         /// 01: runtime error
+  a[-1] = 4; //                     /// 02: runtime error
+  a[2]; //                          /// 03: runtime error
+  a[2] = 4; //                      /// 04: runtime error
+  checkIndex(a, -1); //             /// 05: runtime error
+  checkIndexedAssignment(a, -1); // /// 06: runtime error
+  checkIndex(a, 2); //              /// 07: runtime error
+  checkIndexedAssignment(a, 2); //  /// 08: runtime error
   checkIndex(a, 0);
   checkIndexedAssignment(a, 0);
 }

tests/compiler/dart2js_extra/compile_time_constant4_test.dart

@@ -10,22 +10,22 @@ const g1 = x
   + "bar"
 ;
 const g2 = x
-  + null //  //# 01: compile-time error
+  + null //  /// 01: compile-time error
 ;
 const g3 = x
-  + 499 //  //# 02: compile-time error
+  + 499 //  /// 02: compile-time error
 ;
 const g4 = x
-  + 3.3 //  //# 03: compile-time error
+  + 3.3 //  /// 03: compile-time error
 ;
 const g5 = x
-  + true //  //# 04: compile-time error
+  + true //  /// 04: compile-time error
 ;
 const g6 = x
-  + false //  //# 05: compile-time error
+  + false //  /// 05: compile-time error
 ;
 const g7 = "foo"
-  + x[0] //  //# 06: compile-time error
+  + x[0] //  /// 06: compile-time error
 ;
 const g8 = 1
   + x.length

tests/compiler/dart2js_extra/constant_javascript_semantics_test.dart

@@ -11,10 +11,10 @@ const y = 12345678901234567890;
 const z = x - y;
 
 const a = 1.0;
-const b = a << 3; // //# 01: compile-time error
+const b = a << 3; // /// 01: compile-time error
 
 const c = -0.0;
-const d = c << 1; // //# 02: compile-time error
+const d = c << 1; // /// 02: compile-time error
 
 foo() => 12345678901234567891 - 12345678901234567890;
 
@@ -24,11 +24,11 @@ main() {
   Expect.equals(0, foo());
   Expect.isTrue(x is double);
   Expect.isTrue(x is int);
-  Expect.equals(8, b); // //# 01: continued
-  Expect.equals(8, 1.0 << 3); // //# 03: static type warning
+  Expect.equals(8, b); // /// 01: continued
+  Expect.equals(8, 1.0 << 3); // /// 03: static type warning
   Expect.isTrue(1 == 1.0);
-  Expect.equals(0, d); // //# 02: continued
-  Expect.equals(0, -0.0 << 1); // //# 04: static type warning
+  Expect.equals(0, d); // /// 02: continued
+  Expect.equals(0, -0.0 << 1); // /// 04: static type warning
   // Make sure the 1 is not shifted into the 32 bit range.
   Expect.equals(0, 0x100000000 >> 3);
   // The dynamic int-check also allows -0.0.

tests/compiler/dart2js_extra/int_index_test.dart

@@ -4,10 +4,10 @@
 
 main() {
   var a = [0, 1];
-  a[1.2]; //                      //# 01: runtime error
-  a[1.2] = 4; //                  //# 02: runtime error
-  checkIndex(a, 1.4);             //# 03: runtime error
-  checkIndexedAssignment(a, 1.4); //# 04: runtime error
+  a[1.2]; //                      /// 01: runtime error
+  a[1.2] = 4; //                  /// 02: runtime error
+  checkIndex(a, 1.4);             /// 03: runtime error
+  checkIndexedAssignment(a, 1.4); /// 04: runtime error
   checkIndex(a, 0);
   checkIndexedAssignment(a, 0);
 }

tests/compiler/dart2js_extra/invalid_annotation2_test.dart

@@ -14,7 +14,7 @@
 import 'dart:mirrors';
 
 @Deprecated("m"
-,, //                               //# 01: compile-time error
+,, //                               /// 01: compile-time error
 )
 class A {
 }