commit 179b2645f09cd3a30a6d09622eb8e07116050bcb
author floitsch@google.com <floitsch@google.com> Wed Aug 28 14:05:11 2013 +0000
committer floitsch@google.com <floitsch@google.com> Wed Aug 28 14:05:11 2013 +0000
tree 44855e70d08290db36bb0c9ee6ea0d3675b720c2
parent 5c217252663428f18529bd3eed7bf655885dcce1

Remove usage of dart:json.

R=jmesserly@google.com, lrn@google.com, nweiz@google.com, rnystrom@google.com

Review URL: https://codereview.chromium.org//23596007

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart/pkg/http@26789 260f80e4-7a28-3924-810f-c04153c831b5

lib/testing.dart

diff --git a/lib/testing.dart b/lib/testing.dart
index 9fe7b06..45d2c61 100644
--- a/lib/testing.dart
+++ b/lib/testing.dart
@@ -8,14 +8,14 @@
 /// allows test code to set up a local request handler in order to fake a server
 /// that responds to HTTP requests:
 ///
-///     import 'dart:json' as json;
+///     import 'dart:convert';
 ///     import 'package:http/testing.dart';
 ///
 ///     var client = new MockClient((request) {
 ///       if (request.url.path != "/data.json") {
 ///         return new Response("", 404);
 ///       }
-///       return new Response(json.stringify({
+///       return new Response(JSON.encode({
 ///         'numbers': [1, 4, 15, 19, 214]
 ///       }, 200, headers: {
 ///         'content-type': 'application/json'

test/mock_client_test.dart

diff --git a/test/mock_client_test.dart b/test/mock_client_test.dart
index 997f0bb..07066ec 100644
--- a/test/mock_client_test.dart
+++ b/test/mock_client_test.dart
@@ -5,7 +5,7 @@
 library mock_client_test;
 
 import 'dart:async';
-import 'dart:json' as json;
+import 'dart:convert';
 
 import 'package:http/http.dart' as http;
 import 'package:http/src/utils.dart';
@@ -18,7 +18,7 @@
   test('handles a request', () {
     var client = new MockClient((request) {
       return new Future.value(new http.Response(
-          json.stringify(request.bodyFields), 200,
+          JSON.encode(request.bodyFields), 200,
           request: request, headers: {'content-type': 'application/json'}));
     });
 

test/utils.dart

diff --git a/test/utils.dart b/test/utils.dart
index 7b42bec..f9a7381 100644
--- a/test/utils.dart
+++ b/test/utils.dart
@@ -7,7 +7,6 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'dart:json' as json;
 
 import 'package:http/src/byte_stream.dart';
 import 'package:http/src/utils.dart';
@@ -96,7 +95,7 @@
           content['headers'][name] = values;
         });
 
-        var body = json.stringify(content);
+        var body = JSON.encode(content);
         response.contentLength = body.length;
         response.write(body);
         response.close();
@@ -154,7 +153,7 @@
 
     var parsed;
     try {
-      parsed = json.parse(item);
+      parsed = JSON.decode(item);
     } catch (e) {
       return false;
     }