Revert "Parts must start with 'part of'" and "Attempt to fix VM build"

dart/compiler/javatests/com/google/dart/compiler/end2end/inc/IncrementalCompilation2Test.java

 // 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.
 package com.google.dart.compiler.end2end.inc;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.dart.compiler.CompilerTestCase;
 import com.google.dart.compiler.DartCompilationError;
@@ skipping 73 matching lines @@
     appSource = new MemoryLibrarySource(APP);
     appSource.setContent(
         APP,
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
             "library application;",
             "part 'A.dart';",
             "part 'B.dart';",
             "part 'C.dart';",
             ""));
-    appSource.setContent("A.dart", "part of application;");
-    appSource.setContent("B.dart", "part of application;");
-    appSource.setContent("C.dart", "part of application;");
+    appSource.setContent("A.dart", "");
+    appSource.setContent("B.dart", "");
+    appSource.setContent("C.dart", "");
   }
 
   @Override
   protected void tearDown() {
     config = null;
     provider = null;
     appSource = null;
     errors.clear();
     units.clear();
   }
 
   /**
    * "not_hole" is referenced using "super" qualifier, so is not affected by declaring top-level
    * field with same name.
    */
   public void test_useQualifiedFieldReference_ignoreTopLevelDeclaration() {
     appSource.setContent(
         "B.dart",
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
-            "part of application;",
             "class A {",
             "  int not_hole;",
             "}",
             ""));
     appSource.setContent(
         "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
             "  }",
             "}",
             ""));
     compile();
     assertErrors(errors);
     // Update units and compile.
     appSource.setContent(
         "A.dart",
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
-            "part of application;",
             "int not_hole;",
             ""));
     compile();
     // TODO(scheglov) Fix this after 1159
     //assertErrors(errors, errEx(ResolverErrorCode.DUPLICATE_LOCAL_VARIABLE_WARNING, -1, 7, 20));
     // B should be compiled because it now conflicts with A.
     // C should not be compiled, because it reference "not_hole" field, not top-level variable.
     didWrite("A.dart", EXTENSION_TIMESTAMP);
     didWrite("B.dart", EXTENSION_TIMESTAMP);
     didNotWrite("C.dart", EXTENSION_TIMESTAMP);
     assertAppBuilt();
   }
 
   /**
    * Referenced "hole" identifier can not be resolved, but when we declare it in A, then B should be
    * recompiled and error message disappear.
    */
   public void test_useUnresolvedField_recompileOnTopLevelDeclaration() {
     appSource.setContent(
         "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
             "  }",
             "}",
             ""));
     compile();
