Properly handle circular references among constants in the task model.

pkg/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;
 
 import 'package:analyzer/src/task/inputs.dart';
 import 'package:analyzer/src/task/model.dart';
 import 'package:analyzer/task/model.dart';
 import 'package:unittest/unittest.dart';
@@ skipping 77 matching lines @@
   }
 
   test_currentResult_afterComplete() {
     ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
     builder.moveNext();
     builder.currentValue = [];
     builder.moveNext();
     expect(builder.currentResult, null);
   }
 
+  test_currentResult_afterCurrentValueNotAvailable() {
+    ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
+    builder.moveNext();
+    builder.currentValueNotAvailable();
+    builder.moveNext();
+    expect(builder.currentResult, null);
+  }
+
   test_currentResult_afterOneMoveNext() {
     ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
     builder.moveNext();
     expect(builder.currentResult, result1);
   }
 
   test_currentResult_beforeMoveNext() {
     ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
     expect(builder.currentResult, null);
   }
 
   test_currentTarget_afterComplete() {
     ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
     builder.moveNext();
     builder.currentValue = [];
     builder.moveNext();
     expect(builder.currentTarget, null);
   }
 
+  test_currentTarget_afterCurrentValueNotAvailable() {
+    ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
+    builder.moveNext();
+    builder.currentValueNotAvailable();
+    builder.moveNext();
+    expect(builder.currentTarget, null);
+  }
+
   test_currentTarget_afterOneMoveNext() {
     ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
     builder.moveNext();
     expect(builder.currentTarget, target1);
   }
 
   test_currentTarget_beforeMoveNext() {
     ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
     expect(builder.currentTarget, null);
   }
 
   test_currentValue_afterOneMoveNext() {
     ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
     builder.moveNext();
     builder.currentValue = [];
   }
 
   test_currentValue_beforeMoveNext() {
     ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
     expect(() {
       builder.currentValue = [];
     }, throwsStateError);
   }
 
+  test_currentValueNotAvailable_afterOneMoveNext() {
+    ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
+    builder.moveNext();
+    builder.currentValueNotAvailable();
+  }
+
+  test_currentValueNotAvailable_beforeMoveNext() {
+    ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
+    expect(() {
+      builder.currentValueNotAvailable();
+    }, throwsStateError);
+  }
+
   test_inputValue_afterComplete() {
     AnalysisTarget target2 = new TestSource();
     AnalysisTarget target3 = new TestSource();
     String value2 = 'value2';
     String value3 = 'value3';
     ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
     builder.moveNext(); // Advance to requesting the list
     builder.currentValue = [target2, target3];
     builder.moveNext(); // Advance to requesting result2 for target2
     builder.currentValue = value2;
     builder.moveNext(); // Advance to requesting result2 for target3
     builder.currentValue = value3;
     builder.moveNext(); // Advance to the end
     var inputValue = builder.inputValue;
     expect(inputValue, new isInstanceOf<List>());
     List list = inputValue;
     expect(list.length, 2);
     expect(list[0], value2);
     expect(list[1], value3);
   }
 
+  test_inputValue_afterFirstValueNotAvailable() {
+    AnalysisTarget target2 = new TestSource();
+    AnalysisTarget target3 = new TestSource();
+    String value3 = 'value3';
+    ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
+    builder.moveNext(); // Advance to requesting the list
+    builder.currentValue = [target2, target3];
+    builder.moveNext(); // Advance to requesting result2 for target2
+    builder.currentValueNotAvailable();
+    builder.moveNext(); // Advance to requesting result2 for target3
+    builder.currentValue = value3;
+    builder.moveNext(); // Advance to the end
+    var inputValue = builder.inputValue;
+    expect(inputValue, new isInstanceOf<List>());
+    List list = inputValue;
+    expect(list.length, 1);

[scheglov, 2015/05/19 19:25:41]

expect(list, hasLength(1));

+    expect(list[0], value3);

[scheglov, 2015/05/19 19:25:42]

or maybe even just this statement only:
expect(list, orderedEquals([value3]));

[Paul Berry, 2015/05/19 19:36:11]

Done.

+  }
+
+  test_inputValue_afterListNotAvailable() {
+    ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
+    builder.moveNext(); // Advance to requesting the list
+    builder.currentValueNotAvailable();
+    builder.moveNext(); // Advance to the end
+    var inputValue = builder.inputValue;
+    expect(inputValue, new isInstanceOf<List>());
+    List list = inputValue;
+    expect(list, isEmpty);
+  }
+
   test_inputValue_afterOneMoveNext() {
     ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
     builder.moveNext();
     expect(() => builder.inputValue, throwsStateError);
   }
 
   test_inputValue_beforeMoveNext() {
     ListToListTaskInputBuilder builder = new ListToListTaskInputBuilder(input);
     expect(() => builder.inputValue, throwsStateError);
   }
