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

dart/editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/ScanTaskTest.java

 /*
  * Copyright (c) 2012, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
 package com.google.dart.tools.core.analysis;
 
+import com.google.common.collect.Lists;
+import com.google.dart.compiler.PackageLibraryManager;
+import com.google.dart.engine.utilities.io.PrintStringWriter;
+import com.google.dart.tools.core.analysis.ScanTask.DartFileType;
+import com.google.dart.tools.core.internal.model.PackageLibraryManagerProvider;
+
 import static com.google.dart.tools.core.analysis.AnalysisTestUtilities.assertCachedLibraries;
 import static com.google.dart.tools.core.analysis.AnalysisTestUtilities.assertPackageContexts;
 import static com.google.dart.tools.core.analysis.AnalysisTestUtilities.assertTrackedLibraryFiles;
 import static com.google.dart.tools.core.analysis.ScanTask.DartFileType.Library;
 import static com.google.dart.tools.core.analysis.ScanTask.DartFileType.PartOf;
 import static com.google.dart.tools.core.analysis.ScanTask.DartFileType.Unknown;
 
-import com.google.common.collect.Lists;
-import com.google.dart.compiler.PackageLibraryManager;
-import com.google.dart.engine.utilities.io.PrintStringWriter;
-import com.google.dart.tools.core.analysis.ScanTask.DartFileType;
-import com.google.dart.tools.core.internal.model.PackageLibraryManagerProvider;
-
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
 public class ScanTaskTest extends AbstractDartAnalysisTest {
 
   private static final byte[] BUFFER = new byte[1024];
 
   /**
    * Called once prior to executing the first test in this class
    */
   public static void setUpOnce() throws Exception {
     setUpBankExample();
   }
 
   /**
    * Called once after executing the last test in this class
    */
   public static void tearDownOnce() {
     tearDownBankExample();
   }
 
   private AnalysisServerAdapter server;
   private Listener listener;
 
-  /**
-   * TODO(scheglov) disabled because now 'part of' directive required
-   */
-  public void _test_scan_source() throws Exception {
-    assertTrackedLibraryFiles(server);
-    server.scan(simpleMoneySrcFile, null);
-    server.start();
-    listener.waitForIdle(1, FIVE_MINUTES_MS);
-    assertTrackedLibraryFiles(server, simpleMoneySrcFile);
-    server.assertAnalyzeContext(true);
-  }
-
-  /**
-   * TODO(scheglov) disabled because now 'part of' directive required
-   */
-  public void _test_scan_sourceThenLibrary() throws Exception {
-    _test_scan_source();
-    server.resetAnalyzeContext();
-    server.scan(moneyLibFile, null);
-    listener.waitForIdle(2, FIVE_MINUTES_MS);
-    assertTrackedLibraryFiles(server, moneyLibFile);
-    server.assertAnalyzeContext(true);
-  }
-
   public void test_packages_preference() throws Exception {
     PackageLibraryManager libMgr = PackageLibraryManagerProvider.getAnyLibraryManager();
     assertTrackedLibraryFiles(server);
     server.assertAnalyzeContext(false);
 
     List<File> packageRoots = Lists.newArrayList(packagesDir);
     libMgr.setPackageRoots(packageRoots);
     try {
       server.scan(bankDir, null);
       server.start();
@@ skipping 53 matching lines @@
 
   public void test_scan_libraryThenSource() throws Exception {
     test_scan_library();
     server.resetAnalyzeContext();
     server.scan(simpleMoneySrcFile, null);
     listener.waitForIdle(2, FIVE_MINUTES_MS);
     assertTrackedLibraryFiles(server, moneyLibFile);
     server.assertAnalyzeContext(false);
   }
 
+  public void test_scan_source() throws Exception {
+    assertTrackedLibraryFiles(server);
+    server.scan(simpleMoneySrcFile, null);
+    server.start();
+    listener.waitForIdle(1, FIVE_MINUTES_MS);
+    assertTrackedLibraryFiles(server, simpleMoneySrcFile);
+    server.assertAnalyzeContext(true);
+  }
+
+  public void test_scan_sourceThenLibrary() throws Exception {
+    test_scan_source();
+    server.resetAnalyzeContext();
+    server.scan(moneyLibFile, null);
+    listener.waitForIdle(2, FIVE_MINUTES_MS);
+    assertTrackedLibraryFiles(server, moneyLibFile);
+    server.assertAnalyzeContext(true);
+  }
+
   public void test_scanContent_import() throws Exception {
     PrintStringWriter writer = new PrintStringWriter();
     writer.println("import 'foo';");
     writer.println("main() { }");
     assertScanContent(writer.toString(), Library);
   }
 
   public void test_scanContent_library() throws Exception {
     PrintStringWriter writer = new PrintStringWriter();
     writer.println("library 'foo';");
@@ skipping 76 matching lines @@
   @Override
   protected void tearDown() throws Exception {
     server.stop();
   }
 
   private void assertScanContent(String content, DartFileType expected) throws IOException {
     DartFileType actual = ScanTask.scanContent(new ByteArrayInputStream(content.getBytes()), BUFFER);
     assertEquals(expected, actual);
   }
 }