Merge to trunk : fix for breakpoints and package path

dart/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/source/ExplicitPackageUriResolverTest.java

Index: dart/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/source/ExplicitPackageUriResolverTest.java
===================================================================
--- dart/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/source/ExplicitPackageUriResolverTest.java	(revision 31562)
+++ dart/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/source/ExplicitPackageUriResolverTest.java	(working copy)
@@ -1,11 +1,11 @@
 /*
  * 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
@@ -30,15 +30,24 @@
 
 public class ExplicitPackageUriResolverTest extends TestCase {
 
-  static class MockExplicitPackageUriResolver extends ExplicitPackageUriResolver {
+  public static class MockExplicitPackageUriResolver extends ExplicitPackageUriResolver {
+
+    String jsonText = "{\"foo\":\"bar\"}";
+
     public MockExplicitPackageUriResolver(File rootDir) {
       super(null, rootDir);
     }
 
+    public MockExplicitPackageUriResolver(File rootDir, String jsonPackageList) {
+      super(null, rootDir);
+      if (!jsonPackageList.isEmpty()) {
+        jsonText = jsonPackageList;
+        packageMap = calculatePackageMap();
+      }
+    }
+
     @Override
     protected Map<String, List<File>> calculatePackageMap() {
-      final String jsonText = "{\"foo\":\"bar\"}";
-
       try {
         return parsePackageMap(jsonText);
       } catch (JSONException e) {
@@ -82,6 +91,20 @@
     assertNull(result);
   }
 
+  public void test_resolve_resolvePathToPackage() throws Exception {
+    File directory = createFile("/src/foo/bar/baz/lib");
+    String packages = "{\"packages\":{\"unittest\": [\"/dart/unittest/lib\"],"
+        + "\"foo.bar.baz\": [\"/src/foo/bar/baz/lib\",\"/gen/foo/bar/baz\"]}}";
+    ExplicitPackageUriResolver resolver = new MockExplicitPackageUriResolver(directory, packages);
+    String resolvedPath = resolver.resolvePathToPackage(File.separator + "baz" + File.separator
+        + "lib");
+    assertNotNull(resolvedPath);
+    assertEquals("foo.bar.baz", resolvedPath);
+    resolvedPath = resolver.resolvePathToPackage(File.separator + "dart" + File.separator
+        + "mypackage");
+    assertNull(resolvedPath);
+  }
+
   @Override
   protected void tearDown() throws Exception {
     FileUtilities2.deleteTempDir();