@@ skipping 53 matching lines @@
   }
 
   test_currentResult_afterComplete() {
     ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
     builder.moveNext();
     builder.currentValue = [];
     builder.moveNext();
     expect(builder.currentResult, null);
   }
 
+  test_currentResult_afterCurrentValueNotAvailable() {
+    ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
+    builder.moveNext();
+    builder.currentValueNotAvailable();
+    builder.moveNext();
+    expect(builder.currentResult, null);
+  }
+
   test_currentResult_afterOneMoveNext() {
     ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
     builder.moveNext();
     expect(builder.currentResult, result1);
   }
 
   test_currentResult_beforeMoveNext() {
     ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
     expect(builder.currentResult, null);
   }
 
   test_currentTarget_afterComplete() {
     ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
     builder.moveNext();
     builder.currentValue = [];
     builder.moveNext();
     expect(builder.currentTarget, null);
   }
 
+  test_currentTarget_afterCurrentValueNotAvailable() {
+    ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
+    builder.moveNext();
+    builder.currentValueNotAvailable();
+    builder.moveNext();
+    expect(builder.currentTarget, null);
+  }
+
   test_currentTarget_afterOneMoveNext() {
     ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
     builder.moveNext();
     expect(builder.currentTarget, target1);
   }
 
   test_currentTarget_beforeMoveNext() {
     ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
     expect(builder.currentTarget, null);
   }
 
   test_currentValue_afterOneMoveNext() {
     ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
     builder.moveNext();
     builder.currentValue = [];
   }
 
   test_currentValue_beforeMoveNext() {
     ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
     expect(() {
       builder.currentValue = [];
     }, throwsStateError);
   }
 
+  test_currentValueNotAvailable_afterOneMoveNext() {
+    ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
+    builder.moveNext();
+    builder.currentValueNotAvailable();
+  }
+
+  test_currentValueNotAvailable_beforeMoveNext() {
+    ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
+    expect(() {
+      builder.currentValueNotAvailable();
+    }, throwsStateError);
+  }
+
   test_inputValue_afterComplete() {
     AnalysisTarget target2 = new TestSource('target2');
     AnalysisTarget target3 = new TestSource('target3');
     String value2 = 'value2';
     String value3 = 'value3';
     ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
     builder.moveNext(); // Advance to requesting the list
     builder.currentValue = [target2, target3];
     builder.moveNext(); // Advance to requesting result2 for target2
     builder.currentValue = value2;
     builder.moveNext(); // Advance to requesting result2 for target3
     builder.currentValue = value3;
     builder.moveNext(); // Advance to the end
     var inputValue = builder.inputValue;
     expect(inputValue, new isInstanceOf<Map>());
     expect(inputValue.length, 2);
     expect(inputValue, containsPair(target2, value2));
     expect(inputValue, containsPair(target3, value3));
   }
 
+  test_inputValue_afterFirstValueNotAvailable() {
+    AnalysisTarget target2 = new TestSource('target2');
+    AnalysisTarget target3 = new TestSource('target3');
+    String value3 = 'value3';
+    ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
+    builder.moveNext(); // Advance to requesting the list
+    builder.currentValue = [target2, target3];
+    builder.moveNext(); // Advance to requesting result2 for target2
+    builder.currentValueNotAvailable();
+    builder.moveNext(); // Advance to requesting result2 for target3
+    builder.currentValue = value3;
+    builder.moveNext(); // Advance to the end
+    var inputValue = builder.inputValue;
+    expect(inputValue, new isInstanceOf<Map>());
+    expect(inputValue.length, 1);

[scheglov, 2015/05/19 19:25:41]

expect(inputValue, hasLength(1));

[Paul Berry, 2015/05/19 19:36:11]

Done.

+    expect(inputValue, containsPair(target3, value3));
+  }
+
+  test_inputValue_afterListNotAvailable() {
+    ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
+    builder.moveNext(); // Advance to requesting the list
+    builder.currentValueNotAvailable();
+    builder.moveNext(); // Advance to the end
+    var inputValue = builder.inputValue;
+    expect(inputValue, new isInstanceOf<Map>());
+    expect(inputValue, isEmpty);
+  }
+
   test_inputValue_afterOneMoveNext() {
     ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
     builder.moveNext();
     expect(() => builder.inputValue, throwsStateError);
   }
 
   test_inputValue_beforeMoveNext() {
     ListToMapTaskInputBuilder builder = new ListToMapTaskInputBuilder(input);
     expect(() => builder.inputValue, throwsStateError);
   }
