Remove Comprehension type in polymer expressions

pkg/polymer_expressions/test/eval_test.dart

 // Copyright (c) 2013, 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 eval_test;
 
 import 'dart:async';
 
 // Import mirrors to cause all mirrors to be retained by dart2js.
 // The tests reflect on LinkedHashMap.length and String.length.
@@ skipping 200 matching lines @@
 
       expectEval('a || b', true, null, {'a': null, 'b': true});
       expectEval('a || b', true, null, {'a': true, 'b': null});
       expectEval('a || b', false, null, {'a': null, 'b': false});
       expectEval('a || b', false, null, {'a': false, 'b': null});
       expectEval('a || b', false, null, {'a': null, 'b': null});
     });
 
     test('should evaluate an "in" expression', () {
       var scope = new Scope(variables: {'items': [1, 2, 3]});
-      var comprehension = eval(parse('item in items'), scope);
-      expect(comprehension.iterable, orderedEquals([1, 2, 3]));
+      var childScopes = eval(parse('item in items'), scope);
+      expect(childScopes.length, 3);
+      expect(childScopes[0].varName, 'item');
+      expect(childScopes[0].value, 1);
+      expect(childScopes[1].varName, 'item');
+      expect(childScopes[1].value, 2);
+      expect(childScopes[2].varName, 'item');
+      expect(childScopes[2].value, 3);
     });
 
     test('should evaluate complex "in" expressions', () {
       var holder = new ListHolder([1, 2, 3]);
       var scope = new Scope(variables: {'holder': holder});
-      var comprehension = eval(parse('item in holder.items'), scope);
-      expect(comprehension.iterable, orderedEquals([1, 2, 3]));
+      var childScopes = eval(parse('item in holder.items'), scope);
+      expect(childScopes.length, 3);
+      expect(childScopes[0].varName, 'item');
+      expect(childScopes[0].value, 1);
+      expect(childScopes[1].varName, 'item');
+      expect(childScopes[1].value, 2);
+      expect(childScopes[2].varName, 'item');
+      expect(childScopes[2].value, 3);
     });
 
     test('should handle null iterators in "in" expressions', () {
       var scope = new Scope(variables: {'items': null});
-      var comprehension = eval(parse('item in items'), scope);
-      expect(comprehension, isNotNull);
-      expect(comprehension.iterable, []);
+      var childScopes = eval(parse('item in items'), scope);
+      expect(childScopes.length, 0);
     });
 
   });
 
   group('assign', () {
 
     test('should assign a single identifier', () {
       var foo = new Foo(name: 'a');
       assign(parse('name'), 'b', new Scope(model: foo));
       expect(foo.name, 'b');
@@ skipping 91 matching lines @@
           },
           afterMatcher: '1'
       );
     });
 
     test('should observe an comprehension', () {
       var items = new ObservableList();
       var foo = new Foo(name: 'foo');
       return expectObserve('item in items',
           variables: {'items': items},
-          beforeMatcher: (c) => c.iterable.isEmpty,
+          beforeMatcher: (c) => c.isEmpty,
           mutate: () {
             items.add(foo);
           },
-          afterMatcher: (c) => c.iterable.contains(foo)
+          afterMatcher:
+              (c) => c.single.varName == 'item' && c.single.value == foo
       );
     });
 
   });
 
 }
 
 @reflectable
 class Foo extends ChangeNotifier {
   String _name;
@@ skipping 66 matching lines @@
   return Future.wait([future, new Future(() {
     expect(passed, true, reason: "Didn't receive a change notification on $s");
   })]);
 }
 
 // Regression test from https://code.google.com/p/dart/issues/detail?id=13459
 class WordElement extends Observable {
   @observable List chars1 = 'abcdefg'.split('');
   @reflectable List filteredList(List original) => [original[0], original[1]];
 }