| OLD | NEW | 
|    1 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file |    1 // Copyright (c) 2015, 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.analysis_options_provider_test; |    5 library analyzer.test.source.analysis_options_provider_test; | 
|    6  |    6  | 
|    7 import 'dart:core'; |    7 import 'dart:core'; | 
|    8  |    8  | 
|    9 import 'package:analyzer/file_system/file_system.dart'; |    9 import 'package:analyzer/file_system/file_system.dart'; | 
|   10 import 'package:analyzer/file_system/memory_file_system.dart'; |   10 import 'package:analyzer/file_system/memory_file_system.dart'; | 
|   11 import 'package:analyzer/source/analysis_options_provider.dart'; |   11 import 'package:analyzer/source/analysis_options_provider.dart'; | 
|   12 import 'package:analyzer/src/generated/engine.dart'; |   12 import 'package:analyzer/src/generated/engine.dart'; | 
|   13 import 'package:test/test.dart'; |   13 import 'package:test/test.dart'; | 
|   14 import 'package:test_reflective_loader/test_reflective_loader.dart'; |   14 import 'package:test_reflective_loader/test_reflective_loader.dart'; | 
|   15 import 'package:yaml/yaml.dart'; |   15 import 'package:yaml/yaml.dart'; | 
|   16  |   16  | 
|   17 import '../resource_utils.dart'; |   17 import '../resource_utils.dart'; | 
|   18 import '../utils.dart'; |  | 
|   19  |   18  | 
|   20 main() { |   19 main() { | 
|   21   initializeTestEnvironment(); |  | 
|   22   defineReflectiveSuite(() { |   20   defineReflectiveSuite(() { | 
|   23     defineReflectiveTests(AnalysisOptionsProviderOldTest); |   21     defineReflectiveTests(AnalysisOptionsProviderOldTest); | 
|   24     defineReflectiveTests(AnalysisOptionsProviderNewTest); |   22     defineReflectiveTests(AnalysisOptionsProviderNewTest); | 
|   25   }); |   23   }); | 
|   26   group('AnalysisOptionsProvider', () { |   24   group('AnalysisOptionsProvider', () { | 
|   27     void expectMergesTo(String defaults, String overrides, String expected) { |   25     void expectMergesTo(String defaults, String overrides, String expected) { | 
|   28       var optionsProvider = new AnalysisOptionsProvider(); |   26       var optionsProvider = new AnalysisOptionsProvider(); | 
|   29       var defaultOptions = optionsProvider.getOptionsFromString(defaults); |   27       var defaultOptions = optionsProvider.getOptionsFromString(defaults); | 
|   30       var overrideOptions = optionsProvider.getOptionsFromString(overrides); |   28       var overrideOptions = optionsProvider.getOptionsFromString(overrides); | 
|   31       var merged = optionsProvider.merge(defaultOptions, overrideOptions); |   29       var merged = optionsProvider.merge(defaultOptions, overrideOptions); | 
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  218         expect(ignore[1], 'sdk_ext/**'); |  216         expect(ignore[1], 'sdk_ext/**'); | 
|  219       } |  217       } | 
|  220     } |  218     } | 
|  221   } |  219   } | 
|  222  |  220  | 
|  223   Map<String, YamlNode> _getOptions(String posixPath, {bool crawlUp: false}) { |  221   Map<String, YamlNode> _getOptions(String posixPath, {bool crawlUp: false}) { | 
|  224     Resource resource = pathTranslator.getResource(posixPath); |  222     Resource resource = pathTranslator.getResource(posixPath); | 
|  225     return provider.getOptions(resource, crawlUp: crawlUp); |  223     return provider.getOptions(resource, crawlUp: crawlUp); | 
|  226   } |  224   } | 
|  227 } |  225 } | 
| OLD | NEW |