@@ skipping 50 matching lines @@
   }
 
   test_currentResult_afterComplete() {
     SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
     builder.moveNext();
     builder.currentValue = 'value';
     builder.moveNext();
     expect(builder.currentResult, null);
   }
 
+  test_currentResult_afterCurrentValueNotAvailable() {
+    SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
+    builder.moveNext();
+    builder.currentValueNotAvailable();
+    builder.moveNext();
+    expect(builder.currentResult, null);
+  }
+
   test_currentResult_afterOneMoveNext() {
     SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
     builder.moveNext();
     expect(builder.currentResult, result);
   }
 
   test_currentResult_beforeMoveNext() {
     SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
     expect(builder.currentResult, null);
   }
 
   test_currentTarget_afterComplete() {
     SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
     builder.moveNext();
     builder.currentValue = 'value';
     builder.moveNext();
     expect(builder.currentTarget, null);
   }
 
+  test_currentTarget_afterCurrentValueNotAvailable() {
+    SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
+    builder.moveNext();
+    builder.currentValueNotAvailable();
+    builder.moveNext();
+    expect(builder.currentTarget, null);
+  }
+
   test_currentTarget_afterOneMoveNext() {
     SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
     builder.moveNext();
     expect(builder.currentTarget, target);
   }
 
   test_currentTarget_beforeMoveNext() {
     SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
     expect(builder.currentTarget, null);
   }
 
   test_currentValue_afterOneMoveNext() {
     SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
     builder.moveNext();
     builder.currentValue = 'value';
   }
 
   test_currentValue_beforeMoveNext() {
     SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
     expect(() {
       builder.currentValue = 'value';
     }, throwsStateError);
   }
 
+  test_currentValueNotAvailable_afterOneMoveNext() {
+    SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
+    builder.moveNext();
+    builder.currentValueNotAvailable();
+  }
+
+  test_currentValueNotAvailable_beforeMoveNext() {
+    SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
+    expect(() {
+      builder.currentValueNotAvailable();
+    }, throwsStateError);
+  }
+
   test_inputValue_afterComplete() {
     SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
     builder.moveNext();
     String value = 'value';
     builder.currentValue = value;
     builder.moveNext();
     expect(builder.inputValue, value);
   }
 
+  test_inputValue_afterCurrentValueNotAvailable() {
+    SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
+    builder.moveNext();
+    String value = 'value';
+    builder.currentValueNotAvailable();
+    builder.moveNext();
+    expect(builder.inputValue, isNull);
+  }
+
   test_inputValue_afterOneMoveNext() {
     SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
     builder.moveNext();
     expect(() => builder.inputValue, throwsStateError);
   }
 
   test_inputValue_beforeMoveNext() {
     SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
     expect(() => builder.inputValue, throwsStateError);
   }
@@ skipping 53 matching lines @@
   test_currentResult_afterComplete() {
     Map<String, TaskInput> inputDescriptors = {'one': input1};
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     builder.moveNext();
     builder.currentValue = 'value1';
     builder.moveNext();
     expect(builder.currentResult, null);
   }
 
+  test_currentResult_afterCurrentValueNotAvailable() {
+    Map<String, TaskInput> inputDescriptors = {'one': input1};
+    TopLevelTaskInputBuilder builder =
+        new TopLevelTaskInputBuilder(inputDescriptors);
+    builder.moveNext();
+    builder.currentValueNotAvailable();
+    builder.moveNext();
+    expect(builder.currentResult, null);
+  }
+
   test_currentResult_afterOneMoveNext() {
     Map<String, TaskInput> inputDescriptors = {'one': input1, 'two': input2};
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     builder.moveNext();
     expect(builder.currentResult, result1);
   }
 
   test_currentResult_beforeMoveNext() {
     Map<String, TaskInput> inputDescriptors = {};
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     expect(builder.currentResult, null);
   }
 
   test_currentTarget_afterComplete() {
     Map<String, TaskInput> inputDescriptors = {'one': input1};
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     builder.moveNext();
     builder.currentValue = 'value1';
     builder.moveNext();
     expect(builder.currentTarget, null);
   }
 
