pkg/analyzer/test/generated/all_the_rest_test.dart - Issue 1831133005: Consolidate duplicate code for resloving URIs.

Unified Diff: pkg/analyzer/test/generated/all_the_rest_test.dart

Issue 1831133005: Consolidate duplicate code for resloving URIs. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master

Patch Set: Sort Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: pkg/analyzer/test/generated/all_the_rest_test.dart

diff --git a/pkg/analyzer/test/generated/all_the_rest_test.dart b/pkg/analyzer/test/generated/all_the_rest_test.dart

index 8476223be7c4dbf80c431f64059162b5e34a0f60..71b06b4c897357fbbf76abdb8ceb425fe40d0c1c 100644

--- a/pkg/analyzer/test/generated/all_the_rest_test.dart

+++ b/pkg/analyzer/test/generated/all_the_rest_test.dart

@@ -4060,7 +4060,8 @@ class FileBasedSourceTest {

FileBasedSource source =

new FileBasedSource(file, parseUriWithException("dart:test"));

expect(source, isNotNull);

scheglov 2016/03/25 14:02:44 Do we need to use Source here at all? Maybe we cou

Paul Berry 2016/03/25 17:37:53 Done.

- Uri relative = source.resolveRelativeUri(parseUriWithException("lib.dart"));

+ Uri relative =

+ resolveRelativeUri(source.uri, parseUriWithException("lib.dart"));

scheglov 2016/03/25 14:02:44 Maybe this should be moved to a separate test, bec

Paul Berry 2016/03/25 17:37:53 Done.

expect(relative, isNotNull);

expect(relative.toString(), "dart:test/lib.dart");

}

@@ -4071,7 +4072,7 @@ class FileBasedSourceTest {

new FileBasedSource(file, parseUriWithException("dart:test"));

expect(source, isNotNull);

Uri relative =

- source.resolveRelativeUri(parseUriWithException("c/lib.dart"));

+ resolveRelativeUri(source.uri, parseUriWithException("c/lib.dart"));

expect(relative, isNotNull);

expect(relative.toString(), "dart:test/c/lib.dart");

}

@@ -4082,7 +4083,7 @@ class FileBasedSourceTest {

file, parseUriWithException("dart:test/b/test.dart"));

expect(source, isNotNull);

Uri relative =

- source.resolveRelativeUri(parseUriWithException("../c/lib.dart"));

+ resolveRelativeUri(source.uri, parseUriWithException("../c/lib.dart"));

expect(relative, isNotNull);

expect(relative.toString(), "dart:test/c/lib.dart");

}

@@ -4097,7 +4098,8 @@ class FileBasedSourceTest {

JavaFile file = FileUtilities2.createFile("/a/b/test.dart");

FileBasedSource source = new FileBasedSource(file);

expect(source, isNotNull);

- Uri relative = source.resolveRelativeUri(parseUriWithException("lib.dart"));

+ Uri relative =

+ resolveRelativeUri(source.uri, parseUriWithException("lib.dart"));

expect(relative, isNotNull);

expect(relative.toString(), "file:///a/b/lib.dart");

}

@@ -4113,7 +4115,7 @@ class FileBasedSourceTest {

FileBasedSource source = new FileBasedSource(file);

expect(source, isNotNull);

Uri relative =

- source.resolveRelativeUri(parseUriWithException("c/lib.dart"));

+ resolveRelativeUri(source.uri, parseUriWithException("c/lib.dart"));

expect(relative, isNotNull);

expect(relative.toString(), "file:///a/b/c/lib.dart");

}

@@ -4128,7 +4130,7 @@ class FileBasedSourceTest {

FileBasedSource source = new FileBasedSource(file);

expect(source, isNotNull);

Uri relative =

- source.resolveRelativeUri(parseUriWithException("../c/lib.dart"));

+ resolveRelativeUri(source.uri, parseUriWithException("../c/lib.dart"));

expect(relative, isNotNull);

expect(relative.toString(), "file:///a/c/lib.dart");

}

@@ -4138,7 +4140,8 @@ class FileBasedSourceTest {

FileBasedSource source =

new FileBasedSource(file, parseUriWithException("package:b/test.dart"));

expect(source, isNotNull);

- Uri relative = source.resolveRelativeUri(parseUriWithException("lib.dart"));

+ Uri relative =

+ resolveRelativeUri(source.uri, parseUriWithException("lib.dart"));

expect(relative, isNotNull);

expect(relative.toString(), "package:b/lib.dart");

}

@@ -4148,7 +4151,8 @@ class FileBasedSourceTest {

FileBasedSource source =

new FileBasedSource(file, parseUriWithException("package:test.dart"));

expect(source, isNotNull);

- Uri relative = source.resolveRelativeUri(parseUriWithException("lib.dart"));

+ Uri relative =

+ resolveRelativeUri(source.uri, parseUriWithException("lib.dart"));

expect(relative, isNotNull);

expect(relative.toString(), "package:lib.dart");

}

@@ -4159,7 +4163,7 @@ class FileBasedSourceTest {

new FileBasedSource(file, parseUriWithException("package:b/test.dart"));

expect(source, isNotNull);

Uri relative =

- source.resolveRelativeUri(parseUriWithException("c/lib.dart"));

+ resolveRelativeUri(source.uri, parseUriWithException("c/lib.dart"));

expect(relative, isNotNull);

expect(relative.toString(), "package:b/c/lib.dart");

}

@@ -4170,7 +4174,7 @@ class FileBasedSourceTest {

file, parseUriWithException("package:a/b/test.dart"));

expect(source, isNotNull);

Uri relative =

- source.resolveRelativeUri(parseUriWithException("../c/lib.dart"));

+ resolveRelativeUri(source.uri, parseUriWithException("../c/lib.dart"));

expect(relative, isNotNull);

expect(relative.toString(), "package:a/c/lib.dart");

}

« no previous file with comments | « pkg/analyzer/test/file_system/memory_file_system_test.dart ('k') | pkg/analyzer/test/generated/test_support.dart » ('j') | no next file with comments »