| Index: editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/internal/model/SystemLibraryManagerProviderTest.java
|
| ===================================================================
|
| --- editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/internal/model/SystemLibraryManagerProviderTest.java (revision 7713)
|
| +++ editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/internal/model/SystemLibraryManagerProviderTest.java (working copy)
|
| @@ -85,7 +85,7 @@
|
| public void test_SystemLibraryManagerProvider_translateDoesNotExist() throws Exception {
|
| URI fullUri = new URI("dart://doesnotexist/some/file.dart");
|
| try {
|
| - URI translatedURI = getLibraryManager().translateDartUri(fullUri);
|
| + URI translatedURI = getLibraryManager().resolveDartUri(fullUri);
|
| fail("Expected translate " + fullUri + " to fail, but returned " + translatedURI);
|
| } catch (RuntimeException e) {
|
| String message = e.getMessage();
|
| @@ -110,7 +110,7 @@
|
| URI shortUri2 = getLibraryManager().getShortUri(fullUri1);
|
| assertEquals(shortUri, shortUri2);
|
|
|
| - URI translatedUri1 = getLibraryManager().translateDartUri(fullUri1);
|
| + URI translatedUri1 = getLibraryManager().resolveDartUri(fullUri1);
|
| assertNotNull(translatedUri1);
|
| String scheme = translatedUri1.getScheme();
|
| assertTrue(scheme.equals("file"));
|
| @@ -130,4 +130,28 @@
|
| URI fullUri5 = getLibraryManager().getRelativeUri(translatedUri3);
|
| assertEquals(fullUri1.resolve("somedir/somefile.dart"), fullUri5);
|
| }
|
| +
|
| + protected void testPackage(String libFileName, String uriString)
|
| + throws AssertionError, URISyntaxException {
|
| +
|
| + File packageRoot = SystemLibraryManagerProvider.getAnyLibraryManager().getPackageRoot();
|
| + SystemLibraryManagerProvider.getAnyLibraryManager()
|
| + .setPackageRoot(new File(System.getProperty("user.home")));
|
| +
|
| + final URI fullUri1 = getLibraryManager().expandRelativeDartUri(new URI(uriString));
|
| + assertNotNull(fullUri1);
|
| + assertEquals("package", fullUri1.getScheme());
|
| + assertTrue(fullUri1.getPath(), (fullUri1.getHost() + fullUri1.getPath()).endsWith(libFileName));
|
| +
|
| + URI translatedUri = getLibraryManager().resolveDartUri(fullUri1);
|
| + assertNotNull(translatedUri);
|
| + String scheme = translatedUri.getScheme();
|
| + assertTrue(scheme.equals("file"));
|
| + assertTrue(translatedUri.getPath().endsWith("/" + libFileName));
|
| + URI shortUri3 = getLibraryManager().getShortUri(translatedUri);
|
| + assertEquals(new URI(uriString), shortUri3);
|
| +
|
| + SystemLibraryManagerProvider.getAnyLibraryManager().setPackageRoot(packageRoot);
|
| +
|
| + }
|
| }
|
|
|