New infra package to share code across the mono repo

kevmoo · kevmoo · commit 41b5a279ac8f · 2022-02-03T14:41:13.000-08:00
And migrate last test in _test_yaml to null-safety
diff --git a/_test_yaml/pubspec.yaml b/_test_yaml/pubspec.yaml
@@ -5,6 +5,8 @@ environment:
   sdk: '>=2.14.0 <3.0.0'
 
 dev_dependencies:
+  _json_serial_shared_test:
+    path: ../shared_test
   build_runner: ^2.0.0
   build_verify: ^3.0.0
   checked_yaml: any
diff --git a/_test_yaml/test/src/build_config.dart b/_test_yaml/test/src/build_config.dart
@@ -12,7 +12,7 @@ class Config {
   final Map<String, Builder> builders;
 
   // Verifying enum keys in map
-  Map<AutoApply, int>? weights;
+  Map<AutoApply, int?>? weights;
 
   Config({required this.builders});
 
@@ -29,7 +29,7 @@ class Config {
 class Builder {
   final String? target;
 
-  final String import;
+  final String? import;
 
   @JsonKey(name: 'is_optional')
   final bool? isOptional;
@@ -58,7 +58,7 @@ class Builder {
   final Map<String, List<String>>? buildExtensions;
 
   Builder({
-    required this.import,
+    this.import,
     this.target,
     this.isOptional,
     this.autoApply,
diff --git a/_test_yaml/test/src/build_config.g.dart b/_test_yaml/test/src/build_config.g.dart
diff --git a/_test_yaml/test/yaml_test.dart b/_test_yaml/test/yaml_test.dart
@@ -2,12 +2,10 @@
 // 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.
 
-// @dart=2.9
-
 @TestOn('vm')
-import 'dart:convert';
 import 'dart:io';
 
+import 'package:_json_serial_shared_test/shared_test.dart';
 import 'package:checked_yaml/checked_yaml.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:path/path.dart' as p;
@@ -159,38 +157,3 @@ line 4, column 21 of file.yaml: Unsupported value for "configLocation". Illegal
   │                     ^^^^^^^^^^^^^^^^^^^^^^^
   ╵'''
 };
-
-T roundTripObject<T>(
-  T object,
-  T Function(Map<String, dynamic> json) factory, {
-  bool skipObjectEquals = false,
-}) {
-  final data = loudEncode(object);
-
-  final object2 = factory(json.decode(data) as Map<String, dynamic>);
-
-  if (!skipObjectEquals) {
-    expect(object2, equals(object));
-  }
-
-  final json2 = loudEncode(object2);
-
-  expect(json2, equals(data));
-  return object2;
-}
-
-/// Prints out nested causes before throwing `JsonUnsupportedObjectError`.
-String loudEncode(Object object) {
-  try {
-    return const JsonEncoder.withIndent(' ').convert(object);
-  } on JsonUnsupportedObjectError catch (e) // ignore: avoid_catching_errors
-  {
-    var error = e;
-    do {
-      final cause = error.cause;
-      print(cause);
-      error = (cause is JsonUnsupportedObjectError) ? cause : null;
-    } while (error != null);
-    rethrow;
-  }
-}
diff --git a/json_serializable/pubspec.yaml b/json_serializable/pubspec.yaml
@@ -25,12 +25,13 @@ dependencies:
   source_helper: ^1.3.0
 
 dev_dependencies:
+  _json_serial_shared_test:
+    path: ../shared_test
   build_runner: ^2.0.0
   build_verify: ^3.0.0
   dart_style: ^2.0.0
   logging: ^1.0.0
   source_gen_test: ^1.0.0
-  stack_trace: ^1.10.0
   test: ^1.16.0
   test_descriptor: ^2.0.0
   test_process: ^2.0.0
diff --git a/json_serializable/test/generic_files/generic_argument_factories_nullable.dart b/json_serializable/test/generic_files/generic_argument_factories_nullable.dart
@@ -2,8 +2,6 @@
 // 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.
 
-// @dart=2.12
-
 import 'package:json_annotation/json_annotation.dart';
 
 part 'generic_argument_factories_nullable.g.dart';
diff --git a/json_serializable/test/generic_files/generic_argument_factories_nullable.g.dart b/json_serializable/test/generic_files/generic_argument_factories_nullable.g.dart
diff --git a/json_serializable/test/generic_files/generic_test.dart b/json_serializable/test/generic_files/generic_test.dart
@@ -318,7 +318,7 @@ void main() {
   });
 
   test('issue 980 regression test', () {
-    validateRoundTrip(
+    roundTripObject(
       Issue980ParentClass([
         Issue980GenericClass(45),
         Issue980GenericClass(42),
diff --git a/json_serializable/test/integration/integration_test.dart b/json_serializable/test/integration/integration_test.dart
@@ -16,7 +16,7 @@ Matcher _throwsArgumentError(matcher) =>
 void main() {
   group('Person', () {
     void roundTripPerson(Person p) {
-      validateRoundTrip(p, (json) => Person.fromJson(json));
+      roundTripObject(p, (json) => Person.fromJson(json));
     }
 
     test('now', () {
@@ -50,7 +50,7 @@ void main() {
 
   group('Order', () {
     void roundTripOrder(Order p) {
-      validateRoundTrip(p, (json) => Order.fromJson(json));
+      roundTripObject(p, (json) => Order.fromJson(json));
     }
 
     test('null', () {
@@ -190,7 +190,7 @@ void main() {
 
   group('Item', () {
     void roundTripItem(Item p) {
-      validateRoundTrip(p, (json) => Item.fromJson(json));
+      roundTripObject(p, (json) => Item.fromJson(json));
     }
 
     test('empty json', () {
@@ -231,7 +231,7 @@ void main() {
 
   group('Numbers', () {
     void roundTripNumber(Numbers p) {
-      validateRoundTrip(p, (json) => Numbers.fromJson(json));
+      roundTripObject(p, (json) => Numbers.fromJson(json));
     }
 
     test('simple', () {
@@ -276,7 +276,7 @@ void main() {
       ..intIntMap = {3: 3}
       ..uriIntMap = {Uri.parse('https://example.com'): 4};
 
-    validateRoundTrip(instance, (j) => MapKeyVariety.fromJson(j));
+    roundTripObject(instance, (j) => MapKeyVariety.fromJson(j));
   });
 
   test('UnknownEnumValue', () {
@@ -296,7 +296,7 @@ void main() {
   test('PrivateConstructor', () {
     final value = PrivateConstructor('test');
 
-    validateRoundTrip(value, (json) => PrivateConstructor.fromJson(json));
+    roundTripObject(value, (json) => PrivateConstructor.fromJson(json));
   });
 
   test('enum helpers', () {
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink_test.dart b/json_serializable/test/kitchen_sink/kitchen_sink_test.dart
@@ -84,7 +84,7 @@ void _nonNullableTests(KitchenSinkFactory factory) {
 
 void _nullableTests(KitchenSinkFactory factory) {
   void roundTripSink(KitchenSink p) {
-    validateRoundTrip(p, factory.fromJson);
+    roundTripObject(p, factory.fromJson);
   }
 
   test('nullable values are allowed in the nullable version', () {
@@ -180,7 +180,7 @@ void _sharedTests(KitchenSinkFactory factory) {
 
   test('empty', () {
     final item = factory.ctor();
-    validateRoundTrip(item, factory.fromJson);
+    roundTripObject(item, factory.fromJson);
   });
 
   test('list and map of DateTime - not null', () {
@@ -189,7 +189,7 @@ void _sharedTests(KitchenSinkFactory factory) {
       ..dateTimeList = <DateTime>[now, now]
       ..objectDateTimeMap = <Object, DateTime>{'value': now};
 
-    validateRoundTrip(item, factory.fromJson);
+    roundTripObject(item, factory.fromJson);
   });
 
   test('complex nested type - not null', () {
@@ -207,7 +207,7 @@ void _sharedTests(KitchenSinkFactory factory) {
           }
         }
       ];
-    validateRoundTrip(item, factory.fromJson);
+    roundTripObject(item, factory.fromJson);
   });
 
   test('round trip valid, empty values', () {
@@ -226,7 +226,7 @@ void _sharedTests(KitchenSinkFactory factory) {
 
     final validInstance = factory.fromJson(values);
 
-    validateRoundTrip(validInstance, factory.fromJson);
+    roundTripObject(validInstance, factory.fromJson);
   });
 
   test('JSON keys should be defined in field/property order', () {
@@ -240,7 +240,7 @@ void _sharedTests(KitchenSinkFactory factory) {
 
   test('valid values round-trip - json', () {
     final validInstance = factory.fromJson(validValues);
-    validateRoundTrip(validInstance, factory.fromJson);
+    roundTripObject(validInstance, factory.fromJson);
   });
 }
 
diff --git a/json_serializable/test/test_utils.dart b/json_serializable/test/test_utils.dart
@@ -2,60 +2,14 @@
 // 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.
 
-import 'dart:convert';
-
 import 'package:collection/collection.dart';
-import 'package:stack_trace/stack_trace.dart';
 import 'package:test/test.dart';
 
+export 'package:_json_serial_shared_test/shared_test.dart';
+
 final throwsTypeError = throwsA(isTypeError);
 
 final isTypeError = isA<TypeError>();
 
 bool deepEquals(dynamic a, dynamic b) =>
     const DeepCollectionEquality().equals(a, b);
-
-void validateRoundTrip<T>(
-  T object,
-  T Function(Map<String, dynamic> json) factory,
-) {
-  final data = loudEncode(object);
-
-  final object2 = factory(json.decode(data) as Map<String, dynamic>);
-
-  expect(object2, equals(object));
-
-  final json2 = loudEncode(object2);
-
-  expect(json2, equals(data));
-}
-
-/// Prints out nested causes before throwing `JsonUnsupportedObjectError`.
-String loudEncode(Object? object) {
-  try {
-    return const JsonEncoder.withIndent(' ').convert(object);
-  } catch (e) {
-    if (e is JsonUnsupportedObjectError) {
-      Object? error = e;
-
-      var count = 1;
-
-      while (error is JsonUnsupportedObjectError) {
-        print(
-          '(${count++}) $error ${error.unsupportedObject} '
-          '(${error.unsupportedObject.runtimeType}) !!!',
-        );
-        print(Trace.from(error.stackTrace!).terse);
-        error = error.cause;
-      }
-
-      if (error != null) {
-        print('(${count++}) $error ???');
-        if (error is Error) {
-          print(Trace.from(error.stackTrace!).terse);
-        }
-      }
-    }
-    rethrow;
-  }
-}
diff --git a/shared_test/lib/shared_test.dart b/shared_test/lib/shared_test.dart
@@ -0,0 +1,53 @@
+import 'dart:convert';
+
+import 'package:stack_trace/stack_trace.dart';
+import 'package:test/test.dart';
+
+/// Prints out nested causes before throwing `JsonUnsupportedObjectError`.
+String loudEncode(Object? object) {
+  try {
+    return const JsonEncoder.withIndent(' ').convert(object);
+  } catch (e) {
+    if (e is JsonUnsupportedObjectError) {
+      Object? error = e;
+
+      var count = 1;
+
+      while (error is JsonUnsupportedObjectError) {
+        print(
+          '(${count++}) $error ${error.unsupportedObject} '
+          '(${error.unsupportedObject.runtimeType}) !!!',
+        );
+        print(Trace.from(error.stackTrace!).terse);
+        error = error.cause;
+      }
+
+      if (error != null) {
+        print('(${count++}) $error ???');
+        if (error is Error) {
+          print(Trace.from(error.stackTrace!).terse);
+        }
+      }
+    }
+    rethrow;
+  }
+}
+
+T roundTripObject<T>(
+  T object,
+  T Function(Map<String, dynamic> json) factory, {
+  bool skipObjectEquals = false,
+}) {
+  final data = loudEncode(object);
+
+  final object2 = factory(json.decode(data) as Map<String, dynamic>);
+
+  if (!skipObjectEquals) {
+    expect(object2, equals(object));
+  }
+
+  final json2 = loudEncode(object2);
+
+  expect(json2, equals(data));
+  return object2;
+}
diff --git a/shared_test/pubspec.yaml b/shared_test/pubspec.yaml
@@ -0,0 +1,8 @@
+name: _json_serial_shared_test
+publish_to: none
+environment:
+  sdk: '>=2.14.0 <3.0.0'
+
+dependencies:
+  stack_trace: ^1.10.0
+  test: ^1.6.0
