test cleanup

Author: kevmoo

json_serializable/test/generic_files/generic_test.dart

@@ -318,7 +318,7 @@ void main() {
   });
 
   test('issue 980 regression test', () {
-    roundTripObject(
+    validateRoundTrip(
       Issue980ParentClass([
         Issue980GenericClass(45),
         Issue980GenericClass(42),

json_serializable/test/integration/integration_test.dart

@@ -14,7 +14,7 @@ Matcher _throwsArgumentError(matcher) =>
 void main() {
   group('Person', () {
     void roundTripPerson(Person p) {
-      roundTripObject(p, (json) => Person.fromJson(json));
+      validateRoundTrip(p, (json) => Person.fromJson(json));
     }
 
     test('now', () {
@@ -48,7 +48,7 @@ void main() {
 
   group('Order', () {
     void roundTripOrder(Order p) {
-      roundTripObject(p, (json) => Order.fromJson(json));
+      validateRoundTrip(p, (json) => Order.fromJson(json));
     }
 
     test('null', () {
@@ -187,7 +187,7 @@ void main() {
 
   group('Item', () {
     void roundTripItem(Item p) {
-      roundTripObject(p, (json) => Item.fromJson(json));
+      validateRoundTrip(p, (json) => Item.fromJson(json));
     }
 
     test('empty json', () {
@@ -228,7 +228,7 @@ void main() {
 
   group('Numbers', () {
     void roundTripNumber(Numbers p) {
-      roundTripObject(p, (json) => Numbers.fromJson(json));
+      validateRoundTrip(p, (json) => Numbers.fromJson(json));
     }
 
     test('simple', () {
@@ -273,10 +273,7 @@ void main() {
       ..intIntMap = {3: 3}
       ..uriIntMap = {Uri.parse('https://example.com'): 4};
 
-    final roundTrip =
-        roundTripObject(instance, (j) => MapKeyVariety.fromJson(j));
-
-    expect(roundTrip, instance);
+    validateRoundTrip(instance, (j) => MapKeyVariety.fromJson(j));
   });
 
   test('UnknownEnumValue', () {

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) {
-    roundTripObject(p, factory.fromJson);
+    validateRoundTrip(p, factory.fromJson);
   }
 
   test('nullable values are allowed in the nullable version', () {
@@ -164,7 +164,7 @@ void _nullableTests(KitchenSinkFactory factory) {
 void _sharedTests(KitchenSinkFactory factory) {
   test('empty', () {
     final item = factory.ctor();
-    roundTripObject(item, factory.fromJson);
+    validateRoundTrip(item, factory.fromJson);
   });
 
   test('list and map of DateTime - not null', () {
@@ -173,7 +173,7 @@ void _sharedTests(KitchenSinkFactory factory) {
       ..dateTimeList = <DateTime>[now, now]
       ..objectDateTimeMap = <Object, DateTime>{'value': now};
 
-    roundTripObject(item, factory.fromJson);
+    validateRoundTrip(item, factory.fromJson);
   });
 
   test('complex nested type - not null', () {
@@ -191,7 +191,7 @@ void _sharedTests(KitchenSinkFactory factory) {
           }
         }
       ];
-    roundTripObject(item, factory.fromJson);
+    validateRoundTrip(item, factory.fromJson);
   });
 
   test('round trip valid, empty values', () {
@@ -210,7 +210,7 @@ void _sharedTests(KitchenSinkFactory factory) {
 
     final validInstance = factory.fromJson(values);
 
-    roundTripObject(validInstance, factory.fromJson);
+    validateRoundTrip(validInstance, factory.fromJson);
   });
 
   test('JSON keys should be defined in field/property order', () {
@@ -224,7 +224,7 @@ void _sharedTests(KitchenSinkFactory factory) {
 
   test('valid values round-trip - json', () {
     final validInstance = factory.fromJson(validValues);
-    roundTripObject(validInstance, factory.fromJson);
+    validateRoundTrip(validInstance, factory.fromJson);
   });
 }
 

json_serializable/test/test_utils.dart

@@ -15,7 +15,10 @@ final isTypeError = isA<TypeError>();
 bool deepEquals(dynamic a, dynamic b) =>
     const DeepCollectionEquality().equals(a, b);
 
-T roundTripObject<T>(T object, T Function(Map<String, dynamic> json) factory) {
+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>);
@@ -25,7 +28,6 @@ T roundTripObject<T>(T object, T Function(Map<String, dynamic> json) factory) {
   final json2 = loudEncode(object2);
 
   expect(json2, equals(data));
-  return object2;
 }
 
 /// Prints out nested causes before throwing `JsonUnsupportedObjectError`.