| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library analyzer.test.source.package_map_resolver_test; | 5 library analyzer.test.source.package_map_resolver_test; |
| 6 | 6 |
| 7 import 'package:analyzer/file_system/file_system.dart'; | 7 import 'package:analyzer/file_system/file_system.dart'; |
| 8 import 'package:analyzer/file_system/memory_file_system.dart'; | 8 import 'package:analyzer/file_system/memory_file_system.dart'; |
| 9 import 'package:analyzer/source/package_map_resolver.dart'; | 9 import 'package:analyzer/source/package_map_resolver.dart'; |
| 10 import 'package:analyzer/src/generated/source.dart'; | 10 import 'package:analyzer/src/generated/source.dart'; |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 }, throws); | 49 }, throws); |
| 50 } | 50 } |
| 51 | 51 |
| 52 void test_new_null_resourceProvider() { | 52 void test_new_null_resourceProvider() { |
| 53 expect(() { | 53 expect(() { |
| 54 new PackageMapUriResolver(null, <String, List<Folder>>{}); | 54 new PackageMapUriResolver(null, <String, List<Folder>>{}); |
| 55 }, throws); | 55 }, throws); |
| 56 } | 56 } |
| 57 | 57 |
| 58 void test_resolve_multiple_folders() { | 58 void test_resolve_multiple_folders() { |
| 59 const pkgFileA = '/part1/lib/libA.dart'; | 59 String pkgFileA = provider.convertPath('/part1/lib/libA.dart'); |
| 60 const pkgFileB = '/part2/lib/libB.dart'; | 60 String pkgFileB = provider.convertPath('/part2/lib/libB.dart'); |
| 61 provider.newFile(pkgFileA, 'library lib_a'); | 61 provider.newFile(pkgFileA, 'library lib_a'); |
| 62 provider.newFile(pkgFileB, 'library lib_b'); | 62 provider.newFile(pkgFileB, 'library lib_b'); |
| 63 PackageMapUriResolver resolver = | 63 PackageMapUriResolver resolver = |
| 64 new PackageMapUriResolver(provider, <String, List<Folder>>{ | 64 new PackageMapUriResolver(provider, <String, List<Folder>>{ |
| 65 'pkg': <Folder>[ | 65 'pkg': <Folder>[ |
| 66 provider.getResource('/part1/lib/'), | 66 provider.getResource(provider.convertPath('/part1/lib/')), |
| 67 provider.getResource('/part2/lib/') | 67 provider.getResource(provider.convertPath('/part2/lib/')) |
| 68 ] | 68 ] |
| 69 }); | 69 }); |
| 70 { | 70 { |
| 71 Uri uri = Uri.parse('package:pkg/libA.dart'); | 71 Uri uri = Uri.parse('package:pkg/libA.dart'); |
| 72 Source result = resolver.resolveAbsolute(uri); | 72 Source result = resolver.resolveAbsolute(uri); |
| 73 expect(result, isNotNull); | 73 expect(result, isNotNull); |
| 74 expect(result.exists(), isTrue); | 74 expect(result.exists(), isTrue); |
| 75 expect(result.uriKind, UriKind.PACKAGE_URI); | 75 expect(result.uriKind, UriKind.PACKAGE_URI); |
| 76 expect(result.fullName, pkgFileA); | 76 expect(result.fullName, pkgFileA); |
| 77 } | 77 } |
| 78 { | 78 { |
| 79 Uri uri = Uri.parse('package:pkg/libB.dart'); | 79 Uri uri = Uri.parse('package:pkg/libB.dart'); |
| 80 Source result = resolver.resolveAbsolute(uri); | 80 Source result = resolver.resolveAbsolute(uri); |
| 81 expect(result, isNotNull); | 81 expect(result, isNotNull); |
| 82 expect(result.exists(), isTrue); | 82 expect(result.exists(), isTrue); |
| 83 expect(result.uriKind, UriKind.PACKAGE_URI); | 83 expect(result.uriKind, UriKind.PACKAGE_URI); |
| 84 expect(result.fullName, pkgFileB); | 84 expect(result.fullName, pkgFileB); |
| 85 } | 85 } |
| 86 } | 86 } |
| 87 | 87 |
| 88 void test_resolve_nonPackage() { | 88 void test_resolve_nonPackage() { |
| 89 UriResolver resolver = new PackageMapUriResolver(provider, EMPTY_MAP); | 89 UriResolver resolver = new PackageMapUriResolver(provider, EMPTY_MAP); |
| 90 Uri uri = Uri.parse('dart:core'); | 90 Uri uri = Uri.parse('dart:core'); |
| 91 Source result = resolver.resolveAbsolute(uri); | 91 Source result = resolver.resolveAbsolute(uri); |
| 92 expect(result, isNull); | 92 expect(result, isNull); |
| 93 } | 93 } |
| 94 | 94 |
| 95 void test_resolve_OK() { | 95 void test_resolve_OK() { |
| 96 const pkgFileA = '/pkgA/lib/libA.dart'; | 96 String pkgFileA = provider.convertPath('/pkgA/lib/libA.dart'); |
| 97 const pkgFileB = '/pkgB/lib/libB.dart'; | 97 String pkgFileB = provider.convertPath('/pkgB/lib/libB.dart'); |
| 98 provider.newFile(pkgFileA, 'library lib_a;'); | 98 provider.newFile(pkgFileA, 'library lib_a;'); |
| 99 provider.newFile(pkgFileB, 'library lib_b;'); | 99 provider.newFile(pkgFileB, 'library lib_b;'); |
| 100 PackageMapUriResolver resolver = | 100 PackageMapUriResolver resolver = |
| 101 new PackageMapUriResolver(provider, <String, List<Folder>>{ | 101 new PackageMapUriResolver(provider, <String, List<Folder>>{ |
| 102 'pkgA': <Folder>[provider.getResource('/pkgA/lib/')], | 102 'pkgA': <Folder>[ |
| 103 'pkgB': <Folder>[provider.getResource('/pkgB/lib/')] | 103 provider.getResource(provider.convertPath('/pkgA/lib/')) |
| 104 ], |
| 105 'pkgB': <Folder>[provider.getResource(provider.convertPath('/pkgB/lib/'))] |
| 104 }); | 106 }); |
| 105 { | 107 { |
| 106 Uri uri = Uri.parse('package:pkgA/libA.dart'); | 108 Uri uri = Uri.parse('package:pkgA/libA.dart'); |
| 107 Source result = resolver.resolveAbsolute(uri); | 109 Source result = resolver.resolveAbsolute(uri); |
| 108 expect(result, isNotNull); | 110 expect(result, isNotNull); |
| 109 expect(result.exists(), isTrue); | 111 expect(result.exists(), isTrue); |
| 110 expect(result.uriKind, UriKind.PACKAGE_URI); | 112 expect(result.uriKind, UriKind.PACKAGE_URI); |
| 111 expect(result.fullName, pkgFileA); | 113 expect(result.fullName, pkgFileA); |
| 112 } | 114 } |
| 113 { | 115 { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 UriResolver resolver = new PackageMapUriResolver(provider, EMPTY_MAP); | 147 UriResolver resolver = new PackageMapUriResolver(provider, EMPTY_MAP); |
| 146 Uri uri = Uri.parse('package:analyzer/analyzer.dart'); | 148 Uri uri = Uri.parse('package:analyzer/analyzer.dart'); |
| 147 Source result = resolver.resolveAbsolute(uri); | 149 Source result = resolver.resolveAbsolute(uri); |
| 148 expect(result, isNotNull); | 150 expect(result, isNotNull); |
| 149 expect(result.exists(), isFalse); | 151 expect(result.exists(), isFalse); |
| 150 expect(result.fullName, 'analyzer.dart'); | 152 expect(result.fullName, 'analyzer.dart'); |
| 151 expect(result.uri.toString(), 'package:analyzer/analyzer.dart'); | 153 expect(result.uri.toString(), 'package:analyzer/analyzer.dart'); |
| 152 } | 154 } |
| 153 | 155 |
| 154 void test_restoreAbsolute() { | 156 void test_restoreAbsolute() { |
| 155 const pkgFileA = '/pkgA/lib/libA.dart'; | 157 String pkgFileA = provider.convertPath('/pkgA/lib/libA.dart'); |
| 156 const pkgFileB = '/pkgB/lib/src/libB.dart'; | 158 String pkgFileB = provider.convertPath('/pkgB/lib/src/libB.dart'); |
| 157 provider.newFile(pkgFileA, 'library lib_a;'); | 159 provider.newFile(pkgFileA, 'library lib_a;'); |
| 158 provider.newFile(pkgFileB, 'library lib_b;'); | 160 provider.newFile(pkgFileB, 'library lib_b;'); |
| 159 PackageMapUriResolver resolver = | 161 PackageMapUriResolver resolver = |
| 160 new PackageMapUriResolver(provider, <String, List<Folder>>{ | 162 new PackageMapUriResolver(provider, <String, List<Folder>>{ |
| 161 'pkgA': <Folder>[provider.getResource('/pkgA/lib/')], | 163 'pkgA': <Folder>[ |
| 162 'pkgB': <Folder>[provider.getResource('/pkgB/lib/')] | 164 provider.getResource(provider.convertPath('/pkgA/lib/')) |
| 165 ], |
| 166 'pkgB': <Folder>[provider.getResource(provider.convertPath('/pkgB/lib/'))] |
| 163 }); | 167 }); |
| 164 { | 168 { |
| 165 Source source = _createFileSource('/pkgA/lib/libA.dart'); | 169 Source source = |
| 170 _createFileSource(provider.convertPath('/pkgA/lib/libA.dart')); |
| 166 Uri uri = resolver.restoreAbsolute(source); | 171 Uri uri = resolver.restoreAbsolute(source); |
| 167 expect(uri, isNotNull); | 172 expect(uri, isNotNull); |
| 168 expect(uri.toString(), 'package:pkgA/libA.dart'); | 173 expect(uri.toString(), 'package:pkgA/libA.dart'); |
| 169 } | 174 } |
| 170 { | 175 { |
| 171 Source source = _createFileSource('/pkgB/lib/src/libB.dart'); | 176 Source source = |
| 177 _createFileSource(provider.convertPath('/pkgB/lib/src/libB.dart')); |
| 172 Uri uri = resolver.restoreAbsolute(source); | 178 Uri uri = resolver.restoreAbsolute(source); |
| 173 expect(uri, isNotNull); | 179 expect(uri, isNotNull); |
| 174 expect(uri.toString(), 'package:pkgB/src/libB.dart'); | 180 expect(uri.toString(), 'package:pkgB/src/libB.dart'); |
| 175 } | 181 } |
| 176 { | 182 { |
| 177 Source source = _createFileSource('/no/such/file'); | 183 Source source = _createFileSource('/no/such/file'); |
| 178 Uri uri = resolver.restoreAbsolute(source); | 184 Uri uri = resolver.restoreAbsolute(source); |
| 179 expect(uri, isNull); | 185 expect(uri, isNull); |
| 180 } | 186 } |
| 181 } | 187 } |
| 182 | 188 |
| 183 void test_restoreAbsolute_ambiguous() { | 189 void test_restoreAbsolute_ambiguous() { |
| 184 const file1 = '/foo1/lib/bar.dart'; | 190 String file1 = provider.convertPath('/foo1/lib/bar.dart'); |
| 185 const file2 = '/foo2/lib/bar.dart'; | 191 String file2 = provider.convertPath('/foo2/lib/bar.dart'); |
| 186 provider.newFile(file1, 'library bar'); | 192 provider.newFile(file1, 'library bar'); |
| 187 provider.newFile(file2, 'library bar'); | 193 provider.newFile(file2, 'library bar'); |
| 188 PackageMapUriResolver resolver = | 194 PackageMapUriResolver resolver = |
| 189 new PackageMapUriResolver(provider, <String, List<Folder>>{ | 195 new PackageMapUriResolver(provider, <String, List<Folder>>{ |
| 190 'foo': <Folder>[ | 196 'foo': <Folder>[ |
| 191 provider.getResource('/foo1/lib'), | 197 provider.getResource(provider.convertPath('/foo1/lib')), |
| 192 provider.getResource('/foo2/lib') | 198 provider.getResource(provider.convertPath('/foo2/lib')) |
| 193 ] | 199 ] |
| 194 }); | 200 }); |
| 195 // Restoring file1 should yield a package URI, and that package URI should | 201 // Restoring file1 should yield a package URI, and that package URI should |
| 196 // resolve back to file1. | 202 // resolve back to file1. |
| 197 Source source1 = _createFileSource(file1); | 203 Source source1 = _createFileSource(file1); |
| 198 Uri uri1 = resolver.restoreAbsolute(source1); | 204 Uri uri1 = resolver.restoreAbsolute(source1); |
| 199 expect(uri1.toString(), 'package:foo/bar.dart'); | 205 expect(uri1.toString(), 'package:foo/bar.dart'); |
| 200 expect(resolver.resolveAbsolute(uri1).fullName, file1); | 206 expect(resolver.resolveAbsolute(uri1).fullName, file1); |
| 201 // Restoring file2 should not yield a package URI, because there is no URI | 207 // Restoring file2 should not yield a package URI, because there is no URI |
| 202 // that resolves to file2. | 208 // that resolves to file2. |
| 203 Source source2 = _createFileSource(file2); | 209 Source source2 = _createFileSource(file2); |
| 204 expect(resolver.restoreAbsolute(source2), isNull); | 210 expect(resolver.restoreAbsolute(source2), isNull); |
| 205 } | 211 } |
| 206 | 212 |
| 207 void test_restoreAbsolute_longestMatch() { | 213 void test_restoreAbsolute_longestMatch() { |
| 208 const file1 = '/foo1/bar1/lib.dart'; | 214 String file1 = provider.convertPath('/foo1/bar1/lib.dart'); |
| 209 const file2 = '/foo2/bar2/lib.dart'; | 215 String file2 = provider.convertPath('/foo2/bar2/lib.dart'); |
| 210 provider.newFile(file1, 'library lib'); | 216 provider.newFile(file1, 'library lib'); |
| 211 provider.newFile(file2, 'library lib'); | 217 provider.newFile(file2, 'library lib'); |
| 212 PackageMapUriResolver resolver = | 218 PackageMapUriResolver resolver = |
| 213 new PackageMapUriResolver(provider, <String, List<Folder>>{ | 219 new PackageMapUriResolver(provider, <String, List<Folder>>{ |
| 214 'pkg1': <Folder>[ | 220 'pkg1': <Folder>[ |
| 215 provider.getResource('/foo1'), | 221 provider.getResource(provider.convertPath('/foo1')), |
| 216 provider.getResource('/foo2/bar2') | 222 provider.getResource(provider.convertPath('/foo2/bar2')) |
| 217 ], | 223 ], |
| 218 'pkg2': <Folder>[ | 224 'pkg2': <Folder>[ |
| 219 provider.getResource('/foo1/bar1'), | 225 provider.getResource(provider.convertPath('/foo1/bar1')), |
| 220 provider.getResource('/foo2') | 226 provider.getResource(provider.convertPath('/foo2')) |
| 221 ] | 227 ] |
| 222 }); | 228 }); |
| 223 // Restoring file1 should yield a package URI for pkg2, since pkg2's match | 229 // Restoring file1 should yield a package URI for pkg2, since pkg2's match |
| 224 // for the file path (/foo1/bar1) is longer than pkg1's match (/foo1). | 230 // for the file path (/foo1/bar1) is longer than pkg1's match (/foo1). |
| 225 Source source1 = _createFileSource(file1); | 231 Source source1 = _createFileSource(file1); |
| 226 Uri uri1 = resolver.restoreAbsolute(source1); | 232 Uri uri1 = resolver.restoreAbsolute(source1); |
| 227 expect(uri1.toString(), 'package:pkg2/lib.dart'); | 233 expect(uri1.toString(), 'package:pkg2/lib.dart'); |
| 228 // Restoring file2 should yield a package URI for pkg1, since pkg1's match | 234 // Restoring file2 should yield a package URI for pkg1, since pkg1's match |
| 229 // for the file path (/foo2/bar2) is longer than pkg2's match (/foo2). | 235 // for the file path (/foo2/bar2) is longer than pkg2's match (/foo2). |
| 230 Source source2 = _createFileSource(file2); | 236 Source source2 = _createFileSource(file2); |
| 231 Uri uri2 = resolver.restoreAbsolute(source2); | 237 Uri uri2 = resolver.restoreAbsolute(source2); |
| 232 expect(uri2.toString(), 'package:pkg1/lib.dart'); | 238 expect(uri2.toString(), 'package:pkg1/lib.dart'); |
| 233 } | 239 } |
| 234 | 240 |
| 235 Source _createFileSource(String path) { | 241 Source _createFileSource(String path) { |
| 236 return new NonExistingSource(path, toUri(path), UriKind.FILE_URI); | 242 return new NonExistingSource(path, toUri(path), UriKind.FILE_URI); |
| 237 } | 243 } |
| 238 } | 244 } |
| OLD | NEW |