General cleanup (#814)

google · Mar 1, 2021 · 0dd731c · 0dd731c
1 parent af82671
commit 0dd731c
Show file tree

Hide file tree

Showing 24 changed files with 78 additions and 56 deletions.
diff --git a/_test_yaml/test/yaml_test.dart b/_test_yaml/test/yaml_test.dart
@@ -160,9 +160,6 @@ line 4, column 21 of file.yaml: Unsupported value for "configLocation". Illegal
   ╵'''
 };
 
-// ignore: deprecated_member_use
-final throwsCastError = throwsA(isA<CastError>());
-
 T roundTripObject<T>(
   T object,
   T Function(Map<String, dynamic> json) factory, {

diff --git a/example/test/json_convert_example_test.dart b/example/test/json_convert_example_test.dart
@@ -67,17 +67,20 @@ void main() {
     final encoded = _encode(collection);
 
     expect(
-        () => GenericCollection<CustomResult>.fromJson(
-            jsonDecode(encoded) as Map<String, dynamic>),
-        _throwsCastError);
+      () => GenericCollection<CustomResult>.fromJson(
+          jsonDecode(encoded) as Map<String, dynamic>),
+      _throwsTypeError,
+    );
     expect(
-        () => GenericCollection<int>.fromJson(
-            jsonDecode(encoded) as Map<String, dynamic>),
-        _throwsCastError);
+      () => GenericCollection<int>.fromJson(
+          jsonDecode(encoded) as Map<String, dynamic>),
+      _throwsTypeError,
+    );
     expect(
-        () => GenericCollection<String>.fromJson(
-            jsonDecode(encoded) as Map<String, dynamic>),
-        _throwsCastError);
+      () => GenericCollection<String>.fromJson(
+          jsonDecode(encoded) as Map<String, dynamic>),
+      _throwsTypeError,
+    );
 
     final collection2 =
         GenericCollection.fromJson(jsonDecode(encoded) as Map<String, dynamic>);
@@ -96,8 +99,7 @@ void main() {
   });
 }
 
-// ignore: deprecated_member_use
-final _throwsCastError = throwsA(isA<CastError>());
+final _throwsTypeError = throwsA(isA<TypeError>());
 
 String _encode(Object object) =>
     const JsonEncoder.withIndent(' ').convert(object);
diff --git a/json_serializable/test/generic_files/generic_test.dart b/json_serializable/test/generic_files/generic_test.dart
@@ -42,15 +42,16 @@ void main() {
     });
     test('with bad arguments', () {
       expect(
-          () => GenericClass<double, String>()
-            ..fieldT = (true as dynamic) as double,
-          throwsCastError);
+        () => GenericClass<double, String>()
+          ..fieldT = (true as dynamic) as double,
+        throwsTypeError,
+      );
     });
     test('with bad arguments', () {
       expect(
-          () =>
-              GenericClass<double, String>()..fieldS = (5 as dynamic) as String,
-          throwsCastError);
+        () => GenericClass<double, String>()..fieldS = (5 as dynamic) as String,
+        throwsTypeError,
+      );
     });
   });
 

diff --git a/json_serializable/test/integration/integration_test.dart b/json_serializable/test/integration/integration_test.dart
@@ -248,7 +248,7 @@ void main() {
         'ints': [3.14, 0],
       };
 
-      expect(() => Numbers.fromJson(value), throwsCastError);
+      expect(() => Numbers.fromJson(value), throwsTypeError);
     });
   });
 

diff --git a/json_serializable/test/kitchen_sink/kitchen_sink_test.dart b/json_serializable/test/kitchen_sink/kitchen_sink_test.dart
@@ -68,7 +68,7 @@ void _nonNullableTests(KitchenSinkFactory factory) {
     if (factory.checked) {
       matcher = checkedMatcher('set');
     } else {
-      matcher = isA<TypeError>();
+      matcher = isTypeError;
     }
     expect(() => factory.fromJson(<String, dynamic>{}), throwsA(matcher));
   });
@@ -122,7 +122,9 @@ void _nullableTests(KitchenSinkFactory factory) {
         expect(
           encoded,
           containsPair(
-              key, _nonNullableFields.contains(key) ? isNotNull : isNull),
+            key,
+            _nonNullableFields.contains(key) ? isNotNull : isNull,
+          ),
         );
       }
     }
@@ -228,7 +230,7 @@ void _sharedTests(KitchenSinkFactory factory) {
   });
 }
 
-const _nonNullableFields = [
+const _nonNullableFields = {
   'dynamicIterable',
   'objectIterable',
   'intIterable',
@@ -251,11 +253,11 @@ const _nonNullableFields = [
   'val',
   'simpleObject',
   'strictKeysObject'
-];
+};
 
-const _encodedAsMapKeys = ['simpleObject', 'strictKeysObject'];
+const _encodedAsMapKeys = {'simpleObject', 'strictKeysObject'};
 
-const _iterableMapKeys = [
+const _iterableMapKeys = {
   'bigIntMap',
   'crazyComplex',
   'datetime-iterable',
@@ -280,4 +282,4 @@ const _iterableMapKeys = [
   'set',
   'stringStringMap',
   generatedLocalVarName,
-];
+};
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink_test_shared.dart b/json_serializable/test/kitchen_sink/kitchen_sink_test_shared.dart
@@ -70,6 +70,27 @@ const invalidValueTypes = {
   'validatedPropertyNo42': true
 };
 
+const disallowNullKeys = {
+  'set',
+  'dynamicSet',
+  'objectSet',
+  'intSet',
+  'dateTimeSet',
+  'list',
+  'dynamicList',
+  'objectList',
+  'intList',
+  'dateTimeList',
+  'map',
+  'stringStringMap',
+  'dynamicIntMap',
+  'objectDateTimeMap',
+  'crazyComplex',
+  generatedLocalVarName,
+  'simpleObject',
+  'strictKeysObject',
+};
+
 Matcher checkedMatcher(String? expectedKey) => isA<CheckedFromJsonException>()
     .having((e) => e.className, 'className', 'KitchenSink')
     .having((e) => e.key, 'key', expectedKey);

diff --git a/json_serializable/test/kitchen_sink/kitchen_sink_yaml_test.dart b/json_serializable/test/kitchen_sink/kitchen_sink_yaml_test.dart
@@ -28,13 +28,16 @@ void _anyMapTests(KitchenSinkFactory factory) {
     for (final e in invalidValueTypes.entries) {
       _testBadValue(e.key, e.value, factory, false);
     }
+    for (final e in disallowNullKeys) {
+      _testBadValue(e, null, factory, false);
+    }
     for (final e in _invalidCheckedValues.entries) {
       _testBadValue(e.key, e.value, factory, true);
     }
   });
 }
 
-void _testBadValue(String key, Object badValue, KitchenSinkFactory factory,
+void _testBadValue(String key, Object? badValue, KitchenSinkFactory factory,
     bool checkedAssignment) {
   final matcher = _getMatcher(factory.checked, key, checkedAssignment);
 
@@ -65,8 +68,7 @@ Matcher _getMatcher(bool checked, String? expectedKey, bool checkedAssignment) {
     innerMatcher = checkedMatcher(expectedKey);
   } else {
     innerMatcher = anyOf(
-      _isACastError,
-      _isATypeError,
+      isTypeError,
       _isAUnrecognizedKeysException(
         'Unrecognized keys: [invalid_key]; supported keys: '
         '[value, custom_field]',
@@ -86,7 +88,7 @@ Matcher _getMatcher(bool checked, String? expectedKey, bool checkedAssignment) {
           break;
         case 'intIterable':
         case 'datetime-iterable':
-          innerMatcher = _isACastError;
+          innerMatcher = isTypeError;
           break;
         default:
           throw StateError('Not expected! - $expectedKey');
@@ -97,11 +99,6 @@ Matcher _getMatcher(bool checked, String? expectedKey, bool checkedAssignment) {
   return throwsA(innerMatcher);
 }
 
-final _isATypeError = isA<TypeError>();
-
-// ignore: deprecated_member_use
-final _isACastError = isA<CastError>();
-
 Matcher _isAUnrecognizedKeysException(expectedMessage) =>
     isA<UnrecognizedKeysException>()
         .having((e) => e.message, 'message', expectedMessage);

diff --git a/json_serializable/test/supported_types/type_test.bigint_test.dart b/json_serializable/test/supported_types/type_test.bigint_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.bool_test.dart b/json_serializable/test/supported_types/type_test.bool_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.datetime_test.dart b/json_serializable/test/supported_types/type_test.datetime_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.double_test.dart b/json_serializable/test/supported_types/type_test.double_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.duration_test.dart b/json_serializable/test/supported_types/type_test.duration_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.enumtype_test.dart b/json_serializable/test/supported_types/type_test.enumtype_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<ArgumentError>()),
+        throwsArgumentError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.int_test.dart b/json_serializable/test/supported_types/type_test.int_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.iterable_test.dart b/json_serializable/test/supported_types/type_test.iterable_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.list_test.dart b/json_serializable/test/supported_types/type_test.list_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.map_test.dart b/json_serializable/test/supported_types/type_test.map_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.num_test.dart b/json_serializable/test/supported_types/type_test.num_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.object_test.dart b/json_serializable/test/supported_types/type_test.object_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.set_test.dart b/json_serializable/test/supported_types/type_test.set_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.string_test.dart b/json_serializable/test/supported_types/type_test.string_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/supported_types/type_test.uri_test.dart b/json_serializable/test/supported_types/type_test.uri_test.dart
@@ -31,7 +31,7 @@ void main() {
     test('round trip null', () {
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<TypeError>()),
+        throwsTypeError,
       );
     });
 

diff --git a/json_serializable/test/test_utils.dart b/json_serializable/test/test_utils.dart
@@ -9,8 +9,9 @@ import 'dart:convert';
 import 'package:stack_trace/stack_trace.dart';
 import 'package:test/test.dart';
 
-// ignore: deprecated_member_use
-final throwsCastError = throwsA(isA<CastError>());
+final throwsTypeError = throwsA(isTypeError);
+
+final isTypeError = isA<TypeError>();
 
 T roundTripObject<T>(T object, T Function(Map<String, dynamic> json) factory) {
   final data = loudEncode(object);

diff --git a/json_serializable/tool/test_type_data.dart b/json_serializable/tool/test_type_data.dart
@@ -139,7 +139,8 @@ class TestTypeData {
         .replaceAll('non-nullable', 'nullable')
         .replaceAll('SimpleClass', 'SimpleClassNullable');
 
-    final thrownError = type == customEnumType ? 'ArgumentError' : 'TypeError';
+    final thrownError =
+        type == customEnumType ? 'throwsArgumentError' : 'throwsTypeError';
 
     final newGroupContent = groupContent.replaceAll(
       r'''
@@ -154,7 +155,7 @@ class TestTypeData {
       '''
       expect(
         () => loudEncode(SimpleClass.fromJson({})),
-        throwsA(isA<$thrownError>()),
+        $thrownError,
       );''',
     );