Reapply "Fix URI encoding/decoding of + and space""

pkg/http/test/http_test.dart

 // Copyright (c) 2012, 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.
 
 library http_test;
 
 import 'dart:io';
 
 import '../../unittest/lib/unittest.dart';
 import '../lib/http.dart' as http;
@@ skipping 38 matching lines @@
         'other-field': 'other value'
       }).transform((response) {
         expect(response.statusCode, equals(200));
         expect(response.body, parse(equals({
           'method': 'POST',
           'path': '/',
           'headers': {
             'content-type': [
               'application/x-www-form-urlencoded; charset=UTF-8'
             ],
-            'content-length': ['42'],
+            'content-length': ['40'],
             'x-random-header': ['Value'],
             'x-other-header': ['Other Value']
           },
-          'body': 'some-field=value&other-field=other%20value'
+          'body': 'some-field=value&other-field=other+value'
         })));
       }), completes);
     });
 
     test('post without fields', () {
       expect(http.post(serverUrl, headers: {
         'X-Random-Header': 'Value',
         'X-Other-Header': 'Other Value',
         'Content-Type': 'text/plain'
       }).transform((response) {
@@ skipping 20 matching lines @@
         'other-field': 'other value'
       }).transform((response) {
         expect(response.statusCode, equals(200));
         expect(response.body, parse(equals({
           'method': 'PUT',
           'path': '/',
           'headers': {
             'content-type': [
               'application/x-www-form-urlencoded; charset=UTF-8'
             ],
-            'content-length': ['42'],
+            'content-length': ['40'],
             'x-random-header': ['Value'],
             'x-other-header': ['Other Value']
           },
-          'body': 'some-field=value&other-field=other%20value'
+          'body': 'some-field=value&other-field=other+value'
         })));
       }), completes);
     });
 
     test('put without fields', () {
       expect(http.put(serverUrl, headers: {
         'X-Random-Header': 'Value',
         'X-Other-Header': 'Other Value',
         'Content-Type': 'text/plain'
       }).transform((response) {
@@ skipping 63 matching lines @@
           'x-other-header': ['Other Value']
         },
       }))));
     });
 
     test('readBytes throws an error for a 4** status code', () {
       expect(http.readBytes(serverUrl.resolve('/error')), throwsHttpException);
     });
   });
 }