Merge pull request flutter#112 from dart-lang/mit-mit-64bit

Skip 64-bit json test on browser platforms

Author: mit-mit

test/json_test.dart

@@ -4,15 +4,9 @@
 library json_test;
 
 import 'dart:convert';
-import 'package:fixnum/fixnum.dart' show Int64;
 import 'package:test/test.dart';
 
-import 'mock_util.dart' show MockMessage, mockInfo;
-
-class T extends MockMessage {
-  get info_ => _info;
-  static final _info = mockInfo("T", () => new T());
-}
+import 'mock_util.dart' show T;
 
 main() {
   T example = new T()
@@ -40,15 +34,6 @@ main() {
     t.mergeFromJsonMap({"1": 123, "2": "hello"});
     checkMessage(t);
   });
-
-  test('testInt64JsonEncoding', () {
-    final value = new Int64(1234567890123456789);
-    final t = new T()..int64 = value;
-    final encoded = t.writeToJsonMap();
-    expect(encoded["5"], "$value");
-    final decoded = new T()..mergeFromJsonMap(encoded);
-    expect(decoded.int64, value);
-  });
 }
 
 checkJsonMap(Map m) {

test/json_vm_test.dart

@@ -0,0 +1,21 @@
+// VM-specific smoke tests for the GeneratedMessage JSON API.
+//
+// These tests will be skipped on js, as the dart2js platform
+// does not support 64-bit ints.
+@TestOn('!js')
+
+import 'package:fixnum/fixnum.dart' show Int64;
+import 'package:test/test.dart';
+
+import 'mock_util.dart' show T;
+
+main() {
+  test('testInt64JsonEncoding', () {
+    final value = new Int64(1234567890123456789);
+    final t = new T()..int64 = value;
+    final encoded = t.writeToJsonMap();
+    expect(encoded["5"], "$value");
+    final decoded = new T()..mergeFromJsonMap(encoded);
+    expect(decoded.int64, value);
+  });
+}

test/mock_util.dart

@@ -41,3 +41,8 @@ abstract class MockMessage extends GeneratedMessage {
     return create()..mergeFromMessage(this);
   }
 }
+
+class T extends MockMessage {
+  get info_ => _info;
+  static final _info = mockInfo("T", () => new T());
+}