Fix JSON tests, re-enable in all cases - 2nd try

tests/lib/convert/json2_test.dart

 // Copyright (c) 2011, 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 json_tests;
-import "package:expect/expect.dart";
+library json2_tests;
+
 import "dart:convert";
-import 'dart:html';
-import '../../pkg/unittest/lib/unittest.dart';
-import '../../pkg/unittest/lib/html_config.dart';
 
-main() {
-  useHtmlConfiguration();
+import 'package:unittest/unittest.dart';
+
+// Moved from "tests/json/json_test.dart"
+
+void main() {
   test('Parse', () {
     // Scalars.
     expect(JSON.decode(' 5 '), equals(5));
     expect(JSON.decode(' -42 '), equals(-42));
     expect(JSON.decode(' 3e0 '), equals(3));
     expect(JSON.decode(' 3.14 '), equals(3.14));
     expect(JSON.decode('true '), isTrue);
     expect(JSON.decode(' false'), isFalse);
     expect(JSON.decode(' null '), isNull);
     expect(JSON.decode('\n\rnull\t'), isNull);
@@ skipping 54 matching lines @@
     expect(JSON.encode(5), equals('5'));
     expect(JSON.encode(-42), equals('-42'));
     // Dart does not guarantee a formatting for doubles,
     // so reparse and compare to the original.
     validateRoundTrip(3.14);
     expect(JSON.encode(true), equals('true'));
     expect(JSON.encode(false), equals('false'));
     expect(JSON.encode(null), equals('null'));
     expect(JSON.encode(' hi there" bob '), equals('" hi there\\" bob "'));
     expect(JSON.encode('hi\\there'), equals('"hi\\\\there"'));
-    // TODO(devoncarew): these tests break the dartium build
-    //expect(JSON.encode('hi\nthere'), equals('"hi\\nthere"'));
-    //expect(JSON.encode('hi\r\nthere'), equals('"hi\\r\\nthere"'));
+    expect(JSON.encode('hi\nthere'), equals('"hi\\nthere"'));
+    expect(JSON.encode('hi\r\nthere'), equals('"hi\\r\\nthere"'));
     expect(JSON.encode(''), equals('""'));
 
     // Lists.
     expect(JSON.encode([]), equals('[]'));
     expect(JSON.encode(new List(0)), equals('[]'));
     expect(JSON.encode(new List(3)), equals('[null,null,null]'));
     validateRoundTrip([3, -4.5, null, true, 'hi', false]);
     expect(JSON.encode([[3], [], [null], ['hi', true]]),
       equals('[[3],[],[null],["hi",true]]'));
 
@@ skipping 11 matching lines @@
     validateRoundTrip({' hi bob ':3, '':4.5});
     validateRoundTrip(
         {'x':{'a':3, 'b':-4.5}, 'y':[{}], 'z':'hi', 'w':{'c':null, 'd':true},
                   'v':null});
 
     expect(JSON.encode(new ToJson(4)), "4");
     expect(JSON.encode(new ToJson([4, "a"])), '[4,"a"]');
     expect(JSON.encode(new ToJson([4, new ToJson({"x":42})])),
            '[4,{"x":42}]');
 
-    Expect.throws(() {
-      JSON.encode([new ToJson(new ToJson(4))]);
-    });
+    expect(() => JSON.encode([new ToJson(new ToJson(4))]), throws);
 
-    Expect.throws(() {
-      JSON.encode([new Object()]);
-    });
-
+    expect(() => JSON.encode([new Object()]), throws);
   });
 
   test('stringify throws if argument cannot be converted', () {
     /**
      * Checks that we get an exception (rather than silently returning null) if
      * we try to stringify something that cannot be converted to json.
      */
     expect(() => JSON.encode(new TestClass()), throws);
   });
 
@@ skipping 21 matching lines @@
 class ToJson {
   final object;
   const ToJson(this.object);
   toJson() => object;
 }
 
 /**
  * Checks that the argument can be converted to a JSON string and
  * back, and produce something equivalent to the argument.
  */
-validateRoundTrip(expected) {
+void validateRoundTrip(expected) {
   expect(JSON.decode(JSON.encode(expected)), equals(expected));
 }