Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1257)

Unified Diff: pkg/analyzer/test/source/package_map_provider_test.dart

Issue 2398113002: Fix more tests on windows bots (Closed)
Patch Set: Created 4 years, 2 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/source/package_map_provider_test.dart
diff --git a/pkg/analyzer/test/source/package_map_provider_test.dart b/pkg/analyzer/test/source/package_map_provider_test.dart
index 23b8511fc510241c39106b4669bfcc6f9a5a6664..857e09baef133d9f8316625a212549907e4d850a 100644
--- a/pkg/analyzer/test/source/package_map_provider_test.dart
+++ b/pkg/analyzer/test/source/package_map_provider_test.dart
@@ -22,11 +22,10 @@ main() {
@reflectiveTest
class PubPackageMapProviderTest {
- static const String projectPath = '/path/to/project';
-
DartSdk sdk;
MemoryResourceProvider resourceProvider;
PubPackageMapProvider packageMapProvider;
+ String projectPath;
Folder projectFolder;
PackageMapInfo parsePackageMap(Map obj) {
@@ -38,6 +37,7 @@ class PubPackageMapProviderTest {
sdk = new FolderBasedDartSdk(resourceProvider,
FolderBasedDartSdk.defaultSdkDirectory(resourceProvider));
packageMapProvider = new PubPackageMapProvider(resourceProvider, sdk);
+ projectPath = resourceProvider.convertPath('/path/to/project');
projectFolder = resourceProvider.newFolder(projectPath);
}
@@ -48,12 +48,15 @@ class PubPackageMapProviderTest {
});
PackageMapInfo info = packageMapProvider.computePackageMap(projectFolder);
expect(info.packageMap, isNull);
- expect(info.dependencies, unorderedEquals(['$projectPath/pubspec.lock']));
+ expect(
+ info.dependencies,
+ unorderedEquals(
+ [resourceProvider.pathContext.join(projectPath, 'pubspec.lock')]));
}
void test_parsePackageMap_dontIgnoreNonExistingFolder() {
String packageName = 'foo';
- String folderPath = '/path/to/folder';
+ String folderPath = resourceProvider.convertPath('/path/to/folder');
Map<String, List<Folder>> result = parsePackageMap({
'packages': {packageName: folderPath}
}).packageMap;
@@ -65,8 +68,10 @@ class PubPackageMapProviderTest {
}
void test_parsePackageMap_handleDependencies() {
- String path1 = '/path/to/folder1/pubspec.lock';
- String path2 = '/path/to/folder2/pubspec.lock';
+ String path1 =
+ resourceProvider.convertPath('/path/to/folder1/pubspec.lock');
+ String path2 =
+ resourceProvider.convertPath('/path/to/folder2/pubspec.lock');
resourceProvider.newFile(path1, '...');
resourceProvider.newFile(path2, '...');
Set<String> dependencies = parsePackageMap({
@@ -80,7 +85,7 @@ class PubPackageMapProviderTest {
void test_parsePackageMap_normalFolder() {
String packageName = 'foo';
- String folderPath = '/path/to/folder';
+ String folderPath = resourceProvider.convertPath('/path/to/folder');
resourceProvider.newFolder(folderPath);
Map<String, List<Folder>> result = parsePackageMap({
'packages': {packageName: folderPath}
@@ -94,8 +99,8 @@ class PubPackageMapProviderTest {
void test_parsePackageMap_packageMapsToList() {
String packageName = 'foo';
- String folderPath1 = '/path/to/folder1';
- String folderPath2 = '/path/to/folder2';
+ String folderPath1 = resourceProvider.convertPath('/path/to/folder1');
+ String folderPath2 = resourceProvider.convertPath('/path/to/folder2');
resourceProvider.newFolder(folderPath1);
resourceProvider.newFolder(folderPath2);
Map<String, List<Folder>> result = parsePackageMap({
@@ -113,7 +118,7 @@ class PubPackageMapProviderTest {
}
void test_parsePackageMap_relativePahInPackages() {
- String packagePath = '/path/to/package';
+ String packagePath = resourceProvider.convertPath('/path/to/package');
String relativePackagePath = '../package';
String packageName = 'foo';
resourceProvider.newFolder(projectPath);
@@ -127,7 +132,8 @@ class PubPackageMapProviderTest {
}
void test_parsePackageMap_relativePathInDependencies() {
- String dependencyPath = '/path/to/pubspec.lock';
+ String dependencyPath =
+ resourceProvider.convertPath('/path/to/pubspec.lock');
String relativeDependencyPath = '../pubspec.lock';
resourceProvider.newFolder(projectPath);
resourceProvider.newFile(dependencyPath, 'contents');

Powered by Google App Engine
This is Rietveld 408576698