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

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

Issue 1774623006: update tests for execution on windows (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: merge 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
« no previous file with comments | « no previous file | pkg/analyzer/test/source/error_processor_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/test/source/analysis_options_provider_test.dart
diff --git a/pkg/analyzer/test/source/analysis_options_provider_test.dart b/pkg/analyzer/test/source/analysis_options_provider_test.dart
index d71304bd5e2cd697ef6ef9c7f9cae8804c9cf32e..0b00a6d6ae45c797a1edcd38d60d608302de1ee4 100644
--- a/pkg/analyzer/test/source/analysis_options_provider_test.dart
+++ b/pkg/analyzer/test/source/analysis_options_provider_test.dart
@@ -4,16 +4,15 @@
library analyzer.test.source.analysis_options_provider_test;
+import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/file_system/memory_file_system.dart';
import 'package:analyzer/source/analysis_options_provider.dart';
import 'package:unittest/unittest.dart';
import 'package:yaml/yaml.dart';
-import '../utils.dart';
+import '../resource_utils.dart';
main() {
- initializeTestEnvironment();
-
group('AnalysisOptionsProvider', () {
void expectMergesTo(String defaults, String overrides, String expected) {
var optionsProvider = new AnalysisOptionsProvider();
@@ -77,7 +76,7 @@ linter:
test('test_simple', () {
var optionsProvider = new AnalysisOptionsProvider();
Map<String, YamlNode> options =
- optionsProvider.getOptions(resourceProvider.getFolder('/'));
+ optionsProvider.getOptions(pathTranslator.getResource('/'));
expect(options, hasLength(1));
expect(options['analyzer'], isNotNull);
YamlMap analyzer = options['analyzer'];
@@ -91,7 +90,7 @@ linter:
test('test_doesnotexist', () {
var optionsProvider = new AnalysisOptionsProvider();
Map<String, YamlNode> options =
- optionsProvider.getOptions(resourceProvider.getFolder('/empty'));
+ optionsProvider.getOptions(pathTranslator.getResource('/empty'));
expect(options, isEmpty);
});
});
@@ -105,7 +104,7 @@ linter:
test('test_empty', () {
var optionsProvider = new AnalysisOptionsProvider();
Map<String, YamlNode> options =
- optionsProvider.getOptions(resourceProvider.getFolder('/'));
+ optionsProvider.getOptions(pathTranslator.getResource('/'));
expect(options, isNotNull);
});
});
@@ -121,7 +120,7 @@ linter:
bool exceptionCaught = false;
try {
Map<String, YamlNode> options =
- optionsProvider.getOptions(resourceProvider.getFolder('/'));
+ optionsProvider.getOptions(pathTranslator.getResource('/'));
expect(options, isNotNull);
} catch (e) {
exceptionCaught = true;
@@ -156,19 +155,22 @@ analyzer:
});
}
-MemoryResourceProvider resourceProvider;
+ResourceProvider resourceProvider;
+TestPathTranslator pathTranslator;
buildResourceProvider(
{bool emptyAnalysisOptions: false, bool badAnalysisOptions: false}) {
- resourceProvider = new MemoryResourceProvider();
- resourceProvider.newFolder('/empty');
- resourceProvider.newFolder('/tmp');
+ var rawProvider = new MemoryResourceProvider(isWindows: isWindows);
+ resourceProvider = new TestResourceProvider(rawProvider);
+ pathTranslator = new TestPathTranslator(rawProvider)
+ ..newFolder('/empty')
+ ..newFolder('/tmp');
if (badAnalysisOptions) {
- resourceProvider.newFile('/.analysis_options', r''':''');
+ pathTranslator.newFile('/.analysis_options', r''':''');
} else if (emptyAnalysisOptions) {
- resourceProvider.newFile('/.analysis_options', r'''#empty''');
+ pathTranslator.newFile('/.analysis_options', r'''#empty''');
} else {
- resourceProvider.newFile(
+ pathTranslator.newFile(
'/.analysis_options',
r'''
analyzer:
@@ -182,7 +184,3 @@ analyzer:
clearResourceProvider() {
resourceProvider = null;
}
-
-emptyResourceProvider() {
- resourceProvider = new MemoryResourceProvider();
-}
« no previous file with comments | « no previous file | pkg/analyzer/test/source/error_processor_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698