Removed fixed dependencies

packages/analyzer/test/src/task/inputs_test.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library test.src.task.inputs_test;
+library analyzer.test.src.task.inputs_test;
 
 import 'package:analyzer/src/task/inputs.dart';
 import 'package:analyzer/src/task/model.dart';
 import 'package:analyzer/task/model.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
 import 'package:unittest/unittest.dart';
 
 import '../../generated/test_support.dart';
-import '../../reflective_tests.dart';
 import '../../utils.dart';
 
 main() {
   initializeTestEnvironment();
-  runReflectiveTests(ConstantTaskInputBuilderTest);
-  runReflectiveTests(ConstantTaskInputTest);
-  runReflectiveTests(ListTaskInputImplTest);
-  runReflectiveTests(ListToListTaskInputTest);
-  runReflectiveTests(ListToListTaskInputBuilderTest);
-  runReflectiveTests(ListToMapTaskInputBuilderTest);
-  runReflectiveTests(ListToMapTaskInputTest);
-  runReflectiveTests(ObjectToListTaskInputBuilderTest);
-  runReflectiveTests(ObjectToListTaskInputTest);
-  runReflectiveTests(SimpleTaskInputTest);
-  runReflectiveTests(SimpleTaskInputBuilderTest);
-  runReflectiveTests(TopLevelTaskInputBuilderTest);
+  defineReflectiveTests(ConstantTaskInputBuilderTest);
+  defineReflectiveTests(ConstantTaskInputTest);
+  defineReflectiveTests(ListTaskInputImplTest);
+  defineReflectiveTests(ListToListTaskInputTest);
+  defineReflectiveTests(ListToListTaskInputBuilderTest);
+  defineReflectiveTests(ListToMapTaskInputBuilderTest);
+  defineReflectiveTests(ListToMapTaskInputTest);
+  defineReflectiveTests(ObjectToListTaskInputBuilderTest);
+  defineReflectiveTests(ObjectToListTaskInputTest);
+  defineReflectiveTests(SimpleTaskInputTest);
+  defineReflectiveTests(SimpleTaskInputBuilderTest);
+  defineReflectiveTests(TopLevelTaskInputBuilderTest);
 }
 
 @reflectiveTest
 class ConstantTaskInputBuilderTest extends EngineTestCase {
   static final int value = 7;
   static final ConstantTaskInput<int> input = new ConstantTaskInput<int>(value);
 
   ConstantTaskInputBuilder builder;
 
   void setUp() {
+    super.setUp();
     builder = new ConstantTaskInputBuilder(input);
   }
 
   test_create() {
     expect(builder, isNotNull);
     expect(builder.input, input);
   }
 
   test_currentResult_afterOneMoveNext() {
     builder.moveNext();
@@ skipping 65 matching lines @@
 
   test_createBuilder() {
     ConstantTaskInput<int> input = new ConstantTaskInput<int>(5);
     expect(input.createBuilder(), new isInstanceOf<ConstantTaskInputBuilder>());
   }
 }
 
 @reflectiveTest
 class ListTaskInputImplTest extends EngineTestCase {
   static final AnalysisTarget target = new TestSource();
-  static final result1 =
+  static final ResultDescriptor<List<AnalysisTarget>> result1 =
       new ResultDescriptorImpl<List<AnalysisTarget>>('result1', null);
   static final result2 = new ResultDescriptorImpl<int>('result2', null);
 
   test_create() {
     var input = new ListTaskInputImpl<AnalysisTarget>(target, result1);
     expect(input, isNotNull);
     expect(input.target, target);
     expect(input.result, result1);
   }
 
   test_createBuilder() {
     var input = new ListTaskInputImpl<AnalysisTarget>(target, result1);
     expect(input.createBuilder(), new isInstanceOf<SimpleTaskInputBuilder>());
   }
 
   test_toList() {
     var input = new ListTaskInputImpl<AnalysisTarget>(target, result1);
-    TaskInput<List> input2 = input.toList((target) => 'name');
+    TaskInput<List> input2 =
+        input.toList((target) => new SimpleTaskInput(target, null));
     expect(input2,
         new isInstanceOf<ListToListTaskInput<AnalysisTarget, String>>());
   }
 
   test_toListOf() {
     var input = new ListTaskInputImpl<AnalysisTarget>(target, result1);
     TaskInput<List> input2 = input.toListOf(result2);
     expect(
         input2, new isInstanceOf<ListToListTaskInput<AnalysisTarget, int>>());
   }
 
   test_toMap() {
     var input = new ListTaskInputImpl<AnalysisTarget>(target, result1);
-    TaskInput<Map> input2 = input.toMap((target) => 'name');
+    TaskInput<Map> input2 =
+        input.toMap((target) => new SimpleTaskInput(target, null));
     expect(
         input2, new isInstanceOf<ListToMapTaskInput<AnalysisTarget, String>>());
   }
 
   test_toMapOf() {
     var input = new ListTaskInputImpl<AnalysisTarget>(target, result1);
     TaskInput<Map> input2 = input.toMapOf(result2);
     expect(input2, new isInstanceOf<ListToMapTaskInput<AnalysisTarget, int>>());
   }
 }
 
 @reflectiveTest
 class ListToListTaskInputBuilderTest extends EngineTestCase {
   static final AnalysisTarget target1 = new TestSource();
-  static final ResultDescriptorImpl result1 =
-      new ResultDescriptorImpl('result1', null);
+  static final ResultDescriptorImpl<List> result1 =
+      new ResultDescriptorImpl<List>('result1', null);
   static final ResultDescriptorImpl result2 =
       new ResultDescriptorImpl('result2', null);
   static final ListToListTaskInput input = new ListToListTaskInput(
       result1.of(target1), (element) => result2.of(element));
 
   test_create() {
     ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
     expect(builder, isNotNull);
     expect(builder.input, input);
   }
@@ skipping 150 matching lines @@
     expect(builder.moveNext(), true);
     builder.currentValue = [];
     expect(builder.moveNext(), false);
     expect(builder.moveNext(), false);
   }
 }
 
 @reflectiveTest
 class ListToListTaskInputTest extends EngineTestCase {
   static final AnalysisTarget target = new TestSource();
-  static final ResultDescriptorImpl result =
-      new ResultDescriptorImpl('result', null);
+  static final ResultDescriptorImpl<List> result =
+      new ResultDescriptorImpl<List>('result', null);
 
   test_create() {
-    SimpleTaskInput baseAccessor = result.of(target);
+    SimpleTaskInput<List> baseAccessor = result.of(target);
     GenerateTaskInputs generate = (object) {};
     ListToListTaskInput input = new ListToListTaskInput(baseAccessor, generate);
     expect(input, isNotNull);
     expect(input.baseAccessor, baseAccessor);
     expect(input.generateTaskInputs, equals(generate));
   }
 
   test_createBuilder() {
-    SimpleTaskInput baseAccessor = result.of(target);
+    SimpleTaskInput<List> baseAccessor = result.of(target);
     GenerateTaskInputs generate = (object) {};
     ListToListTaskInput input = new ListToListTaskInput(baseAccessor, generate);
     expect(input.createBuilder(), isNotNull);
   }
 }
 
 @reflectiveTest
 class ListToMapTaskInputBuilderTest extends EngineTestCase {
   static final AnalysisTarget target1 = new TestSource('target1');
-  static final ResultDescriptorImpl result1 =
-      new ResultDescriptorImpl('result1', null);
+  static final ResultDescriptorImpl<List> result1 =
+      new ResultDescriptorImpl<List>('result1', null);
   static final ResultDescriptorImpl result2 =
       new ResultDescriptorImpl('result2', null);
   static final ListToMapTaskInput input = new ListToMapTaskInput(
       result1.of(target1), (element) => result2.of(element));
 
   test_create() {
     ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
     expect(builder, isNotNull);
     expect(builder.input, input);
   }
@@ skipping 148 matching lines @@
     expect(builder.moveNext(), true);
     builder.currentValue = [];
     expect(builder.moveNext(), false);
     expect(builder.moveNext(), false);
   }
 }
 
 @reflectiveTest
 class ListToMapTaskInputTest extends EngineTestCase {
   static final AnalysisTarget target = new TestSource();
-  static final ResultDescriptorImpl result =
-      new ResultDescriptorImpl('result', null);
+  static final ResultDescriptorImpl<List> result =
+      new ResultDescriptorImpl<List>('result', null);
 
   test_create() {
-    SimpleTaskInput baseAccessor = result.of(target);
+    SimpleTaskInput<List> baseAccessor = result.of(target);
     GenerateTaskInputs generate = (object) {};
     ListToMapTaskInput input = new ListToMapTaskInput(baseAccessor, generate);
     expect(input, isNotNull);
     expect(input.baseAccessor, baseAccessor);
     expect(input.generateTaskInputs, equals(generate));
   }
 
   test_createBuilder() {
-    SimpleTaskInput baseAccessor = result.of(target);
+    SimpleTaskInput<List> baseAccessor = result.of(target);
     GenerateTaskInputs generate = (object) {};
     ListToMapTaskInput input = new ListToMapTaskInput(baseAccessor, generate);
     expect(input.createBuilder(), isNotNull);
   }
 }
 
 @reflectiveTest
