Big merge from experimental to bleeding edge.

pkg/serialization/test/serialization_test.dart

 // Copyright (c) 2012, 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 serialization_test;
 
 import 'package:unittest/unittest.dart';
 import 'package:serialization/serialization.dart';
 import 'package:serialization/src/serialization_helpers.dart';
 import 'package:serialization/src/mirrors_helpers.dart';
@@ skipping 174 matching lines @@
   Node n1 = new Node("1"), n2 = new Node("2"), n3 = new Node("3");
   n1.children = [n2, n3];
   n2.parent = n1;
   n3.parent = n1;
 
   test('Trace a cyclical structure', () {
     var s = new Serialization();
     var trace = new Trace(new Writer(s));
     trace.writer.trace = trace;
     trace.trace(n1);
-    var all = trace.writer.references.keys;
+    var all = trace.writer.references.keys.toSet();
     expect(all.length, 4);
     expect(all.contains(n1), isTrue);
     expect(all.contains(n2), isTrue);
     expect(all.contains(n3), isTrue);
     expect(all.contains(n1.children), isTrue);
   });
 
   test('Flatten references in a cyclical structure', () {
     var s = new Serialization();
     var w = new Writer(s);
     w.trace = new Trace(w);
     w.write(n1);
     expect(w.states.length, 4); // prims, lists, essential lists, basic
     var children = 0, name = 1, parent = 2;
-    List rootNode = w.states[3].filter((x) => x[name] == "1");
+    List rootNode = w.states[3].where((x) => x[name] == "1").toList();
     rootNode = rootNode.first;
     expect(rootNode[parent], isNull);
     var list = w.states[1].first;
     expect(w.stateForReference(rootNode[children]), list);
     var parentNode = w.stateForReference(list[0])[parent];
     expect(w.stateForReference(parentNode), rootNode);
   });
 
   test('round-trip', () {
     runRoundTripTest(nodeSerializerReflective);
@@ skipping 262 matching lines @@
   expect(m2.name, "2");
   expect(m3.name, "3");
   expect(m2.parent, m1);
   expect(m3.parent, m1);
   expect(m1.parent, isNull);
 }
 
 /** Extract the state from [object] using the rules in [s] and return it. */
 states(object, Serialization s) {
   var rules = s.rulesFor(object, null);
-  return rules.map((x) => x.extractState(object, doNothing));
+  return rules.mappedBy((x) => x.extractState(object, doNothing)).toList();
 }
 
 /** A hard-coded rule for serializing Node instances. */
 class NodeRule extends CustomRule {
   bool appliesTo(instance, _) => instance is Node;
   getState(instance) => [instance.parent, instance.name, instance.children];
   create(state) => new Node(state[1]);
   setState(Node node, state) {
     node.parent = state[0];
     node.children = state[2];
   }
-}
+}