Don't rely on package:test internals (#136)

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.7
+
+* Support package:test 1.5.
+
 ## 0.6.6
 
 * Support `package:http` `>=0.11.3+17 <0.13.0`.

pubspec.yaml

@@ -1,6 +1,6 @@
 name: grpc
 description: Dart implementation of gRPC.
-version: 0.6.6
+version: 0.6.7
 author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/dart-lang/grpc-dart
 
@@ -16,4 +16,4 @@ dependencies:
 
 dev_dependencies:
   mockito: ^3.0.0
-  test: ^1.3.0
+  test: ^1.5.0

test/timeout_test.dart

@@ -17,7 +17,6 @@ import 'dart:async';
 
 import 'package:grpc/grpc.dart';
 import 'package:http2/transport.dart';
-import 'package:test/src/backend/invoker.dart';
 import 'package:test/test.dart';
 
 import 'src/client_utils.dart';
@@ -78,8 +77,9 @@ void main() {
     test('Calls time out if deadline is exceeded', () async {
       void handleRequest(StreamMessage message) {
         validateDataMessage(message);
-        Invoker.current.addOutstandingCallback();
-        new Future.delayed(new Duration(milliseconds: 1)).then((_) {
+        final Future delay = new Future.delayed(new Duration(milliseconds: 2));
+        expect(delay, completes);
+        delay.then((_) {
           try {
             harness
               ..sendResponseHeader()
@@ -87,8 +87,6 @@ void main() {
               ..sendResponseTrailer();
           } catch (error) {
             expect(error, isStateError);
-          } finally {
-            Invoker.current.removeOutstandingCallback();
           }
         });
       }
@@ -118,10 +116,11 @@ void main() {
 
     test('Calls time out if deadline is exceeded', () async {
       Future<int> methodHandler(ServiceCall call, Future<int> request) async {
-        Invoker.current.addOutstandingCallback();
         try {
           expect(call.isTimedOut, isFalse);
-          await new Future.delayed(new Duration(milliseconds: 2));
+          Future delay = new Future.delayed(new Duration(milliseconds: 2));
+          expect(delay, completes);
+          await delay;
           expect(call.isTimedOut, isTrue);
           try {
             await request;
@@ -132,8 +131,6 @@ void main() {
           fail('Did not throw');
         } catch (error, stack) {
           registerException(error, stack);
-        } finally {
-          Invoker.current.removeOutstandingCallback();
         }
         return dummyValue;
       }