#126: more test fixes

Author: jorre127

test/writer/object_model_writer/custom-from-to/output.txt

@@ -8,9 +8,9 @@ part 'person.g.dart';
 @JsonSerializable(explicitToJson: true)
 class Person {
   @JsonKey(name: 'time', fromJson: handleTimeFromJson, toJson: handleTimeToJson)
-  Time? time;
+  final Time? time;
 
-  Person({
+  const Person({
     this.time,
   });
 

test/writer/object_model_writer/extend-fields-twice/output.txt

@@ -12,11 +12,11 @@ class Admin extends User {
 
   const Admin({
     required this.permission,
-    required String name,
-    required String email,
+    String? email,
+    String? name,
   }) : super(
-          name: name,
           email: email,
+          name: name,
         );
 
   factory Admin.fromJson(Map<String, dynamic> json) => _$AdminFromJson(json);

test/writer/object_model_writer/extend-fields-with-non-dart-type/config.txt

@@ -3,7 +3,7 @@ User:
   type: object
   extends: Person
   properties:
-    email: String?
+    email: String
 
 Person:
   path: user/person/

test/writer/object_model_writer/extend-fields/config.txt

@@ -1,12 +1,10 @@
 User:
   path: user/person/
-  type: object
   extends: Person
   properties:
     email: String
 
 Person:
   path: user/person/
-  type: object
   properties:
-    name: String?
+    name: String

test/writer/object_model_writer/unknown-enum-value/config.txt

@@ -2,9 +2,10 @@ Person:
   path: user/person/
   type: object
   properties:
-    firstName:
+    gender:
       include_if_null: false
-      type: String?
+      unknown_enum_value: X
+      type: Gender
 Gender:
   path: user/person/
   type: enum

test/writer/object_model_writer/unknown-enum-value/output.txt

@@ -7,7 +7,7 @@ part 'person.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class Person {
-  @JsonKey(name: 'gender', required: true, unknownEnumValue: Gender.X)
+  @JsonKey(name: 'gender', required: true, includeIfNull: false, unknownEnumValue: Gender.X)
   final Gender gender;
 
   const Person({

test/writer/object_model_writer_test.dart

@@ -2,7 +2,9 @@ import 'dart:io';
 
 import 'package:model_generator/config/pubspec_config.dart';
 import 'package:model_generator/config/yml_generator_config.dart';
+import 'package:model_generator/model/field.dart';
 import 'package:model_generator/model/model/object_model.dart';
+import 'package:model_generator/util/list_extensions.dart';
 import 'package:model_generator/writer/object_model_writer.dart';
 import 'package:test/test.dart';
 
@@ -20,8 +22,14 @@ void main() {
     if (jsonModel is! ObjectModel) {
       throw Exception('The first model in the config file must be an object model and will be validated. The model is ${ymlConfig.models.first.runtimeType}');
     }
-
-    final generateActual = ObjectModelWriter(pubspecConfig, jsonModel, [], ymlConfig).write;
+    final extendsModelfields = <Field>[];
+    var extendsModelextends = jsonModel.extendsModel;
+    while (extendsModelextends != null) {
+      final extendsModelextendsModel = ymlConfig.models.firstWhereOrNull((element) => element.name == extendsModelextends) as ObjectModel?; // ignore: avoid_as
+      extendsModelfields.addAll(extendsModelextendsModel?.fields ?? []);
+      extendsModelextends = extendsModelextendsModel?.extendsModel;
+    }
+    final generateActual = ObjectModelWriter(pubspecConfig, jsonModel, extendsModelfields, ymlConfig).write;
     if (expected.startsWith('Exception')) {
       expect(generateActual, throwsA(isA<Exception>()));
     } else {