#126: fixed some tests

jorre127 · jorre127 · commit 30410b74ca95 · 2023-08-30T14:57:35.000+02:00
diff --git a/test/writer/object_model_writer/array/output.txt b/test/writer/object_model_writer/array/output.txt
@@ -6,7 +6,7 @@ part 'person.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class Person {
-  @JsonKey(name: 'info', required: true)
+  @JsonKey(name: 'info', required: true, includeIfNull: false)
   final List<String> info;
 
   const Person({
diff --git a/test/writer/object_model_writer/converter/config.txt b/test/writer/object_model_writer/converter/config.txt
@@ -5,7 +5,7 @@ Person:
     - DateTimeConverter
   properties:
     birthDay:
-      type: DateTime
+      type: DateTime?
 DateTimeConverter:
   path: user/person/
   type: json_converter
diff --git a/test/writer/object_model_writer/converter/output.txt b/test/writer/object_model_writer/converter/output.txt
@@ -8,11 +8,11 @@ part 'person.g.dart';
 @JsonSerializable(explicitToJson: true)
 @DateTimeConverter()
 class Person {
-  @JsonKey(name: 'birthday')
-  final DateTime? birthday;
+  @JsonKey(name: 'birthDay', includeIfNull: false)
+  final DateTime? birthDay;
 
   const Person({
-    this.birthday,
+    this.birthDay,
   });
 
   factory Person.fromJson(Map<String, dynamic> json) => _$PersonFromJson(json);
diff --git a/test/writer/object_model_writer/custom-from-to/config.txt b/test/writer/object_model_writer/custom-from-to/config.txt
@@ -2,7 +2,7 @@ Person:
   path: user/person/
   type: object
   properties:
-    time: Time
+    time: Time?
 Time:
   path: user/person/
   type: custom_from_to_json
diff --git a/test/writer/object_model_writer/default-field-required-null-disallowed/config.txt b/test/writer/object_model_writer/default-field-required-null-disallowed/config.txt
@@ -5,5 +5,5 @@ Person:
     firstName:
       description: A good description
       type: String
-      default_field: "'test'"
+      default_value: "'test'"
       disallow_null: true
diff --git a/test/writer/object_model_writer/default-field-required-null-disallowed/output.txt b/test/writer/object_model_writer/default-field-required-null-disallowed/output.txt
@@ -7,7 +7,7 @@ part 'person.g.dart';
 @JsonSerializable(explicitToJson: true)
 class Person {
   ///A good description
-  @JsonKey(name: 'firstName', required: false, disallowNullValue: true)
+  @JsonKey(name: 'firstName', required: false, disallowNullValue: true, includeIfNull: false)
   final String firstName;
 
   const Person({
diff --git a/test/writer/object_model_writer/default-field-required/config.txt b/test/writer/object_model_writer/default-field-required/config.txt
@@ -5,4 +5,4 @@ Person:
     firstName:
       description: A good description
       type: String
-      default_field: "'test'"
+      default_value: "'test'"
diff --git a/test/writer/object_model_writer/default-field-required/output.txt b/test/writer/object_model_writer/default-field-required/output.txt
@@ -7,7 +7,7 @@ part 'person.g.dart';
 @JsonSerializable(explicitToJson: true)
 class Person {
   ///A good description
-  @JsonKey(name: 'firstName', required: false, disallowNullValue: false)
+  @JsonKey(name: 'firstName', required: false, disallowNullValue: false, includeIfNull: false)
   final String firstName;
 
   const Person({
diff --git a/test/writer/object_model_writer/default-field/config.txt b/test/writer/object_model_writer/default-field/config.txt
@@ -4,5 +4,5 @@ Person:
   properties:
     firstName:
       description: A good description
-      type: string
-      default_field: "'test'"
+      type: String?
+      default_value: "'test'"
diff --git a/test/writer/object_model_writer/default-field/output.txt b/test/writer/object_model_writer/default-field/output.txt
@@ -7,7 +7,7 @@ part 'person.g.dart';
 @JsonSerializable(explicitToJson: true)
 class Person {
   ///A good description
-  @JsonKey(name: 'firstName')
+  @JsonKey(name: 'firstName', includeIfNull: false)
   final String? firstName;
 
   const Person({
diff --git a/test/writer/object_model_writer/extend-fields-twice/config.txt b/test/writer/object_model_writer/extend-fields-twice/config.txt
@@ -3,7 +3,7 @@ Admin:
   type: object
   extends: User
   properties:
-    permission: String?
+    permission: String
 
 User:
   path: user/person/
diff --git a/test/writer/object_model_writer/extend-fields/config.txt b/test/writer/object_model_writer/extend-fields/config.txt
@@ -3,7 +3,7 @@ User:
   type: object
   extends: Person
   properties:
-    email: String?
+    email: String
 
 Person:
   path: user/person/
diff --git a/test/writer/object_model_writer/ignore/output.txt b/test/writer/object_model_writer/ignore/output.txt
@@ -6,10 +6,10 @@ part 'person.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class Person {
-  @JsonKey(name: 'firstName', includeFromJson: false, includeToJson: false)
-  final String? firstName;
+  @JsonKey(name: 'firstName', includeIfNull: false, includeFromJson: false, includeToJson: false)
+  String? firstName;
 
-  const Person({
+  Person({
     this.firstName,
   });
 
diff --git a/test/writer/object_model_writer/import_sorting/config.txt b/test/writer/object_model_writer/import_sorting/config.txt
@@ -2,7 +2,7 @@ BModel:
   path: user/b_model/
   type: object
   properties:
-    firstName: AModel?
+    aModel: AModel?
 AModel:
   path: user/a_model/
   type: object
diff --git a/test/writer/object_model_writer/includeFromJson/output.txt b/test/writer/object_model_writer/includeFromJson/output.txt
@@ -6,7 +6,7 @@ part 'person.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class Person {
-  @JsonKey(name: 'firstName', includeFromJson: false)
+  @JsonKey(name: 'firstName', includeIfNull: false, includeFromJson: false)
   final String? firstName;
 
   const Person({
diff --git a/test/writer/object_model_writer/includeToJson-includeFromJson/config.txt b/test/writer/object_model_writer/includeToJson-includeFromJson/config.txt
@@ -5,4 +5,5 @@ Person:
     firstName:
       includeFromJson: false
       includeToJson: false
+      include_if_null: false
       type: String?
diff --git a/test/writer/object_model_writer/includeToJson-includeFromJson/output.txt b/test/writer/object_model_writer/includeToJson-includeFromJson/output.txt
@@ -6,7 +6,7 @@ part 'person.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class Person {
-  @JsonKey(name: 'firstName', includeFromJson: false, includeToJson: false)
+  @JsonKey(name: 'firstName', includeIfNull: false, includeFromJson: false, includeToJson: false)
   final String? firstName;
 
   const Person({
diff --git a/test/writer/object_model_writer/includeToJson/output.txt b/test/writer/object_model_writer/includeToJson/output.txt
@@ -6,7 +6,7 @@ part 'person.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class Person {
-  @JsonKey(name: 'firstName', includeToJson: false)
+  @JsonKey(name: 'firstName', includeIfNull: false, includeToJson: false)
   final String? firstName;
 
   const Person({
diff --git a/test/writer/object_model_writer/map-reference/output.txt b/test/writer/object_model_writer/map-reference/output.txt
@@ -7,7 +7,7 @@ part 'person.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class Person {
-  @JsonKey(name: 'info')
+  @JsonKey(name: 'info', includeIfNull: false)
   final Map<String, Person>? info;
 
   const Person({
diff --git a/test/writer/object_model_writer/non-final/output.txt b/test/writer/object_model_writer/non-final/output.txt
@@ -6,7 +6,7 @@ part 'person.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class Person {
-  @JsonKey(name: 'gender')
+  @JsonKey(name: 'gender', includeIfNull: false)
   String? gender;
 
   Person({
diff --git a/test/writer/object_model_writer/normal-equals-hashcode-empty/output.txt b/test/writer/object_model_writer/normal-equals-hashcode-empty/output.txt
@@ -6,7 +6,7 @@ part 'person.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class Person {
-  @JsonKey(name: 'firstName')
+  @JsonKey(name: 'firstName', includeIfNull: false)
   final String? firstName;
 
   const Person({
diff --git a/test/writer/object_model_writer/normal-equals-hashcode-some-ignored/output.txt b/test/writer/object_model_writer/normal-equals-hashcode-some-ignored/output.txt
@@ -6,7 +6,7 @@ part 'person.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class Person {
-  @JsonKey(name: 'firstName')
+  @JsonKey(name: 'firstName', includeIfNull: false)
   final String? firstName;
   @JsonKey(name: 'lastName')
   final String? lastName;
diff --git a/test/writer/object_model_writer/normal-equals-hashcode/output.txt b/test/writer/object_model_writer/normal-equals-hashcode/output.txt
@@ -6,7 +6,7 @@ part 'person.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class Person {
-  @JsonKey(name: 'firstName')
+  @JsonKey(name: 'firstName', includeIfNull: false)
   final String? firstName;
 
   const Person({
diff --git a/test/writer/object_model_writer/normal-retrofit-compute/output.txt b/test/writer/object_model_writer/normal-retrofit-compute/output.txt
@@ -7,7 +7,7 @@ part 'person.g.dart';
 @JsonSerializable(explicitToJson: true)
 class Person {
   ///A good description
-  @JsonKey(name: 'firstName')
+  @JsonKey(name: 'firstName', includeIfNull: false)
   final String? firstName;
 
   const Person({
diff --git a/test/writer/object_model_writer/normal-static-create/output.txt b/test/writer/object_model_writer/normal-static-create/output.txt
@@ -7,7 +7,7 @@ part 'person.g.dart';
 @JsonSerializable(explicitToJson: true)
 class Person {
   ///A good description
-  @JsonKey(name: 'firstName')
+  @JsonKey(name: 'firstName', includeIfNull: false)
   final String? firstName;
 
   const Person({
diff --git a/test/writer/object_model_writer/normal-with-description/config.txt b/test/writer/object_model_writer/normal-with-description/config.txt
@@ -6,4 +6,4 @@ Person:
     firstName:
       description: A good description
       type: String?
-      default_field: "'test'"
+      default_value: "'test'"
diff --git a/test/writer/object_model_writer/normal-with-description/output.txt b/test/writer/object_model_writer/normal-with-description/output.txt
@@ -8,7 +8,7 @@ part 'person.g.dart';
 @JsonSerializable(explicitToJson: true)
 class Person {
   ///A good description
-  @JsonKey(name: 'firstName')
+  @JsonKey(name: 'firstName', includeIfNull: false)
   final String? firstName;
 
   const Person({
diff --git a/test/writer/object_model_writer/normal/output.txt b/test/writer/object_model_writer/normal/output.txt
@@ -7,7 +7,7 @@ part 'person.g.dart';
 @JsonSerializable(explicitToJson: true)
 class Person {
   ///A good description
-  @JsonKey(name: 'firstName')
+  @JsonKey(name: 'firstName', includeIfNull: false)
   final String? firstName;
 
   const Person({
diff --git a/test/writer/object_model_writer/retrofit-compute-tearoff/output.txt b/test/writer/object_model_writer/retrofit-compute-tearoff/output.txt
@@ -7,7 +7,7 @@ part 'person.g.dart';
 @JsonSerializable(explicitToJson: true)
 class Person {
   ///A good description
-  @JsonKey(name: 'firstName')
+  @JsonKey(name: 'firstName', includeIfNull: false)
   final String? firstName;
 
   const Person({
diff --git a/test/writer/object_model_writer_test.dart b/test/writer/object_model_writer_test.dart
diff --git a/test/writer/writer_test_helper.dart b/test/writer/writer_test_helper.dart
