Update to use latest pkg/test features and fix travis accordingly

.travis.yml

@@ -1,19 +1,33 @@
 language: dart
 sudo: false
 dart:
-  - stable
   - dev
-  - 1.19.0
-  - 1.18.1
-  - 1.17.1
+  - stable
+  - 1.21.0
+  - 1.20.1
+  - 1.19.1
+with_content_shell: true
+env:
+  - TEST_PLATFORM=vm
+  - TEST_PLATFORM=content-shell
+  - TEST_PLATFORM=firefox
 cache:
   directories:
     - $HOME/.pub-cache
-with_content_shell: true
-addons:
-  firefox: "latest"
 before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
   - 't=0; until (xdpyinfo -display :99 &> /dev/null || test $t -gt 10); do sleep 1; let t=$t+1; done'
 script: ./tool/travis.sh
+matrix:
+  allow_failures:
+    # Exclude SDKs before 1.22.0-dev.4 which are lacking fix
+    # https://github.com/dart-lang/sdk/commit/7c3c297a8ad907f12bf12b96a21777421067fd18
+    - dart: stable
+      env: TEST_PLATFORM=firefox
+    - dart: 1.21.0
+      env: TEST_PLATFORM=firefox
+    - dart: 1.20.1
+      env: TEST_PLATFORM=firefox
+    - dart: 1.19.1
+      env: TEST_PLATFORM=firefox

pubspec.yaml

@@ -15,4 +15,4 @@ dependencies:
 dev_dependencies:
   http: '>=0.9.2 <0.12.0'
   scheduled_test: '^0.12.0'
-  test: '^0.12.0'
+  test: '^0.12.7'

test/add_chunked_encoding_test.dart

@@ -7,8 +7,6 @@ import 'dart:async';
 import 'package:shelf/shelf.dart';
 import 'package:test/test.dart';
 
-import 'test_util.dart';
-
 void main() {
   test('adds chunked encoding with no transfer-encoding header', () async {
     var response = await _chunkResponse(

test/hijack_test.dart

@@ -18,8 +18,8 @@ void main() {
   test('hijacking a hijackable request throws a HijackException and calls '
       'onHijack', () {
     var request = new Request('GET', LOCALHOST_URI,
-        onHijack: expectAsync((callback) {
-      var streamController = new StreamController();
+        onHijack: expectAsync1((void callback(a, b)) {
+      var streamController = new StreamController<List<int>>();
       streamController.add([1, 2, 3]);
       streamController.close();
 
@@ -29,7 +29,7 @@ void main() {
       callback(streamController.stream, sinkController);
     }));
 
-    expect(() => request.hijack(expectAsync((channel) {
+    expect(() => request.hijack(expectAsync1((channel) {
       expect(channel.stream.first, completion(equals([1, 2, 3])));
       channel.sink.add([4, 5, 6]);
       channel.sink.close();
@@ -39,7 +39,7 @@ void main() {
   test('hijacking a hijackable request twice throws a StateError', () {
     // Assert that the [onHijack] callback is only called once.
     var request = new Request('GET', LOCALHOST_URI,
-        onHijack: expectAsync((_) => null, count: 1));
+        onHijack: expectAsync1((_) => null, count: 1));
 
     expect(() => request.hijack((_) => null),
         throwsA(new isInstanceOf<HijackException>()));
@@ -57,8 +57,8 @@ void main() {
     test('hijacking a hijackable request throws a HijackException and calls '
         'onHijack', () {
       var request = new Request('GET', LOCALHOST_URI,
-          onHijack: expectAsync((callback) {
-        var streamController = new StreamController();
+          onHijack: expectAsync1((callback(a, b)) {
+        var streamController = new StreamController<List<int>>();
         streamController.add([1, 2, 3]);
         streamController.close();
 
@@ -70,7 +70,7 @@ void main() {
 
       var newRequest = request.change();
 
-      expect(() => newRequest.hijack(expectAsync((channel) {
+      expect(() => newRequest.hijack(expectAsync1((channel) {
         expect(channel.stream.first, completion(equals([1, 2, 3])));
         channel.sink.add([4, 5, 6]);
         channel.sink.close();
@@ -81,7 +81,7 @@ void main() {
         'StateError', () {
       // Assert that the [onHijack] callback is only called once.
       var request = new Request('GET', LOCALHOST_URI,
-          onHijack: expectAsync((_) => null, count: 1));
+          onHijack: expectAsync1((_) => null, count: 1));
 
       var newRequest = request.change();
 

test/message_test.dart

@@ -131,7 +131,6 @@ void main() {
     });
 
     test("supports a List<int> body", () {
-      var controller = new StreamController();
       var request = _createMessage(body: HELLO_BYTES);
       expect(request.read().toList(),
           completion(equals([HELLO_BYTES])));

test/server_handler_test.dart

@@ -39,7 +39,7 @@ void main() {
 
   test("stops servicing requests after Server.close is called", () {
     var serverHandler = new ServerHandler(LOCALHOST_URI);
-    serverHandler.server.mount(expectAsync((_) {}, count: 0));
+    serverHandler.server.mount(expectAsync1((_) {}, count: 0));
     serverHandler.server.close();
 
     expect(makeSimpleRequest(serverHandler.handler), throwsStateError);

test/shelf_io_test.dart

@@ -103,7 +103,7 @@ void main() {
   });
 
   test('chunked requests are un-chunked', () {
-    _scheduleServer(expectAsync((request) {
+    _scheduleServer(expectAsync1((request) {
       expect(request.contentLength, isNull);
       expect(request.method, 'POST');
       expect(request.headers, isNot(contains(HttpHeaders.TRANSFER_ENCODING)));
@@ -209,7 +209,7 @@ void main() {
     _scheduleServer((request) {
       expect(request.method, 'POST');
 
-      request.hijack(expectAsync((stream, sink) {
+      request.hijack(expectAsync2((stream, sink) {
         expect(stream.first, completion(equals("Hello".codeUnits)));
 
         sink.add(("HTTP/1.1 404 Not Found\r\n"
@@ -249,7 +249,7 @@ void main() {
           server.close();
         });
       });
-    }, onError: expectAsync((error) {
+    }, onError: expectAsync1((error) {
       expect(error, equals('oh no'));
     }));
   });

tool/travis.sh

@@ -3,10 +3,17 @@
 # Fast fail the script on failures.
 set -e
 
-pub run test -p vm,content-shell,firefox -j 1
+THE_COMMAND="pub run test -p $TEST_PLATFORM"
+if [ $TEST_PLATFORM == 'firefox' ] || [ $TEST_PLATFORM == 'content-shell' ]; then
+    # browser tests don't run well on travis unless one-at-a-time
+    THE_COMMAND="$THE_COMMAND -j 1"
+fi
+
+echo $THE_COMMAND
+exec $THE_COMMAND
 
 # Install dart_coveralls; gather and send coverage data.
-if [ "$COVERALLS_TOKEN" ] && [ "$TRAVIS_DART_VERSION" = "stable" ]; then
+if [ $TEST_PLATFORM == 'vm' ] && [ "$COVERALLS_TOKEN" ] && [ "$TRAVIS_DART_VERSION" = "stable" ]; then
   pub global activate dart_coveralls
 
   pub global run dart_coveralls report \