Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Side by Side Diff: pkg/http/test/utils.dart

Issue 23596007: Remove usage of dart:json. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Rebase. Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 library test_utils; 5 library test_utils;
6 6
7 import 'dart:async'; 7 import 'dart:async';
8 import 'dart:convert'; 8 import 'dart:convert';
9 import 'dart:io'; 9 import 'dart:io';
10 import 'dart:json' as json;
11 10
12 import 'package:http/src/byte_stream.dart'; 11 import 'package:http/src/byte_stream.dart';
13 import 'package:http/src/utils.dart'; 12 import 'package:http/src/utils.dart';
14 import 'package:unittest/unittest.dart'; 13 import 'package:unittest/unittest.dart';
15 14
16 import 'safe_http_server.dart'; 15 import 'safe_http_server.dart';
17 16
18 /// The current server instance. 17 /// The current server instance.
19 HttpServer _server; 18 HttpServer _server;
20 19
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 }; 88 };
90 if (requestBody != null) content['body'] = requestBody; 89 if (requestBody != null) content['body'] = requestBody;
91 request.headers.forEach((name, values) { 90 request.headers.forEach((name, values) {
92 // These headers are automatically generated by dart:io, so we don't 91 // These headers are automatically generated by dart:io, so we don't
93 // want to test them here. 92 // want to test them here.
94 if (name == 'cookie' || name == 'host') return; 93 if (name == 'cookie' || name == 'host') return;
95 94
96 content['headers'][name] = values; 95 content['headers'][name] = values;
97 }); 96 });
98 97
99 var body = json.stringify(content); 98 var body = JSON.encode(content);
100 response.contentLength = body.length; 99 response.contentLength = body.length;
101 response.write(body); 100 response.write(body);
102 response.close(); 101 response.close();
103 }); 102 });
104 }); 103 });
105 }); 104 });
106 } 105 }
107 106
108 /// Stops the current HTTP server. 107 /// Stops the current HTTP server.
109 void stopServer() { 108 void stopServer() {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 class _Parse extends Matcher { 146 class _Parse extends Matcher {
148 final Matcher _matcher; 147 final Matcher _matcher;
149 148
150 _Parse(this._matcher); 149 _Parse(this._matcher);
151 150
152 bool matches(item, Map matchState) { 151 bool matches(item, Map matchState) {
153 if (item is! String) return false; 152 if (item is! String) return false;
154 153
155 var parsed; 154 var parsed;
156 try { 155 try {
157 parsed = json.parse(item); 156 parsed = JSON.decode(item);
158 } catch (e) { 157 } catch (e) {
159 return false; 158 return false;
160 } 159 }
161 160
162 return _matcher.matches(parsed, matchState); 161 return _matcher.matches(parsed, matchState);
163 } 162 }
164 163
165 Description describe(Description description) { 164 Description describe(Description description) {
166 return description.add('parses to a value that ') 165 return description.add('parses to a value that ')
167 .addDescriptionOf(_matcher); 166 .addDescriptionOf(_matcher);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 const isSocketException = const _SocketException(); 199 const isSocketException = const _SocketException();
201 200
202 /// A matcher for functions that throw SocketException. 201 /// A matcher for functions that throw SocketException.
203 const Matcher throwsSocketException = 202 const Matcher throwsSocketException =
204 const Throws(isSocketException); 203 const Throws(isSocketException);
205 204
206 class _SocketException extends TypeMatcher { 205 class _SocketException extends TypeMatcher {
207 const _SocketException() : super("SocketException"); 206 const _SocketException() : super("SocketException");
208 bool matches(item, Map matchState) => item is SocketException; 207 bool matches(item, Map matchState) => item is SocketException;
209 } 208 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698