Move MimeMultipartTransformer and HttpBodyHandler to mime and http_server packages.

pkg/mime/test/mime_multipart_transformer_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.
 
-import "package:expect/expect.dart";
+import "package:unittest/unittest.dart";
+import "package:mime/mime.dart";
 import 'dart:async';
 import 'dart:math';
-import 'dart:io';
 import 'dart:isolate';
 
 void testParse(String message,
                String boundary,
                [List<Map> expectedHeaders,
-               List expectedParts,
-               bool expectError = false]) {
-  void testWrite(List<int> data, [int chunkSize = -1]) {
+                List expectedParts,
+                bool expectError = false]) {
+  Future testWrite(List<int> data, [int chunkSize = -1]) {
     StreamController controller = new StreamController(sync: true);
 
     var stream = controller.stream.transform(
         new MimeMultipartTransformer(boundary));
     int i = 0;
-    var port = new ReceivePort();
+    var completer = new Completer();
+    var futures = [];
     stream.listen((multipart) {
       int part = i++;
       if (expectedHeaders != null) {
-        Expect.mapEquals(expectedHeaders[part], multipart.headers);
+        expect(multipart.headers, equals(expectedHeaders[part]));
       }
-      var partPort = new ReceivePort();
-      multipart.fold([], (buffer, data) => buffer..addAll(data))
+      var partCompleter = new Completer();

[Bill Hesse, 2013/07/12 11:43:33]

partCompleter is unused.

[Anders Johnsen, 2013/07/15 08:21:32]

Done.

+      futures.add(multipart.fold([], (buffer, data) => buffer..addAll(data))
           .then((data) {
             if (expectedParts[part] != null) {

[Bill Hesse, 2013/07/12 11:43:33]

Is this really needed?  I see only one test with expectedParts containing nulls,
and that has an error thrown from the stream of parts.  But these streams should
have something happen to them - are they closed, do they have errors?  Test what
they should do.

[Anders Johnsen, 2013/07/15 08:21:32]

Testing for 'null' is a way to specify in the test that we don't care about the
data.

-              Expect.listEquals(expectedParts[part].codeUnits, data);
+              expect(data, equals(expectedParts[part].codeUnits));
             }
-            partPort.close();
-          });
+          }));
     }, onError: (error) {
       if (!expectError) throw error;
     }, onDone: () {

[Bill Hesse, 2013/07/12 11:43:33]

expect(expectError, isFalse);

[Anders Johnsen, 2013/07/15 08:21:32]

No, I still get close (cancelOnError is not set).

       if (expectedParts != null) {
-        Expect.equals(expectedParts.length, i);
+        expect(i, equals(expectedParts.length));
       }
-      port.close();
+      Future.wait(futures).then(completer.complete);
     });
 
     if (chunkSize == -1) chunkSize = data.length;
 
     int written = 0;
     for (int pos = 0; pos < data.length; pos += chunkSize) {
       int remaining = data.length - pos;
       int writeLength = min(chunkSize, remaining);
       controller.add(data.sublist(pos, pos + writeLength));
       written += writeLength;
     }
     controller.close();
+
+    return completer.future;
   }
 
   // Test parsing the data three times delivering the data in
   // different chunks.
   List<int> data = message.codeUnits;
-  testWrite(data);
-  testWrite(data, 10);
-  testWrite(data, 2);
-  testWrite(data, 1);
+  expect(Future.wait([
+      testWrite(data),
+      testWrite(data, 10),
+      testWrite(data, 2),
+      testWrite(data, 1)]),
+      completion(anything));

[Bill Hesse, 2013/07/12 11:43:33]

completes is the same as completion(anything).

[Anders Johnsen, 2013/07/15 08:21:32]

Done.

 }
 
 void testParseValid() {
   String message;
   Map headers;
   Map headers1;
   Map headers2;
   Map headers3;
   Map headers4;
   String body1;
@@ skipping 235 matching lines @@
 \r
 Body2\r
 --xxx\r\n""";
   testParse(message, "xxx", null, [null, null], true);
 }
 
 void main() {
   testParseValid();
   testParseInvalid();
 }