-    assertErrors(errors, errEx(TypeErrorCode.CANNOT_BE_RESOLVED, 5, 12, 4));
+    assertErrors(errors, errEx(TypeErrorCode.CANNOT_BE_RESOLVED, 4, 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();
     // A and B should be compiled.
     didWrite("A.dart", EXTENSION_TIMESTAMP);
     didWrite("B.dart", EXTENSION_TIMESTAMP);
     assertAppBuilt();
     // "hole" was filled with top-level field.
     assertErrors(errors);
   }
 
   /**
    * Test for "hole" feature. If we use unqualified invocation and add/remove top-level method, this
    * should cause compilation of invocation unit.
    */
   public void test_isMethodHole_useUnqualifiedInvocation() throws Exception {
     appSource.setContent(
         "B.dart",
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
-            "part of application;",
             "class A {",
             "  foo() {}",
             "}",
             ""));
     appSource.setContent(
         "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
             "  }",
             "}",
             ""));
     compile();
     assertErrors(errors);
     // Declare top-level foo(), now invocation of foo() in B should be bound to this top-level.
     {
       appSource.setContent(
           "A.dart",
           makeCode(
               "// filler filler filler filler filler filler filler filler filler filler filler",
-              "part of application;",
               "foo() {}",
               ""));
       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.
       didWrite("A.dart", EXTENSION_TIMESTAMP);
       didWrite("B.dart", EXTENSION_TIMESTAMP);
       didWrite("C.dart", EXTENSION_TIMESTAMP);
       assertAppBuilt();
     }
     // Wait, because analysis is so fast that may be A will have same time as old artifact.
     Thread.sleep(5);
     // Remove top-level foo(), so invocation of foo() in B should be bound to the super class.
     {
-      appSource.setContent("A.dart", "part of application;");
+      appSource.setContent("A.dart", "");
       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.
       didWrite("A.dart", EXTENSION_TIMESTAMP);
       didWrite("B.dart", EXTENSION_TIMESTAMP);
       didWrite("C.dart", EXTENSION_TIMESTAMP);
     }
   }
 
   /**
    * Test for "hole" feature. If we use qualified invocation and add/remove top-level method, this
    * should not cause compilation of invocation unit.
    */
   public void test_notMethodHole_useQualifiedInvocation() {
     appSource.setContent(
         "B.dart",
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
-            "part of application;",
             "class A {",
             "  foo() {}",
             "}",
             ""));
     appSource.setContent(
         "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
             "  }",
             "}",
             ""));
     compile();
     assertErrors(errors);
     // Declare top-level foo(), but it is ignored.
     {
       appSource.setContent(
           "A.dart",
           makeCode(
               "// filler filler filler filler filler filler filler filler filler filler filler",
-              "part of application;",
               "foo() {}",
               ""));
       compile();
       // B should be compiled because it also declares foo(), so produces "shadow" conflict.
       // C should not be compiled because.
       didWrite("A.dart", EXTENSION_TIMESTAMP);
       didWrite("B.dart", EXTENSION_TIMESTAMP);
       didNotWrite("C.dart", EXTENSION_TIMESTAMP);
       assertAppBuilt();
     }
   }
 
   /**
    * Test for "hole" feature. If we use unqualified access and add/remove top-level field, this
    * should cause compilation of invocation unit.
    */
   public void test_fieldHole_useUnqualifiedAccess() throws Exception {
     appSource.setContent(
         "B.dart",
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
-            "part of application;",
             "class A {",
             "  var foo;",
             "}",
             ""));
     appSource.setContent(
         "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
             "  }",
             "}",
             ""));
     compile();
     assertErrors(errors);
     // Declare top-level "foo", now access to "foo" in B should be bound to this top-level.
     {
       appSource.setContent(
           "A.dart",
           makeCode(
               "// filler filler filler filler filler filler filler filler filler filler filler",
-              "part of application;",
               "var foo;",
               ""));
       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.
       didWrite("A.dart", EXTENSION_TIMESTAMP);
       didWrite("B.dart", EXTENSION_TIMESTAMP);
       didWrite("C.dart", EXTENSION_TIMESTAMP);
       assertAppBuilt();
     }
     // Wait, because analysis is so fast that may be A will have same time as old artifact.
     Thread.sleep(5);
     // Remove top-level "foo", so access to "foo" in B should be bound to the super class.
     {
-      appSource.setContent("A.dart", "part of application;");
+      appSource.setContent("A.dart", "");
       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.
       didWrite("A.dart", EXTENSION_TIMESTAMP);
       didWrite("B.dart", EXTENSION_TIMESTAMP);
       didWrite("C.dart", EXTENSION_TIMESTAMP);
     }
   }
 
   /**
    * Test for "hole" feature. If we use qualified access and add/remove top-level field, this should
    * not cause compilation of invocation unit.
    */
   public void test_fieldHole_useQualifiedAccess() {
     appSource.setContent(
         "B.dart",
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
-            "part of application;",
             "class A {",
             "  var foo;",
             "}",
             ""));
     appSource.setContent(
         "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
             "  }",
             "}",
             ""));
     compile();
     assertErrors(errors);
     // Declare top-level "foo", but it is ignored.
     {
       appSource.setContent(
           "A.dart",
           makeCode(
               "// filler filler filler filler filler filler filler filler filler filler filler",
-              "part of application;",
               "var foo;",
               ""));
       compile();
       // B should be compiled because it also declares "foo", so produces "shadow" conflict.
       // C should not be compiled because it has qualified access to "foo".
       didWrite("A.dart", EXTENSION_TIMESTAMP);
       didWrite("B.dart", EXTENSION_TIMESTAMP);
       didNotWrite("C.dart", EXTENSION_TIMESTAMP);
       assertAppBuilt();
     }
   }
 
   public void test_declareTopLevel_conflictWithLocalVariable() {
     appSource.setContent(
         "B.dart",
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
-            "part of application;",
             "methodB() {",
             "  var symbolDependency_foo;",
             "}"));
     compile();
     assertErrors(errors);
     // Update units and compile.
     appSource.setContent(
         "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.
     // So, B should be compiled.
     didWrite("B.dart", EXTENSION_TIMESTAMP);
     // But application should be build.
     assertAppBuilt();
   }
 
   public void test_undeclareTopLevel_conflictWithLocalVariable() {
     appSource.setContent(
         "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", "part of application;");
+    appSource.setContent("A.dart", "");
     compile();
     // Top-level declaration in A was removed, so no conflict.
     // So:
     // ... B should be recompiled.
     didWrite("B.dart", EXTENSION_TIMESTAMP);
     // ... but application should be rebuild.
     assertAppBuilt();
   }
 
   /**
    * Removes A, so changes set of top level units and forces compilation.
    */
   public void test_removeOneSource() {
     appSource.setContent(
         "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();
     // Exclude A and compile.
     appSource.setContent(
         APP,
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
             "library app;",
             "part 'B.dart';",
             ""));
     compile();
     // Now there is top-level declarations conflict between A and B.
     // So:
     // ... B should be recompiled.
     didWrite("B.dart", EXTENSION_TIMESTAMP);
     // ... but application should be rebuild.
     didWrite(APP, EXTENSION_DEPS);
   }
 
   public void test_declareField_conflictWithLocalVariable() {
     appSource.setContent(
         "A.dart",
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
-            "part of application;",
             "class A {",
             "}",
             ""));
     appSource.setContent(
         "B.dart",
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
-            "part of application;",
             "class B extends A {",
             "  foo() {",
             "    var bar;",
             "  }",
             "}",
             ""));
     compile();
     assertErrors(errors);
     // Update units and compile.
     appSource.setContent(
         "A.dart",
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
-            "part of application;",
             "class A {",
             "  var bar;",
             "}",
             ""));
     compile();
     // B depends on A class, so compiled.
     didWrite("B.dart", EXTENSION_TIMESTAMP);
     assertAppBuilt();
   }
 
   public void test_declareTopLevelVariable_conflictOtherTopLevelVariable() {
     appSource.setContent(
         "A.dart",
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
-            "part of application;",
             "var conflict;",
             ""));
     compile();
     assertErrors(errors);
     // Update units and compile.
     appSource.setContent(
         "B.dart",
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
-            "part of application;",
             "var conflict;",
             ""));
     compile();
     // A symbols intersect with new B symbols, so we compile A too.
     // Both A and B have errors.
     assertErrors(
         errors,
-        errEx("A.dart", ResolverErrorCode.DUPLICATE_TOP_LEVEL_DECLARATION, 3, 5, 8),
-        errEx("B.dart", ResolverErrorCode.DUPLICATE_TOP_LEVEL_DECLARATION, 3, 5, 8));
+        errEx("A.dart", ResolverErrorCode.DUPLICATE_TOP_LEVEL_DECLARATION, 2, 5, 8),
+        errEx("B.dart", ResolverErrorCode.DUPLICATE_TOP_LEVEL_DECLARATION, 2, 5, 8));
   }
 
   /**
    * Test that invalid "import" is reported as any other error between "unitAboutToCompile" and
    * "unitCompiled".
    */
   public void test_reportMissingImport() throws Exception {
     appSource.setContent(
         APP,
         makeCode(
@@ skipping 259 matching lines @@
   }
   /**
    * <p>
    * http://code.google.com/p/dart/issues/detail?id=3532
    */
   public void test_includeSameUnitTwice() throws Exception {
     appSource.setContent(
         "A.dart",
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
-            "part of application;",
             ""));
     appSource.setContent(
         APP,
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
             "library application;",
             "part 'A.dart';",
             "part 'A.dart';",
             ""));
     // do compile, no errors expected
@@ skipping 661 matching lines @@
             "library application;",
             "import 'A.dart' as mylib;",
             "final A = mylib.B;",
             ""));
     // do compile, no errors expected
     compile();
     assertErrors(errors);
   }
 
   /**
-   * 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_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.
    */
   public void test_useNative_withDartExt_new() throws Exception {
     appSource.setContent(
         APP,
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
             "library A;",
             "import 'dart-ext:test_extension';",
             "class A {",
             "  static int ifNull(a, b) native 'TestExtension_IfNull';",
             "}",
             ""));
     // do compile, no errors expected
     compile();
     assertErrors(errors);
   }
-
+  
   /**
    * Internals of Dart use "dart-ext:" import scheme, and these libraries are allowed to use
    * "native". Obsolete import syntax.
    */
   public void test_useNative_withDartExt_obsolete() throws Exception {
     appSource.setContent(
         APP,
         makeCode(
             "// filler filler filler filler filler filler filler filler filler filler filler",
             "#library('A');",
@@ skipping 65 matching lines @@
   private void didWrite(String sourceName, String extension) {
     String spec = sourceName + "/" + extension;
     assertTrue("Expected write: " + spec, provider.writes.contains(spec));
   }
 
   private void didNotWrite(String sourceName, String extension) {
     String spec = sourceName + "/" + extension;
     assertFalse("Didn't expect write: " + spec, provider.writes.contains(spec));
   }
 }