Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: compiler/javatests/com/google/dart/compiler/end2end/inc/IncrementalCompilation2Test.java

Issue 11273064: Issue 5887. Parts must start with 'part of'. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « compiler/javatests/com/google/dart/compiler/IdeTests.java ('k') | compiler/javatests/com/google/dart/compiler/end2end/inc/MemoryLibrarySource.java » ('j') | editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/ScanTaskTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/javatests/com/google/dart/compiler/end2end/inc/IncrementalCompilation2Test.java
diff --git a/compiler/javatests/com/google/dart/compiler/end2end/inc/IncrementalCompilation2Test.java b/compiler/javatests/com/google/dart/compiler/end2end/inc/IncrementalCompilation2Test.java
index ac9938030348dcc2b6328cc6700c92719310f529..eb13e61432b78eccc8736b769d874e2f30412eb9 100644
--- a/compiler/javatests/com/google/dart/compiler/end2end/inc/IncrementalCompilation2Test.java
+++ b/compiler/javatests/com/google/dart/compiler/end2end/inc/IncrementalCompilation2Test.java
@@ -3,11 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
package com.google.dart.compiler.end2end.inc;
-import static com.google.dart.compiler.DartCompiler.EXTENSION_DEPS;
-import static com.google.dart.compiler.DartCompiler.EXTENSION_TIMESTAMP;
-import static com.google.dart.compiler.common.ErrorExpectation.assertErrors;
-import static com.google.dart.compiler.common.ErrorExpectation.errEx;
-
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -28,7 +23,11 @@ import com.google.dart.compiler.ast.LibraryUnit;
import com.google.dart.compiler.common.ErrorExpectation;
import com.google.dart.compiler.resolver.ResolverErrorCode;
import com.google.dart.compiler.resolver.TypeErrorCode;
-import com.google.dart.compiler.util.apache.StringUtils;
+
+import static com.google.dart.compiler.DartCompiler.EXTENSION_DEPS;
+import static com.google.dart.compiler.DartCompiler.EXTENSION_TIMESTAMP;
+import static com.google.dart.compiler.common.ErrorExpectation.assertErrors;
+import static com.google.dart.compiler.common.ErrorExpectation.errEx;
import junit.framework.AssertionFailedError;
@@ -92,9 +91,9 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"part 'B.dart';",
"part 'C.dart';",
""));
- appSource.setContent("A.dart", "");
- appSource.setContent("B.dart", "");
- appSource.setContent("C.dart", "");
+ appSource.setContent("A.dart", "part of application;");
+ appSource.setContent("B.dart", "part of application;");
+ appSource.setContent("C.dart", "part of application;");
}
@Override
@@ -115,6 +114,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"B.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class A {",
" int not_hole;",
"}",
@@ -123,6 +123,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"C.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class B extends A {",
" int bar() {",
" return super.not_hole;", // qualified reference
@@ -136,6 +137,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"int not_hole;",
""));
compile();
@@ -158,6 +160,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"B.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class A {",
" int foo() {",
" return hole;", // no such field
@@ -165,12 +168,13 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"}",
""));
compile();
- assertErrors(errors, errEx(TypeErrorCode.CANNOT_BE_RESOLVED, 4, 12, 4));
+ assertErrors(errors, errEx(TypeErrorCode.CANNOT_BE_RESOLVED, 5, 12, 4));
// Update units and compile.
appSource.setContent(
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"int hole;",
""));
compile();
@@ -191,6 +195,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"B.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class A {",
" foo() {}",
"}",
@@ -199,6 +204,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"C.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class B extends A {",
" int bar() {",
" foo();", // unqualified invocation
@@ -213,6 +219,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"foo() {}",
""));
compile();
@@ -227,7 +234,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
Thread.sleep(5);
// Remove top-level foo(), so invocation of foo() in B should be bound to the super class.
{
- appSource.setContent("A.dart", "");
+ appSource.setContent("A.dart", "part of application;");
compile();
// B should be compiled because it also declares foo(), so produces "shadow" conflict.
// C should be compiled because it has unqualified invocation which was declared in A.
@@ -246,6 +253,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"B.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class A {",
" foo() {}",
"}",
@@ -254,6 +262,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"C.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class B extends A {",
" int bar() {",
" super.foo();", // qualified invocation
@@ -268,6 +277,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"foo() {}",
""));
compile();
@@ -289,6 +299,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"B.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class A {",
" var foo;",
"}",
@@ -297,6 +308,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"C.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class B extends A {",
" int bar() {",
" foo = 0;", // unqualified access
@@ -311,6 +323,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"var foo;",
""));
compile();
@@ -325,7 +338,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
Thread.sleep(5);
// Remove top-level "foo", so access to "foo" in B should be bound to the super class.
{
- appSource.setContent("A.dart", "");
+ appSource.setContent("A.dart", "part of application;");
compile();
// B should be compiled because it also declares "foo", so produces "shadow" conflict.
// C should be compiled because it has unqualified access which was declared in A.
@@ -344,6 +357,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"B.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class A {",
" var foo;",
"}",
@@ -352,6 +366,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"C.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class B extends A {",
" int bar() {",
" super.foo = 0;", // qualified access
@@ -366,6 +381,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"var foo;",
""));
compile();
@@ -383,6 +399,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"B.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"methodB() {",
" var symbolDependency_foo;",
"}"));
@@ -393,6 +410,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"var symbolDependency_foo;"));
compile();
// Now there is top-level declarations conflict between A and B.
@@ -407,17 +425,19 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"var duplicate;"));
appSource.setContent(
"B.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"bar() {",
" var duplicate;",
"}"));
compile();
// Update units and compile.
- appSource.setContent("A.dart", "");
+ appSource.setContent("A.dart", "part of application;");
compile();
// Top-level declaration in A was removed, so no conflict.
// So:
@@ -435,11 +455,13 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"var duplicate;"));
appSource.setContent(
"B.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"bar() {",
" var duplicate;",
"}"));
@@ -466,6 +488,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class A {",
"}",
""));
@@ -473,6 +496,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"B.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class B extends A {",
" foo() {",
" var bar;",
@@ -486,6 +510,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"class A {",
" var bar;",
"}",
@@ -501,6 +526,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"var conflict;",
""));
compile();
@@ -510,6 +536,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"B.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
"var conflict;",
""));
compile();
@@ -517,8 +544,8 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
// Both A and B have errors.
assertErrors(
errors,
- errEx("A.dart", ResolverErrorCode.DUPLICATE_TOP_LEVEL_DECLARATION, 2, 5, 8),
- errEx("B.dart", ResolverErrorCode.DUPLICATE_TOP_LEVEL_DECLARATION, 2, 5, 8));
+ errEx("A.dart", ResolverErrorCode.DUPLICATE_TOP_LEVEL_DECLARATION, 3, 5, 8),
+ errEx("B.dart", ResolverErrorCode.DUPLICATE_TOP_LEVEL_DECLARATION, 3, 5, 8));
}
/**
@@ -798,6 +825,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
""));
appSource.setContent(
APP,
@@ -1445,6 +1473,97 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
}
/**
+ * Part should have one and only one directive - "part of".
+ */
+ public void test_partDirectives_otherThenPartOf() throws Exception {
+ appSource.setContent(
+ "A.dart",
+ makeCode(
+ "// filler filler filler filler filler filler filler filler filler filler filler",
+ "library A;",
+ ""));
+ appSource.setContent(
+ APP,
+ makeCode(
+ "// filler filler filler filler filler filler filler filler filler filler filler",
+ "library application;",
+ "part 'A.dart';",
+ ""));
+ // do compile
+ compile();
+ assertErrors(errors, errEx(DartCompilerErrorCode.ILLEGAL_DIRECTIVES_IN_SOURCED_UNIT, 2, 1, 10));
+ }
+
+ /**
+ * Part should have one and only one directive - "part of".
+ */
+ public void test_partDirectives_otherThenPartOf2() throws Exception {
+ appSource.setContent(
+ "A.dart",
+ makeCode(
+ "// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of application;",
+ "part 'A.dart';",
+ ""));
+ appSource.setContent(
+ APP,
+ makeCode(
+ "// filler filler filler filler filler filler filler filler filler filler filler",
+ "library application;",
+ "part 'A.dart';",
+ ""));
+ // do compile
+ compile();
+ assertErrors(errors, errEx(DartCompilerErrorCode.ILLEGAL_DIRECTIVES_IN_SOURCED_UNIT, 2, 1, 20));
+ }
+
+ /**
+ * Part should have one and only one directive - "part of".
+ */
+ public void test_partDirectives_noPartOf() throws Exception {
+ appSource.setContent(
+ "A.dart",
+ makeCode(
+ "// filler filler filler filler filler filler filler filler filler filler filler",
+ ""));
+ appSource.setContent(
+ APP,
+ makeCode(
+ "// filler filler filler filler filler filler filler filler filler filler filler",
+ "library application;",
+ "part 'A.dart';",
+ ""));
+ // do compile
+ compile();
+ assertErrors(errors, errEx(DartCompilerErrorCode.MISSING_PART_OF_DIRECTIVE, -1, -1, 0));
+ }
+
+ /**
+ * Part should have one and only one directive - "part of".
+ */
+ public void test_partDirectives_wrongNameInPartOf() throws Exception {
+ appSource.setContent(
+ "A.dart",
+ makeCode(
+ "// filler filler filler filler filler filler filler filler filler filler filler",
+ "part of Z;",
+ ""));
+ appSource.setContent(
+ APP,
+ makeCode(
+ "// filler filler filler filler filler filler filler filler filler filler filler",
+ "library application;",
+ "part 'A.dart';",
+ ""));
+ // do compile
+ compile();
+ assertErrors(
+ errors,
+ errEx(DartCompilerErrorCode.WRONG_PART_OF_NAME, 2, 1, 10),
+ errEx(TypeErrorCode.CANNOT_BE_RESOLVED, 2, 9, 1));
+ }
+
+ /**
* Internals of Dart use "dart-ext:" import scheme, and these libraries are allowed to use
* "native". New import syntax.
*/
@@ -1463,7 +1582,7 @@ public class IncrementalCompilation2Test extends CompilerTestCase {
compile();
assertErrors(errors);
}
-
+
/**
* Internals of Dart use "dart-ext:" import scheme, and these libraries are allowed to use
* "native". Obsolete import syntax.
« no previous file with comments | « compiler/javatests/com/google/dart/compiler/IdeTests.java ('k') | compiler/javatests/com/google/dart/compiler/end2end/inc/MemoryLibrarySource.java » ('j') | editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/ScanTaskTest.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698