| Index: editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/resolver/StaticWarningCodeTest.java
|
| diff --git a/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/resolver/StaticWarningCodeTest.java b/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/resolver/StaticWarningCodeTest.java
|
| index aef05fe51e3c330d83c4123009994e349ebc5ca8..799d633df0504d62fd1a63f25a3c46d52cc84145 100644
|
| --- a/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/resolver/StaticWarningCodeTest.java
|
| +++ b/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/resolver/StaticWarningCodeTest.java
|
| @@ -796,6 +796,19 @@ public class StaticWarningCodeTest extends ResolverTestCase {
|
| verify(source);
|
| }
|
|
|
| + public void test_conflictingDartImport() throws Exception {
|
| + Source source = addSource(createSource(//
|
| + "import 'lib.dart';",
|
| + "import 'dart:async';",
|
| + "Future f = null;",
|
| + "Stream s;"));
|
| + addSource("/lib.dart", createSource(//
|
| + "library lib;",
|
| + "class Future {}"));
|
| + resolve(source);
|
| + assertErrors(source, StaticWarningCode.CONFLICTING_DART_IMPORT);
|
| + }
|
| +
|
| public void test_conflictingInstanceGetterAndSuperclassMember_direct_field() throws Exception {
|
| Source source = addSource(createSource(//
|
| "class A {",
|
|
|