Upgrade to the new test runner.
R=rnystrom@google.com
Review URL: https://codereview.chromium.org//1234323004 .
diff --git a/.gitignore b/.gitignore
index 388eff0..7dbf035 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
.pub/
build/
packages
+.packages
# Or the files created by dart2js.
*.dart.js
diff --git a/.status b/.status
deleted file mode 100644
index e9f2b00..0000000
--- a/.status
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (c) 2014, 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.
diff --git a/.test_config b/.test_config
new file mode 100644
index 0000000..412fc5c
--- /dev/null
+++ b/.test_config
@@ -0,0 +1,3 @@
+{
+ "test_package": true
+}
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index bf5939c..d895698 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,12 +1,12 @@
name: json_rpc_2
-version: 1.1.1
+version: 1.1.2-dev
author: Dart Team <misc@dartlang.org>
description: An implementation of the JSON-RPC 2.0 spec.
homepage: http://github.com/dart-lang/json_rpc_2
dependencies:
stack_trace: '>=0.9.1 <2.0.0'
dev_dependencies:
- unittest: ">=0.9.0 <0.12.0"
+ test: ">=0.12.0 <0.13.0"
environment:
sdk: ">=1.2.0 <2.0.0"
diff --git a/test/client/client_test.dart b/test/client/client_test.dart
index 9fcf9e3..3f50ab7 100644
--- a/test/client/client_test.dart
+++ b/test/client/client_test.dart
@@ -7,7 +7,7 @@
import 'dart:async';
import 'dart:convert';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'package:json_rpc_2/error_code.dart' as error_code;
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
diff --git a/test/client/stream_test.dart b/test/client/stream_test.dart
index 6942ff7..20b21bd 100644
--- a/test/client/stream_test.dart
+++ b/test/client/stream_test.dart
@@ -6,7 +6,7 @@
import 'dart:async';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
import 'utils.dart';
diff --git a/test/client/utils.dart b/test/client/utils.dart
index a164577..e759fb1 100644
--- a/test/client/utils.dart
+++ b/test/client/utils.dart
@@ -9,7 +9,7 @@
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
import 'package:json_rpc_2/error_code.dart' as error_code;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
/// A controller used to test a [json_rpc.Client].
class ClientController {
diff --git a/test/peer_test.dart b/test/peer_test.dart
index 07bf799..c519873 100644
--- a/test/peer_test.dart
+++ b/test/peer_test.dart
@@ -7,7 +7,7 @@
import 'dart:async';
import 'dart:convert';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'package:json_rpc_2/error_code.dart' as error_code;
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
diff --git a/test/server/batch_test.dart b/test/server/batch_test.dart
index f92a3cf..704ea6e 100644
--- a/test/server/batch_test.dart
+++ b/test/server/batch_test.dart
@@ -6,7 +6,7 @@
import 'dart:convert';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'package:json_rpc_2/error_code.dart' as error_code;
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
diff --git a/test/server/invalid_request_test.dart b/test/server/invalid_request_test.dart
index 74cf86f..aa00fb8 100644
--- a/test/server/invalid_request_test.dart
+++ b/test/server/invalid_request_test.dart
@@ -6,7 +6,7 @@
import 'dart:convert';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'package:json_rpc_2/error_code.dart' as error_code;
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
diff --git a/test/server/parameters_test.dart b/test/server/parameters_test.dart
index 3de0359..a518698 100644
--- a/test/server/parameters_test.dart
+++ b/test/server/parameters_test.dart
@@ -4,7 +4,7 @@
library json_rpc_2.test.server.parameters_test;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
import 'utils.dart';
diff --git a/test/server/server_test.dart b/test/server/server_test.dart
index 10498b7..3573332 100644
--- a/test/server/server_test.dart
+++ b/test/server/server_test.dart
@@ -6,7 +6,7 @@
import 'dart:convert';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'package:json_rpc_2/error_code.dart' as error_code;
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
diff --git a/test/server/stream_test.dart b/test/server/stream_test.dart
index 5459e3e..a7a2d86 100644
--- a/test/server/stream_test.dart
+++ b/test/server/stream_test.dart
@@ -6,7 +6,7 @@
import 'dart:async';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
import 'utils.dart';
diff --git a/test/server/utils.dart b/test/server/utils.dart
index 75dc9b2..fabef1f 100644
--- a/test/server/utils.dart
+++ b/test/server/utils.dart
@@ -9,7 +9,7 @@
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
import 'package:json_rpc_2/error_code.dart' as error_code;
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
/// A controller used to test a [json_rpc.Server].
class ServerController {