-class ObjectToListTaskInputBuilderTest extends EngineTestCase {
+class ObjectToListTaskInputBuilderTest {
   static final AnalysisTarget target = new TestSource();
   static final ResultDescriptorImpl result =
       new ResultDescriptorImpl('result', null);
   static final SimpleTaskInput baseInput = new SimpleTaskInput(target, result);
-  static final Function mapper = (x) => [x];
+  static final mapper = (Object x) => [x];
   static final ObjectToListTaskInput input =
       new ObjectToListTaskInput(baseInput, mapper);
 
   ObjectToListTaskInputBuilder builder;
 
   void setUp() {
     builder = new ObjectToListTaskInputBuilder(input);
   }
 
   test_create() {
@@ skipping 107 matching lines @@
 }
 
 @reflectiveTest
 class ObjectToListTaskInputTest extends EngineTestCase {
   static final AnalysisTarget target = new TestSource();
   static final ResultDescriptorImpl result =
       new ResultDescriptorImpl('result', null);
 
   test_create() {
     SimpleTaskInput baseInput = new SimpleTaskInput(target, result);
-    Function mapper = (x) => [x];
+    var mapper = (Object x) => [x];
     ObjectToListTaskInput input = new ObjectToListTaskInput(baseInput, mapper);
     expect(input, isNotNull);
     expect(input.baseInput, baseInput);
     expect(input.mapper, equals(mapper));
   }
 
   test_createBuilder() {
     SimpleTaskInput baseInput = new SimpleTaskInput(target, result);
-    Function mapper = (x) => [x];
+    var mapper = (Object x) => [x];
     ObjectToListTaskInput input = new ObjectToListTaskInput(baseInput, mapper);
     expect(input.createBuilder(),
         new isInstanceOf<ObjectToListTaskInputBuilder>());
   }
 }
 
 @reflectiveTest
-class SimpleTaskInputBuilderTest extends EngineTestCase {
+class SimpleTaskInputBuilderTest {
   static final AnalysisTarget target = new TestSource();
   static final ResultDescriptorImpl result =
       new ResultDescriptorImpl('result', null);
   static final SimpleTaskInput input = new SimpleTaskInput(target, result);
 
   SimpleTaskInputBuilder builder;
 
   void setUp() {
     builder = new SimpleTaskInputBuilder(input);
   }
@@ skipping 168 matching lines @@
   test_currentResult_afterOneMoveNext() {
     Map<String, TaskInput> inputDescriptors = {'one': input1, 'two': input2};
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     builder.moveNext();
     expect(builder.currentResult, result1);
   }
 
   test_currentResult_afterTwoMoveNext_withConstantInput() {
     ConstantTaskInput<int> constantInput = new ConstantTaskInput<int>(11);
-    Map<String, TaskInput> inputDescriptors = {
+    Map<String, TaskInput> inputDescriptors = <String, TaskInput>{
       'one': input1,
       'constant': constantInput,
       'two': input2
     };
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     builder.moveNext();
     builder.currentValue = 'value1';
     builder.moveNext();
     expect(builder.currentResult, result2);
@@ skipping 29 matching lines @@
   test_currentTarget_afterOneMoveNext() {
     Map<String, TaskInput> inputDescriptors = {'one': input1};
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     builder.moveNext();
     expect(builder.currentTarget, target);
   }
 
   test_currentTarget_afterTwoMoveNext_withConstantInput() {
     ConstantTaskInput<int> constantInput = new ConstantTaskInput<int>(11);
-    Map<String, TaskInput> inputDescriptors = {
+    Map<String, TaskInput> inputDescriptors = <String, TaskInput>{
       'one': input1,
       'constant': constantInput,
       'two': input2
     };
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     builder.moveNext();
     builder.currentValue = 'value1';
     builder.moveNext();
     expect(builder.currentTarget, target);
@@ skipping 106 matching lines @@
   test_moveNext_withSet() {
     Map<String, TaskInput> inputDescriptors = {'one': input1};
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     expect(builder.moveNext(), true);
     builder.currentValue = 'value1';
     expect(builder.moveNext(), false);
     expect(builder.moveNext(), false);
   }
 }