From e9ad62d2fef82ed98aaf65351514716e3aba7408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jirka=20Dan=C4=9Bk?= Date: Wed, 13 Jan 2016 15:23:28 +0100 Subject: [PATCH] update package:unittest to package:test --- pubspec.yaml | 2 +- test/html/client_test.dart | 3 ++- test/html/streamed_request_test.dart | 3 ++- test/io/client_test.dart | 3 ++- test/io/http_test.dart | 3 ++- test/io/multipart_test.dart | 3 ++- test/io/request_test.dart | 3 ++- test/io/streamed_request_test.dart | 3 ++- test/io/utils.dart | 2 +- test/mock_client_test.dart | 2 +- test/multipart_test.dart | 2 +- test/request_test.dart | 2 +- test/response_test.dart | 2 +- test/streamed_request_test.dart | 2 +- test/utils.dart | 2 +- 15 files changed, 22 insertions(+), 15 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index f2ba38e64b..6fc80ac0c4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,6 +8,6 @@ dependencies: path: ">=0.9.0 <2.0.0" 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.9.0 <2.0.0" diff --git a/test/html/client_test.dart b/test/html/client_test.dart index ab806546e5..ace231e1c7 100644 --- a/test/html/client_test.dart +++ b/test/html/client_test.dart @@ -2,9 +2,10 @@ // 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. +@TestOn("browser") import 'package:http/http.dart' as http; import 'package:http/browser_client.dart'; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; import 'utils.dart'; diff --git a/test/html/streamed_request_test.dart b/test/html/streamed_request_test.dart index 6496f4b023..24e3471785 100644 --- a/test/html/streamed_request_test.dart +++ b/test/html/streamed_request_test.dart @@ -2,9 +2,10 @@ // 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. +@TestOn("browser") import 'package:http/http.dart' as http; import 'package:http/browser_client.dart'; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; import 'utils.dart'; diff --git a/test/io/client_test.dart b/test/io/client_test.dart index acfa584a3c..0435736e50 100644 --- a/test/io/client_test.dart +++ b/test/io/client_test.dart @@ -2,10 +2,11 @@ // 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. +@TestOn("vm") import 'dart:io'; import 'package:http/http.dart' as http; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; import 'utils.dart'; diff --git a/test/io/http_test.dart b/test/io/http_test.dart index 2419e198ef..b4601af62d 100644 --- a/test/io/http_test.dart +++ b/test/io/http_test.dart @@ -2,8 +2,9 @@ // 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. +@TestOn("vm") import 'package:http/http.dart' as http; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; import 'utils.dart'; diff --git a/test/io/multipart_test.dart b/test/io/multipart_test.dart index 4071dae2eb..b4c3c4e380 100644 --- a/test/io/multipart_test.dart +++ b/test/io/multipart_test.dart @@ -2,12 +2,13 @@ // 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. +@TestOn("vm") import 'dart:async'; import 'dart:io'; import 'package:http/http.dart' as http; import 'package:path/path.dart' as path; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; import 'utils.dart'; diff --git a/test/io/request_test.dart b/test/io/request_test.dart index 5408ba8829..134ca4ab21 100644 --- a/test/io/request_test.dart +++ b/test/io/request_test.dart @@ -2,8 +2,9 @@ // 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. +@TestOn("vm") import 'package:http/http.dart' as http; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; import 'utils.dart'; diff --git a/test/io/streamed_request_test.dart b/test/io/streamed_request_test.dart index cc05bbb0f5..3329be7248 100644 --- a/test/io/streamed_request_test.dart +++ b/test/io/streamed_request_test.dart @@ -2,10 +2,11 @@ // 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. +@TestOn("vm") import 'dart:convert'; import 'package:http/http.dart' as http; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; import 'utils.dart'; diff --git a/test/io/utils.dart b/test/io/utils.dart index 4594b6e5a8..12653a7aba 100644 --- a/test/io/utils.dart +++ b/test/io/utils.dart @@ -8,7 +8,7 @@ import 'dart:io'; import 'package:http/http.dart'; import 'package:http/src/utils.dart'; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; export '../utils.dart'; diff --git a/test/mock_client_test.dart b/test/mock_client_test.dart index 84e9af1791..9d05f59a4a 100644 --- a/test/mock_client_test.dart +++ b/test/mock_client_test.dart @@ -8,7 +8,7 @@ import 'dart:convert'; import 'package:http/http.dart' as http; import 'package:http/src/utils.dart'; import 'package:http/testing.dart'; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; import 'utils.dart'; diff --git a/test/multipart_test.dart b/test/multipart_test.dart index c9fcf6b83e..9d4617ffd0 100644 --- a/test/multipart_test.dart +++ b/test/multipart_test.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'package:http/http.dart' as http; import 'package:http_parser/http_parser.dart'; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; import 'utils.dart'; diff --git a/test/request_test.dart b/test/request_test.dart index f2f4c133d9..422ac9b2b0 100644 --- a/test/request_test.dart +++ b/test/request_test.dart @@ -5,7 +5,7 @@ import 'dart:convert'; import 'package:http/http.dart' as http; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; import 'utils.dart'; diff --git a/test/response_test.dart b/test/response_test.dart index 08c4708c38..9c2e872264 100644 --- a/test/response_test.dart +++ b/test/response_test.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:http/http.dart' as http; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; void main() { group('()', () { diff --git a/test/streamed_request_test.dart b/test/streamed_request_test.dart index c7e56e2c64..6a86fcbf8d 100644 --- a/test/streamed_request_test.dart +++ b/test/streamed_request_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:http/http.dart' as http; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; import 'utils.dart'; diff --git a/test/utils.dart b/test/utils.dart index 1bc78f7405..215acf68e7 100644 --- a/test/utils.dart +++ b/test/utils.dart @@ -6,7 +6,7 @@ import 'dart:convert'; import 'package:http/http.dart' as http; import 'package:http_parser/http_parser.dart'; -import 'package:unittest/unittest.dart'; +import 'package:test/test.dart'; /// A dummy URL for constructing requests that won't be sent. Uri get dummyUrl => Uri.parse('http://dartlang.org/');