Clean up error handling.

dart/tests/compiler/dart2js/resolver_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 "package:expect/expect.dart";
 import 'dart:collection';
 
 import "../../../sdk/lib/_internal/compiler/implementation/resolution/resolution.dart";
 import "compiler_helper.dart";
 import "parser_helper.dart";
@@ skipping 127 matching lines @@
   ClassElement foo = compiler.mainApp.find(buildSourceString('Foo'));
   matchResolvedTypes(visitor, 'Foo<int, String> x;', 'Foo',
                      [compiler.intClass, compiler.stringClass]);
   matchResolvedTypes(visitor, 'Foo<Foo, Foo> x;', 'Foo',
                      [foo, foo]);
 
   compiler = new MockCompiler();
   compiler.parseScript('class Foo<T, U> {}');
   compiler.resolveStatement('Foo<notype, int> x;');
   Expect.equals(1, compiler.warnings.length);
-  Expect.equals(MessageKind.CANNOT_RESOLVE_TYPE,
+  Expect.equals(MessageKind.CANNOT_RESOLVE_TYPE.warning,
                 compiler.warnings[0].message.kind);
   Expect.equals(0, compiler.errors.length);
 
   compiler = new MockCompiler();
   compiler.parseScript('class Foo<T, U> {}');
   compiler.resolveStatement('var x = new Foo<notype, int>();');
   Expect.equals(0, compiler.warnings.length);
   Expect.equals(1, compiler.errors.length);
-  Expect.equals(MessageKind.CANNOT_RESOLVE_TYPE,
+  Expect.equals(MessageKind.CANNOT_RESOLVE_TYPE.error,
                 compiler.errors[0].message.kind);
 
   compiler = new MockCompiler();
   compiler.parseScript('class Foo<T> {'
                        '  Foo<T> t;'
                        '  foo(Foo<T> f) {}'
                        '  bar() { g(Foo<T> f) {}; g(); }'
                        '}');
   foo = compiler.mainApp.find(buildSourceString('Foo'));
   foo.ensureResolved(compiler);
@@ skipping 259 matching lines @@
 
   // Test that we get a warning when Foo is not defined.
   Map mapping = compiler.resolveStatement(statement).map;
 
   Expect.equals(2, mapping.length); // Both Foo and bar have an element.
   Expect.equals(1, compiler.warnings.length);
 
   Node warningNode = compiler.warnings[0].node;
 
   Expect.equals(
-      new Message(MessageKind.CANNOT_RESOLVE_TYPE,  {'typeName': 'Foo'}),
+      new Message(
+          MessageKind.CANNOT_RESOLVE_TYPE.warning,  {'typeName': 'Foo'}),
       compiler.warnings[0].message);
   VariableDefinitions definition = compiler.parsedTree;
   Expect.equals(warningNode, definition.type);
   compiler.clearWarnings();
 
   // Test that there is no warning after defining Foo.
   compiler.parseScript("class Foo {}");
   mapping = compiler.resolveStatement(statement).map;
   Expect.equals(2, mapping.length);
   Expect.equals(0, compiler.warnings.length);
 
   // Test that 'var' does not create a warning.
   mapping = compiler.resolveStatement("var foo;").map;
   Expect.equals(1, mapping.length);
   Expect.equals(0, compiler.warnings.length);
 }
 
 testSuperclass() {
   MockCompiler compiler = new MockCompiler();
   compiler.parseScript("class Foo extends Bar {}");
   compiler.resolveStatement("Foo bar;");
   // TODO(ahe): We get the same error twice: once from
   // ClassResolverVisitor, and once from ClassSupertypeResolver. We
   // should only the get the error once.
   Expect.equals(2, compiler.errors.length);
-  var cannotResolveBar = new Message(MessageKind.CANNOT_RESOLVE_TYPE,
+  var cannotResolveBar = new Message(MessageKind.CANNOT_RESOLVE_TYPE.error,
                                      {'typeName': 'Bar'});
   Expect.equals(cannotResolveBar, compiler.errors[0].message);
   Expect.equals(cannotResolveBar, compiler.errors[1].message);
   compiler.clearErrors();
 
   compiler = new MockCompiler();
   compiler.parseScript("class Foo extends Bar {}");
   compiler.parseScript("class Bar {}");
   Map mapping = compiler.resolveStatement("Foo bar;").map;
   Expect.equals(2, mapping.length);
 
   ClassElement fooElement = compiler.mainApp.find(buildSourceString('Foo'));
   ClassElement barElement = compiler.mainApp.find(buildSourceString('Bar'));
   Expect.equals(barElement.computeType(compiler),
                 fooElement.supertype);
   Expect.isTrue(fooElement.interfaces.isEmpty);
   Expect.isTrue(barElement.interfaces.isEmpty);
 }
 
 testVarSuperclass() {
   MockCompiler compiler = new MockCompiler();
   compiler.parseScript("class Foo extends var {}");
   compiler.resolveStatement("Foo bar;");
   Expect.equals(1, compiler.errors.length);
   Expect.equals(
-      new Message(MessageKind.CANNOT_RESOLVE_TYPE, {'typeName': 'var'}),
+      new Message(MessageKind.CANNOT_RESOLVE_TYPE.warning, {'typeName': 'var'}),
       compiler.errors[0].message);
   compiler.clearErrors();
 }
 
 testOneInterface() {
   MockCompiler compiler = new MockCompiler();
   compiler.parseScript("class Foo implements Bar {}");
   compiler.resolveStatement("Foo bar;");
   Expect.equals(1, compiler.errors.length);
   Expect.equals(
-      new Message(MessageKind.CANNOT_RESOLVE_TYPE, {'typeName': 'bar'}),
+      new Message(MessageKind.CANNOT_RESOLVE_TYPE.warning, {'typeName': 'bar'}),
       compiler.errors[0].message);
   compiler.clearErrors();
 
   // Add the abstract class to the world and make sure everything is setup
   // correctly.
   compiler.parseScript("abstract class Bar {}");
 
   ResolverVisitor visitor =
       new ResolverVisitor(compiler, null, new CollectingTreeElements(null));
   compiler.resolveStatement("Foo bar;");
@@ skipping 121 matching lines @@
   MockCompiler compiler = new MockCompiler();
   compiler.parseScript("""class A extends B {}
                           class B extends A {}
                           main() { return new A(); }""");
   FunctionElement mainElement = compiler.mainApp.find(MAIN);
   compiler.resolver.resolve(mainElement);
   Expect.equals(0, compiler.warnings.length);
   Expect.equals(2, compiler.errors.length);
   Expect.equals(MessageKind.CYCLIC_CLASS_HIERARCHY,
                 compiler.errors[0].message.kind);
-  Expect.equals(MessageKind.CANNOT_FIND_CONSTRUCTOR,
+  Expect.equals(MessageKind.CANNOT_FIND_CONSTRUCTOR.error,
                 compiler.errors[1].message.kind);
 
   compiler = new MockCompiler();
   compiler.parseScript("""abstract class A extends B {}
                           abstract class B extends A {}
                           class C implements A {}
                           main() { return new C(); }""");
   mainElement = compiler.mainApp.find(MAIN);
   compiler.resolver.resolve(mainElement);
   Expect.equals(0, compiler.warnings.length);
@@ skipping 70 matching lines @@
               }""";
   resolveConstructor(script, "A a = new A();", "A", "", 2,
                      expectedWarnings: [MessageKind.ALREADY_INITIALIZED],
                      expectedErrors: [MessageKind.DUPLICATE_INITIALIZER]);
 
   script = """class A {
                 A() : this.foo = 1;
               }""";
   resolveConstructor(script, "A a = new A();", "A", "", 0,
                      expectedWarnings: [],
-                     expectedErrors: [MessageKind.CANNOT_RESOLVE]);
+                     expectedErrors: [MessageKind.CANNOT_RESOLVE.error]);
 
   script = """class A {
                 int foo;
                 int bar;
                 A() : this.foo = bar;
               }""";
   resolveConstructor(script, "A a = new A();", "A", "", 3,
                      expectedWarnings: [],
                      expectedErrors: [MessageKind.NO_INSTANCE_AVAILABLE]);
 
@@ skipping 153 matching lines @@
       }
       main() {
         new A() == new B();
       }""";
   final compiler = compileScript(script);
   Expect.equals(1, compiler.warnings.length);
   Expect.equals(MessageKind.OVERRIDE_EQUALS_NOT_HASH_CODE,
                 compiler.warnings[0].message.kind);
   Expect.equals(0, compiler.errors.length);
 }