+  test_currentTarget_afterCurrentValueNotAvailable() {
+    Map<String, TaskInput> inputDescriptors = {'one': input1};
+    TopLevelTaskInputBuilder builder =
+        new TopLevelTaskInputBuilder(inputDescriptors);
+    builder.moveNext();
+    builder.currentValueNotAvailable();
+    builder.moveNext();
+    expect(builder.currentTarget, null);
+  }
+
   test_currentTarget_afterOneMoveNext() {
     Map<String, TaskInput> inputDescriptors = {'one': input1};
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     builder.moveNext();
     expect(builder.currentTarget, target);
   }
 
   test_currentTarget_beforeMoveNext() {
     Map<String, TaskInput> inputDescriptors = {};
@@ skipping 12 matching lines @@
 
   test_currentValue_beforeMoveNext() {
     Map<String, TaskInput> inputDescriptors = {'one': input1};
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     expect(() {
       builder.currentValue = 'value1';
     }, throwsStateError);
   }
 
+  test_currentValueNotAvailable_afterOneMoveNext() {
+    Map<String, TaskInput> inputDescriptors = {'one': input1};
+    TopLevelTaskInputBuilder builder =
+        new TopLevelTaskInputBuilder(inputDescriptors);
+    builder.moveNext();
+    builder.currentValueNotAvailable();
+  }
+
+  test_currentValueNotAvailable_beforeMoveNext() {
+    Map<String, TaskInput> inputDescriptors = {'one': input1};
+    TopLevelTaskInputBuilder builder =
+        new TopLevelTaskInputBuilder(inputDescriptors);
+    expect(() {
+      builder.currentValueNotAvailable();
+    }, throwsStateError);
+  }
+
   test_inputValue_afterComplete() {
     String key1 = 'one';
     String key2 = 'two';
     String value1 = 'value1';
     String value2 = 'value2';
     Map<String, TaskInput> inputDescriptors = {key1: input1, key2: input2};
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     builder.moveNext(); // Advance to requesting result1 for target
     builder.currentValue = value1;
     builder.moveNext(); // Advance to requesting result2 for target
     builder.currentValue = value2;
     builder.moveNext(); // Advance to the end
     var inputValue = builder.inputValue;
     expect(inputValue, new isInstanceOf<Map>());
     Map inputs = inputValue;
     expect(inputs.length, 2);
     expect(inputs, containsPair(key1, value1));
     expect(inputs, containsPair(key2, value2));
   }
 
   test_inputValue_afterOneMoveNext() {
     Map<String, TaskInput> inputDescriptors = {'one': input1};
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     builder.moveNext();
     expect(() => builder.inputValue, throwsStateError);
   }
 
+  test_inputValue_afterOneValueNotAvailable() {
+    String key1 = 'one';
+    String key2 = 'two';
+    String value2 = 'value2';
+    Map<String, TaskInput> inputDescriptors = {key1: input1, key2: input2};
+    TopLevelTaskInputBuilder builder =
+        new TopLevelTaskInputBuilder(inputDescriptors);
+    builder.moveNext(); // Advance to requesting result1 for target
+    builder.currentValueNotAvailable();
+    builder.moveNext(); // Advance to requesting result2 for target
+    builder.currentValue = value2;
+    builder.moveNext(); // Advance to the end
+    var inputValue = builder.inputValue;
+    expect(inputValue, new isInstanceOf<Map>());
+    Map inputs = inputValue;
+    expect(inputs.length, 1);

[scheglov, 2015/05/19 19:25:41]

hasLength(1)

[Paul Berry, 2015/05/19 19:36:11]

Done.

+    expect(inputs, containsPair(key2, value2));
+  }
+
   test_inputValue_beforeMoveNext() {
     Map<String, TaskInput> inputDescriptors = {};
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     expect(() => builder.inputValue, throwsStateError);
   }
 
   test_moveNext_withoutSet() {
     Map<String, TaskInput> inputDescriptors = {'one': input1};
     TopLevelTaskInputBuilder builder =
         new TopLevelTaskInputBuilder(inputDescriptors);
     expect(builder.moveNext(), true);
     expect(() => builder.moveNext(), throwsStateError);
   }
 
   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);
   }
 }