| Index: pkg/analyzer/test/source/embedder_test.dart
|
| diff --git a/pkg/analyzer/test/source/embedder_test.dart b/pkg/analyzer/test/source/embedder_test.dart
|
| index dc9ca1e40581a13199c11053896e39f8da4d0841..fbbaf51b02cc0717b26e8975b9a180cf2ff8cc6f 100644
|
| --- a/pkg/analyzer/test/source/embedder_test.dart
|
| +++ b/pkg/analyzer/test/source/embedder_test.dart
|
| @@ -26,7 +26,7 @@ main() {
|
| class DartUriResolverTest extends EmbedderRelatedTest {
|
| void test_embedderYaml() {
|
| EmbedderYamlLocator locator = new EmbedderYamlLocator({
|
| - 'fox': [pathTranslator.getResource('/tmp')]
|
| + 'fox': [pathTranslator.getResource(foxLib)]
|
| });
|
| EmbedderSdk sdk = new EmbedderSdk(locator.embedderYamls);
|
| DartUriResolver resolver = new DartUriResolver(sdk);
|
| @@ -38,11 +38,11 @@ class DartUriResolverTest extends EmbedderRelatedTest {
|
| }
|
|
|
| // Check that they map to the correct paths.
|
| - expectResolved('dart:core', '/tmp/core.dart');
|
| - expectResolved('dart:fox', '/tmp/slippy.dart');
|
| - expectResolved('dart:bear', '/tmp/grizzly.dart');
|
| - expectResolved('dart:relative', '/relative.dart');
|
| - expectResolved('dart:deep', '/tmp/deep/directory/file.dart');
|
| + expectResolved('dart:core', '$foxLib/core.dart');
|
| + expectResolved('dart:fox', '$foxLib/slippy.dart');
|
| + expectResolved('dart:bear', '$foxLib/grizzly.dart');
|
| + expectResolved('dart:relative', '$foxPath/relative.dart');
|
| + expectResolved('dart:deep', '$foxLib/deep/directory/file.dart');
|
| }
|
| }
|
|
|
| @@ -50,7 +50,7 @@ class DartUriResolverTest extends EmbedderRelatedTest {
|
| class EmbedderSdkTest extends EmbedderRelatedTest {
|
| void test_creation() {
|
| EmbedderYamlLocator locator = new EmbedderYamlLocator({
|
| - 'fox': [pathTranslator.getResource('/tmp')]
|
| + 'fox': [pathTranslator.getResource(foxLib)]
|
| });
|
| EmbedderSdk sdk = new EmbedderSdk(locator.embedderYamls);
|
|
|
| @@ -59,7 +59,7 @@ class EmbedderSdkTest extends EmbedderRelatedTest {
|
|
|
| void test_fromFileUri() {
|
| EmbedderYamlLocator locator = new EmbedderYamlLocator({
|
| - 'fox': [pathTranslator.getResource('/tmp')]
|
| + 'fox': [pathTranslator.getResource(foxLib)]
|
| });
|
| EmbedderSdk sdk = new EmbedderSdk(locator.embedderYamls);
|
|
|
| @@ -71,26 +71,26 @@ class EmbedderSdkTest extends EmbedderRelatedTest {
|
| expect(source.fullName, posixToOSPath(posixPath));
|
| }
|
|
|
| - expectSource('/tmp/slippy.dart', 'dart:fox');
|
| - expectSource('/tmp/deep/directory/file.dart', 'dart:deep');
|
| - expectSource('/tmp/deep/directory/part.dart', 'dart:deep/part.dart');
|
| + expectSource('$foxLib/slippy.dart', 'dart:fox');
|
| + expectSource('$foxLib/deep/directory/file.dart', 'dart:deep');
|
| + expectSource('$foxLib/deep/directory/part.dart', 'dart:deep/part.dart');
|
| }
|
|
|
| void test_getSdkLibrary() {
|
| EmbedderYamlLocator locator = new EmbedderYamlLocator({
|
| - 'fox': [pathTranslator.getResource('/tmp')]
|
| + 'fox': [pathTranslator.getResource(foxLib)]
|
| });
|
| EmbedderSdk sdk = new EmbedderSdk(locator.embedderYamls);
|
|
|
| SdkLibrary lib = sdk.getSdkLibrary('dart:fox');
|
| expect(lib, isNotNull);
|
| - expect(lib.path, posixToOSPath('/tmp/slippy.dart'));
|
| + expect(lib.path, posixToOSPath('$foxLib/slippy.dart'));
|
| expect(lib.shortName, 'dart:fox');
|
| }
|
|
|
| void test_mapDartUri() {
|
| EmbedderYamlLocator locator = new EmbedderYamlLocator({
|
| - 'fox': [pathTranslator.getResource('/tmp')]
|
| + 'fox': [pathTranslator.getResource(foxLib)]
|
| });
|
| EmbedderSdk sdk = new EmbedderSdk(locator.embedderYamls);
|
|
|
| @@ -101,10 +101,10 @@ class EmbedderSdkTest extends EmbedderRelatedTest {
|
| expect(source.fullName, posixToOSPath(posixPath));
|
| }
|
|
|
| - expectSource('dart:core', '/tmp/core.dart');
|
| - expectSource('dart:fox', '/tmp/slippy.dart');
|
| - expectSource('dart:deep', '/tmp/deep/directory/file.dart');
|
| - expectSource('dart:deep/part.dart', '/tmp/deep/directory/part.dart');
|
| + expectSource('dart:core', '$foxLib/core.dart');
|
| + expectSource('dart:fox', '$foxLib/slippy.dart');
|
| + expectSource('dart:deep', '$foxLib/deep/directory/file.dart');
|
| + expectSource('dart:deep/part.dart', '$foxLib/deep/directory/part.dart');
|
| }
|
| }
|
|
|
| @@ -112,7 +112,7 @@ class EmbedderSdkTest extends EmbedderRelatedTest {
|
| class EmbedderUriResolverTest extends EmbedderRelatedTest {
|
| void test_embedderYaml() {
|
| var locator = new EmbedderYamlLocator({
|
| - 'fox': [pathTranslator.getResource('/tmp')]
|
| + 'fox': [pathTranslator.getResource(foxLib)]
|
| });
|
| var resolver = new EmbedderUriResolver(locator.embedderYamls);
|
|
|
| @@ -125,11 +125,11 @@ class EmbedderUriResolverTest extends EmbedderRelatedTest {
|
| // We have five mappings.
|
| expect(resolver, hasLength(5));
|
| // Check that they map to the correct paths.
|
| - expectResolved('dart:core', '/tmp/core.dart');
|
| - expectResolved('dart:fox', '/tmp/slippy.dart');
|
| - expectResolved('dart:bear', '/tmp/grizzly.dart');
|
| - expectResolved('dart:relative', '/relative.dart');
|
| - expectResolved('dart:deep', '/tmp/deep/directory/file.dart');
|
| + expectResolved('dart:core', '$foxLib/core.dart');
|
| + expectResolved('dart:fox', '$foxLib/slippy.dart');
|
| + expectResolved('dart:bear', '$foxLib/grizzly.dart');
|
| + expectResolved('dart:relative', '$foxPath/relative.dart');
|
| + expectResolved('dart:deep', '$foxLib/deep/directory/file.dart');
|
| }
|
|
|
| void test_nullEmbedderYamls() {
|
| @@ -139,7 +139,7 @@ class EmbedderUriResolverTest extends EmbedderRelatedTest {
|
|
|
| void test_restoreAbsolute() {
|
| var locator = new EmbedderYamlLocator({
|
| - 'fox': [pathTranslator.getResource('/tmp')]
|
| + 'fox': [pathTranslator.getResource(foxLib)]
|
| });
|
| var resolver = new EmbedderUriResolver(locator.embedderYamls);
|
|
|
|
|