Chromium Code Reviews| Index: pkg/analyzer/test/src/task/dart_test.dart |
| diff --git a/pkg/analyzer/test/src/task/dart_test.dart b/pkg/analyzer/test/src/task/dart_test.dart |
| index 6b04cca579ba166ee7e502398a1e28f5aca26329..dd9836cc0a60075391c0b43205ee80a99a93fa2c 100644 |
| --- a/pkg/analyzer/test/src/task/dart_test.dart |
| +++ b/pkg/analyzer/test/src/task/dart_test.dart |
| @@ -6,6 +6,8 @@ library test.src.task.dart_test; |
| import 'package:analyzer/file_system/file_system.dart'; |
| import 'package:analyzer/file_system/memory_file_system.dart'; |
| +import 'package:analyzer/plugin/plugin.dart'; |
| +import 'package:analyzer/plugin/task.dart'; |
| import 'package:analyzer/src/context/cache.dart'; |
| import 'package:analyzer/src/generated/ast.dart'; |
| import 'package:analyzer/src/generated/element.dart'; |
| @@ -15,9 +17,10 @@ import 'package:analyzer/src/generated/error.dart'; |
| import 'package:analyzer/src/generated/resolver.dart'; |
| import 'package:analyzer/src/generated/sdk.dart'; |
| import 'package:analyzer/src/generated/source.dart'; |
| +import 'package:analyzer/src/plugin/engine_plugin.dart'; |
| +import 'package:analyzer/src/plugin/plugin_impl.dart'; |
| import 'package:analyzer/src/task/dart.dart'; |
| import 'package:analyzer/src/task/driver.dart'; |
| -import 'package:analyzer/src/task/general.dart'; |
| import 'package:analyzer/src/task/manager.dart'; |
| import 'package:analyzer/task/dart.dart'; |
| import 'package:analyzer/task/general.dart'; |
| @@ -163,7 +166,8 @@ class C = B with M; |
| @reflectiveTest |
| class BuildCompilationUnitElementTaskTest extends _AbstractDartTaskTest { |
| test_buildInputs() { |
| - LibrarySpecificUnit target = new LibrarySpecificUnit(emptySource, emptySource); |
| + LibrarySpecificUnit target = |
| + new LibrarySpecificUnit(emptySource, emptySource); |
| Map<String, TaskInput> inputs = |
| BuildCompilationUnitElementTask.buildInputs(target); |
| expect(inputs, isNotNull); |
| @@ -1833,6 +1837,8 @@ class _AbstractDartTaskTest extends EngineTestCase { |
| _MockContext context = new _MockContext(); |
| Map<AnalysisTarget, CacheEntry> entryMap = <AnalysisTarget, CacheEntry>{}; |
| + ExtensionManager extensionManager = new ExtensionManager(); |
| + |
| TaskManager taskManager = new TaskManager(); |
| AnalysisDriver analysisDriver; |
| @@ -1851,29 +1857,15 @@ class _AbstractDartTaskTest extends EngineTestCase { |
| new DartUriResolver(sdk), |
| new ResourceUriResolver(resourceProvider) |
| ]); |
| + // prepare ExtensionManager |
| + extensionManager.processPlugins([new EnginePlugin()]); |
| // prepare TaskManager |
| - taskManager.addTaskDescriptor(GetContentTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(ScanDartTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(ParseDartTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(BuildClassConstructorsTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(BuildCompilationUnitElementTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(BuildLibraryConstructorsTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(BuildLibraryElementTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(BuildPublicNamespaceTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(BuildDirectiveElementsTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(BuildSourceClosuresTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(BuildExportNamespaceTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(BuildEnumMemberElementsTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(BuildFunctionTypeAliasesTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(BuildTypeProviderTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(GatherUsedImportedElementsTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(GatherUsedLocalElementsTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(GenerateHintsTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(ResolveUnitTypeNamesTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(ResolveLibraryTypeNamesTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(ResolveReferencesTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(ResolveVariableReferencesTask.DESCRIPTOR); |
| - taskManager.addTaskDescriptor(VerifyUnitTask.DESCRIPTOR); |
| + { |
| + ExtensionPoint taskExtension = |
| + extensionManager.extensionPoints[TASK_EXTENSION_POINT_ID]; |
| + List<TaskDescriptor> taskDescriptors = taskExtension.extensions; |
| + taskDescriptors.forEach(taskManager.addTaskDescriptor); |
|
Brian Wilkerson
2015/04/19 17:35:48
or
EnginePlugin plugin = new EnginePlugin();
exte
scheglov
2015/04/19 20:15:22
I don't see addTaskDescriptors() method in TaskMan
Brian Wilkerson
2015/04/19 20:21:15
Yes, sorry, I forgot that it wasn't committed yet.
|
| + } |
| // prepare AnalysisDriver |
| analysisDriver = new AnalysisDriver(taskManager, context); |
| } |