Big merge from experimental to bleeding edge.

utils/tests/archive/reader_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 reader_test;
 
 import 'dart:io';
 import '../../../pkg/unittest/lib/unittest.dart'
 import '../../archive/archive.dart';
 
 final String dataPath = "utils/tests/archive/data";
 
 main() {
   test('reading a .tar.gz file', () {
     var asyncDone = expectAsync0(() {});
 
     var reader = new ArchiveReader();
     reader.format.tar = true;
     reader.filter.gzip = true;
 
     var future = reader.openFilename("$dataPath/test-archive.tar.gz")
-      .transform((input) {
+      .then((input) {
       var log = <String>[];
       input.onEntry = (entry) => guardAsync(() {
         log.add("Entry: ${entry.pathname}");
         var stream = new StringInputStream(entry.openInputStream());
         stream.onData = () => log.add("Contents: ${stream.read().trim()}");
         stream.onClosed = () => log.add("Closed: ${entry.pathname}");
       });
       input.onError = registerException;
 
       input.onClosed = () => guardAsync(() {
@@ skipping 16 matching lines @@
     expect(future, completes);
   });
 
   test('reading a .tar.gz file with readAll', () {
     var reader = new ArchiveReader();
     reader.format.tar = true;
     reader.filter.gzip = true;
 
     var future = reader.openFilename("$dataPath/test-archive.tar.gz")
       .chain((input) => input.readAll())
-      .transform((entries) {
-      entries = entries.map((entry) => [entry.pathname, entry.contents.trim()]);
+      .then((entries) {
+      entries = entries
+          .mappedBy((entry) => [entry.pathname, entry.contents.trim()])
+          .toList();
       expect(entries[0], orderedEquals(["filename1", "contents 1"]));
       expect(entries[1], orderedEquals(["filename2", "contents 2"]));
       expect(entries[2], orderedEquals(["filename3", "contents 3"]));
     });
 
     expect(future, completes);
   });
 
   test('reading an in-memory .tar.gz', () {
     var asyncDone = expectAsync0(() {});
 
     var reader = new ArchiveReader();
     reader.format.tar = true;
     reader.filter.gzip = true;
 
     var future = new File("$dataPath/test-archive.tar.gz").readAsBytes()
       .chain((bytes) => reader.openData(bytes))
-      .transform((input) {
+      .then((input) {
       var log = <String>[];
       input.onEntry = (entry) => guardAsync(() {
         log.add("Entry: ${entry.pathname}");
         var stream = new StringInputStream(entry.openInputStream());
         stream.onData = () => log.add("Contents: ${stream.read().trim()}");
         stream.onClosed = () => log.add("Closed: ${entry.pathname}");
       });
       input.onError = registerException;
 
       input.onClosed = () => guardAsync(() {
@@ skipping 17 matching lines @@
   });
 
   test("closing entries before they're read", () {
     var asyncDone = expectAsync0(() {});
 
     var reader = new ArchiveReader();
     reader.format.tar = true;
     reader.filter.gzip = true;
 
     var future = reader.openFilename("$dataPath/test-archive.tar.gz")
-      .transform((input) {
+      .then((input) {
       var log = <String>[];
       input.onEntry = (entry) => guardAsync(() {
         log.add("Entry: ${entry.pathname}");
         var underlyingStream = entry.openInputStream();
         var stream = new StringInputStream(underlyingStream);
         stream.onData = () => log.add("Contents: ${stream.read().trim()}");
         stream.onClosed = () => log.add("Closed: ${entry.pathname}");
         underlyingStream.close();
       });
       input.onError = registerException;
@@ skipping 16 matching lines @@
   });
 
   test("closing an archive stream before it's finished", () {
     var asyncDone = expectAsync0(() {});
 
     var reader = new ArchiveReader();
     reader.format.tar = true;
     reader.filter.gzip = true;
 
     var future = reader.openFilename("$dataPath/test-archive.tar.gz")
-      .transform((input) {
+      .then((input) {
       var count = 0;
 
       var log = <String>[];
       input.onEntry = (entry) => guardAsync(() {
         count += 1;
 
         log.add("Entry: ${entry.pathname}");
         var underlyingStream = entry.openInputStream();
         var stream = new StringInputStream(underlyingStream);
         stream.onData = () => log.add("Contents: ${stream.read().trim()}");
@@ skipping 25 matching lines @@
   test("opening a non-existent archive", () {
     var reader = new ArchiveReader();
     reader.format.tar = true;
     reader.filter.gzip = true;
 
     expect(reader.openFilename("$dataPath/non-existent.tar.gz"),
       throwsA((e) => e is ArchiveException));
   });
 }