Improve checking of patches.

tests/compiler/dart2js/patch_test.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.
 
 import "../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart";
 import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart";
 import "../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart";
 import "../../../sdk/lib/_internal/compiler/implementation/util/util.dart";
 import "mock_compiler.dart";
 import "parser_helper.dart";
@@ skipping 26 matching lines @@
     Expect.isFalse(node.hasBody());
 }
 
 Element ensure(compiler,
                String name,
                Element lookup(name),
                {bool isPatched: false,
                 bool isPatch: false,
                 bool isMethod: true,
                 bool isGetter: false,
-                bool isFound: true}) {
+                bool isFound: true,
+                bool isRegular: false}) {

[ngeoffray, 2013/01/11 11:46:12]

What's 'isRegular'? Maybe add a comment.

[Johnni Winther, 2013/01/29 09:30:56]

A regular member is one that is neither patched nor a patch nor declared in a
patch library. The terminology is explained in 'patch_parser.dart'.

   var element = lookup(buildSourceString(name));
   if (!isFound) {
     Expect.isNull(element);
     return element;
   }
   Expect.isNotNull(element);
   if (isGetter) {
     Expect.isTrue(element is AbstractFieldElement);
     Expect.isNotNull(element.getter);
     element = element.getter;
@@ skipping 21 matching lines @@
     Expect.equals(element.origin, element.declaration);
     Expect.equals(element, element.implementation);
 
     if (isMethod) {
       expectHasBody(compiler, element);
       expectHasNoBody(compiler, element.origin);
     }
   } else {
     Expect.isTrue(element.isDeclaration);
   }
-  if (!(element.isPatched || element.isPatch)) {
+  if (isRegular) {
     Expect.isNull(element.origin);
     Expect.isNull(element.patch);
 
     Expect.equals(element, element.declaration);
     Expect.equals(element, element.implementation);
 
     if (isMethod) {
       expectHasBody(compiler, element);
     }
   }
   Expect.isFalse(element.isPatched && element.isPatch);
   return element;
 }
 
 testPatchFunction() {
   var compiler = applyPatch(
       "external test();",
       "patch test() { return 'string'; } ");
   ensure(compiler, "test", compiler.coreLibrary.find, isPatched: true);
   ensure(compiler, "test", compiler.coreLibrary.patch.find, isPatch: true);
 
   Expect.isTrue(compiler.warnings.isEmpty,
                 "Unexpected warnings: ${compiler.warnings}");
   Expect.isTrue(compiler.errors.isEmpty,
                 "Unexpected errors: ${compiler.errors}");
 }
 
+testPatchConstructor() {
+  var compiler = applyPatch(
+      """
+      class Class {
+        external Class();
+      }
+      """,
+      """
+      patch class Class {
+        patch Class();
+      }
+      """);
+  var container = ensure(compiler, "Class", compiler.coreLibrary.find,
+                         isMethod: false, isPatched: true);
+  container.parseNode(compiler);
+  ensure(compiler, "Class", compiler.coreLibrary.patch.find,
+         isMethod: false, isPatch: true);
+
+
+
+  ensure(compiler, "Class", (name) => container.localScope[name],
+         isMethod: false, isPatched: true);
+  ensure(compiler, "Class", (name) => container.patch.localScope[name],
+         isMethod: false, isPatch: true);
+
+  Expect.isTrue(compiler.warnings.isEmpty,
+                "Unexpected warnings: ${compiler.warnings}");
+  Expect.isTrue(compiler.errors.isEmpty,
+                "Unexpected errors: ${compiler.errors}");
+}
+
 testPatchMember() {
   var compiler = applyPatch(
       """
       class Class {
         external String toString();
       }
       """,
       """
       patch class Class {
         patch String toString() => 'string';
@@ skipping 58 matching lines @@
       """
       patch class Class {
       }
       """);
   var container = ensure(compiler, "Class", compiler.coreLibrary.find,
                          isMethod: false, isPatched: true);
   container.parseNode(compiler);
   ensure(compiler, "Class", compiler.coreLibrary.patch.find,
          isMethod: false, isPatch: true);
 
-  ensure(compiler, "regular", container.lookupLocalMember);
-  ensure(compiler, "regular", container.patch.lookupLocalMember);
+  ensure(compiler, "regular", container.lookupLocalMember, isRegular: true);
+  ensure(compiler, "regular", container.patch.lookupLocalMember,
+         isRegular: true);
 
   Expect.isTrue(compiler.warnings.isEmpty,
                 "Unexpected warnings: ${compiler.warnings}");
   Expect.isTrue(compiler.errors.isEmpty,
                 "Unexpected errors: ${compiler.errors}");
 }
 
 testGhostMember() {
   var compiler = applyPatch(
       """
       class Class {
       }
       """,
       """
       patch class Class {
         void ghost() {}
       }
       """);
   var container = ensure(compiler, "Class", compiler.coreLibrary.find,
                          isMethod: false, isPatched: true);
   container.parseNode(compiler);
   ensure(compiler, "Class", compiler.coreLibrary.patch.find,
          isMethod: false, isPatch: true);
 
   ensure(compiler, "ghost", container.lookupLocalMember, isFound: false);
-  ensure(compiler, "ghost", container.patch.lookupLocalMember);
+  ensure(compiler, "ghost", container.patch.lookupLocalMember,
+      isRegular: true);
 
   Expect.isTrue(compiler.warnings.isEmpty,
                 "Unexpected warnings: ${compiler.warnings}");
   Expect.isTrue(compiler.errors.isEmpty,
                 "Unexpected errors: ${compiler.errors}");
 }
 
 testInjectFunction() {
   var compiler = applyPatch(
       "",
       "int _function() => 5;");
   ensure(compiler,
          "_function",
          compiler.coreLibrary.find,
          isFound: false);
   ensure(compiler,
          "_function",
-         compiler.coreLibrary.patch.find);
+         compiler.coreLibrary.patch.find,
+         isRegular: true);
 
   Expect.isTrue(compiler.warnings.isEmpty,
                 "Unexpected warnings: ${compiler.warnings}");
   Expect.isTrue(compiler.errors.isEmpty,
                 "Unexpected errors: ${compiler.errors}");
 }
 
 testPatchSignatureCheck() {
   var compiler = applyPatch(
       """
@@ skipping 97 matching lines @@
   compiler.errors.clear();
   compiler.resolver.resolveMethodElement(
       ensure(compiler, "method8", container.lookupLocalMember,
           isPatched: true));
   Expect.isTrue(compiler.warnings.isEmpty,
                 "Unexpected warnings: ${compiler.warnings}");
   Expect.isFalse(compiler.errors.isEmpty);
   print('method8:${compiler.errors}');
 }
 
+testPatchNonExistingTopLevel() {
+  var compiler = applyPatch(
+      """

[ahe, 2013/01/21 10:53:35]

Why a multiline string?

[Johnni Winther, 2013/01/29 09:30:56]

Expanded with the missing class declaration.

+      """,
+      """
+      patch class Class {}
+      """);
+  Expect.isTrue(compiler.warnings.isEmpty,
+                "Unexpected warnings: ${compiler.warnings}");
+  print('testPatchNonExistingTopLevel:${compiler.errors}');
+  Expect.equals(1, compiler.errors.length);
+  Expect.isTrue(
+      compiler.errors[0].message.kind == MessageKind.PATCH_NON_EXISTING);

[ahe, 2013/01/21 10:53:35]

I don't think you're testing the positions. This applies to all the tests below.
Let's try to think of a way we can make it easy to test positions.

+}
+
+testPatchNonExistingMember() {
+  var compiler = applyPatch(
+      """
+      class Class {}
+      """,
+      """
+      patch class Class {
+        patch void foo() {}
+      }
+      """);
+  var container = ensure(compiler, "Class", compiler.coreLibrary.find,
+                         isMethod: false, isPatched: true);
+  container.parseNode(compiler);
+
+  Expect.isTrue(compiler.warnings.isEmpty,
+                "Unexpected warnings: ${compiler.warnings}");
+  print('testPatchNonExistingMember:${compiler.errors}');
+  Expect.equals(1, compiler.errors.length);
+  Expect.isTrue(
+      compiler.errors[0].message.kind == MessageKind.PATCH_NON_EXISTING);
+}
+
+testPatchNonPatchablePatch() {
+  var compiler = applyPatch(
+      """
+      external get foo;
+      """,
+      """
+      patch var foo;
+      """);
+  ensure(compiler, "foo", compiler.coreLibrary.find);
+
+  Expect.isTrue(compiler.warnings.isEmpty,
+                "Unexpected warnings: ${compiler.warnings}");
+  print('testPatchNonPatchablePatch:${compiler.errors}');
+  Expect.equals(1, compiler.errors.length);
+  Expect.isTrue(
+      compiler.errors[0].message.kind == MessageKind.PATCH_NONPATCHABLE);

[ahe, 2013/01/21 10:53:35]

This, and many tests below, do not test that you get the informational message
that is generated.

[Johnni Winther, 2013/01/29 09:30:56]

Generally a good idea, but not easy currently.

+}
+
+testPatchNonPatchableOrigin() {
+  var compiler = applyPatch(
+      """
+      external var foo;
+      """,
+      """
+      patch get foo => 0;
+      """);
+  ensure(compiler, "foo", compiler.coreLibrary.find, isMethod: false);
+
+  Expect.isTrue(compiler.warnings.isEmpty,
+                "Unexpected warnings: ${compiler.warnings}");
+  print('testPatchNonPatchableOrigin:${compiler.errors}');
+  Expect.equals(1, compiler.errors.length);
+  Expect.isTrue(
+      compiler.errors[0].message.kind == MessageKind.PATCH_NONPATCHABLE);
+}
+
+testPatchNonExternalTopLevel() {
+  var compiler = applyPatch(
+      """
+      void foo() {}
+      """,
+      """
+      patch void foo() {}
+      """);
+  print('testPatchNonExternalTopLevel.errors:${compiler.errors}');
+  print('testPatchNonExternalTopLevel.warnings:${compiler.warnings}');
+  Expect.equals(1, compiler.errors.length);
+  Expect.isTrue(
+      compiler.errors[0].message.kind == MessageKind.PATCH_NON_EXTERNAL);
+  Expect.equals(1, compiler.warnings.length);
+  Expect.isTrue(
+      compiler.warnings[0].message.kind == MessageKind.PATCH_POINT_TO_FUNCTION);
+}
+
+testPatchNonExternalMember() {
+  var compiler = applyPatch(
+      """
+      class Class {
+        void foo() {}
+      }
+      """,
+      """
+      patch class Class {
+        patch void foo() {}
+      }
+      """);
+  var container = ensure(compiler, "Class", compiler.coreLibrary.find,
+                         isMethod: false, isPatched: true);
+  container.parseNode(compiler);
+
+  print('testPatchNonExternalMember.errors:${compiler.errors}');
+  print('testPatchNonExternalMember.warnings:${compiler.warnings}');
+  Expect.equals(1, compiler.errors.length);
+  Expect.isTrue(
+      compiler.errors[0].message.kind == MessageKind.PATCH_NON_EXTERNAL);
+  Expect.equals(1, compiler.warnings.length);
+  Expect.isTrue(
+      compiler.warnings[0].message.kind == MessageKind.PATCH_POINT_TO_FUNCTION);
+}
+
+testPatchNonClass() {
+  var compiler = applyPatch(
+      """
+      external void Class() {}
+      """,
+      """
+      patch class Class {}
+      """);
+  print('testPatchNonClass.errors:${compiler.errors}');
+  print('testPatchNonClass.warnings:${compiler.warnings}');
+  Expect.equals(1, compiler.errors.length);
+  Expect.isTrue(
+      compiler.errors[0].message.kind == MessageKind.PATCH_NON_CLASS);
+  Expect.equals(1, compiler.warnings.length);
+  Expect.isTrue(
+      compiler.warnings[0].message.kind == MessageKind.PATCH_POINT_TO_CLASS);
+}
+
+testPatchNonGetter() {
+  var compiler = applyPatch(
+      """
+      external void foo() {}
+      """,
+      """
+      patch get foo => 0;
+      """);
+  print('testPatchNonClass.errors:${compiler.errors}');
+  print('testPatchNonClass.warnings:${compiler.warnings}');
+  Expect.equals(1, compiler.errors.length);
+  Expect.isTrue(
+      compiler.errors[0].message.kind == MessageKind.PATCH_NON_GETTER);
+  Expect.equals(1, compiler.warnings.length);
+  Expect.isTrue(
+      compiler.warnings[0].message.kind == MessageKind.PATCH_POINT_TO_GETTER);
+}
+
+testPatchNoGetter() {
+  var compiler = applyPatch(
+      """
+      external set foo(var value) {}
+      """,
+      """
+      patch get foo => 0;
+      """);
+  print('testPatchNonClass.errors:${compiler.errors}');
+  print('testPatchNonClass.warnings:${compiler.warnings}');
+  Expect.equals(1, compiler.errors.length);
+  Expect.isTrue(
+      compiler.errors[0].message.kind == MessageKind.PATCH_NO_GETTER);
+  Expect.equals(1, compiler.warnings.length);
+  Expect.isTrue(
+      compiler.warnings[0].message.kind == MessageKind.PATCH_POINT_TO_GETTER);
+}
+
+testPatchNonSetter() {
+  var compiler = applyPatch(
+      """
+      external void foo() {}
+      """,
+      """
+      patch set foo(var value) {}
+      """);
+  print('testPatchNonClass.errors:${compiler.errors}');
+  print('testPatchNonClass.warnings:${compiler.warnings}');
+  Expect.equals(1, compiler.errors.length);
+  Expect.isTrue(
+      compiler.errors[0].message.kind == MessageKind.PATCH_NON_SETTER);
+  Expect.equals(1, compiler.warnings.length);
+  Expect.isTrue(
+      compiler.warnings[0].message.kind == MessageKind.PATCH_POINT_TO_SETTER);
+}
+
+testPatchNoSetter() {
+  var compiler = applyPatch(
+      """
+      external get foo;
+      """,
+      """
+      patch set foo(var value) {}
+      """);
+  print('testPatchNonClass.errors:${compiler.errors}');
+  print('testPatchNonClass.warnings:${compiler.warnings}');
+  Expect.equals(1, compiler.errors.length);
+  Expect.isTrue(
+      compiler.errors[0].message.kind == MessageKind.PATCH_NO_SETTER);
+  Expect.equals(1, compiler.warnings.length);
+  Expect.isTrue(
+      compiler.warnings[0].message.kind == MessageKind.PATCH_POINT_TO_SETTER);
+}
+
+testPatchNonFunction() {
+  var compiler = applyPatch(
+      """
+      external get foo;
+      """,
+      """
+      patch void foo() {}
+      """);
+  print('testPatchNonClass.errors:${compiler.errors}');
+  print('testPatchNonClass.warnings:${compiler.warnings}');
+  Expect.equals(1, compiler.errors.length);
+  Expect.isTrue(
+      compiler.errors[0].message.kind == MessageKind.PATCH_NON_FUNCTION);
+  Expect.equals(1, compiler.warnings.length);
+  Expect.isTrue(
+      compiler.warnings[0].message.kind == MessageKind.PATCH_POINT_TO_FUNCTION);
+}
+
 main() {
+  testPatchConstructor();
   testPatchFunction();
   testPatchMember();
   testPatchGetter();
   testRegularMember();
   testGhostMember();
   testInjectFunction();
   testPatchSignatureCheck();
+
+  testPatchNonExistingTopLevel();
+  testPatchNonExistingMember();
+  testPatchNonPatchablePatch();
+  testPatchNonPatchableOrigin();
+  testPatchNonExternalTopLevel();
+  testPatchNonExternalMember();
+  testPatchNonClass();
+  testPatchNonGetter();
+  testPatchNoGetter();
+  testPatchNonSetter();
+  testPatchNoSetter();
+  testPatchNonFunction();
 }