#124: fixed tests

Author: jorre127

test/config/yml_generator_config/object-base-dir.txt

@@ -2,12 +2,6 @@ Person:
   type: object
   base_directory: custom_base_dir
   properties:
-    firstName:
-        required: true
-        type: string
-    lastName:
-        required: true
-        type: string
-    age:
-        required: false
-        type: int
+    firstName: string
+    lastName: string
+    age: int?

test/config/yml_generator_config/object-multiple-fields.txt

@@ -1,12 +1,6 @@
 Person:
   type: object
   properties:
-    firstName:
-        required: true
-        type: string
-    lastName:
-        required: true
-        type: string
-    age:
-        required: false
-        type: int
+    firstName: string
+    lastName: string
+    age: int?

test/writer/model_reader_test.dart

@@ -68,46 +68,27 @@ TestModel:
     });
 
     test('Test required not definable anymore', () {
-      final models = YmlGeneratorConfig(
-              PubspecConfig("name: test"),
-              """
+      dynamic error;
+      try {
+        YmlGeneratorConfig(
+                PubspecConfig("name: test"),
+                """
 TestModel:
   properties:
-    optionalString1:
-        type: String?
+    requiredString:
+        type: String
         required: true
-    optionalString2:
-        type: String?
-    requiredString1:
+    optionalString:
         type: String
         required: false
-    requiredString2:
-        type: String
 """,
-              '')
-          .models;
-
-      expect(models.length, 1);
-      final model = models.first;
-      expect(model is ObjectModel, true);
-      model as ObjectModel;
-
-      final optionalString1 = model.fields.getByName("optionalString1");
-      final requiredString1 = model.fields.getByName("requiredString1");
-      final optionalString2 = model.fields.getByName("optionalString2");
-      final requiredString2 = model.fields.getByName("requiredString2");
-
-      expect(optionalString1.type, isA<StringType>());
-      expect(optionalString1.isRequired, false);
-
-      expect(requiredString1.type, isA<StringType>());
-      expect(requiredString1.isRequired, true);
-
-      expect(optionalString2.type, isA<StringType>());
-      expect(optionalString2.isRequired, false);
+                '')
+            .models;
+      } catch (e) {
+        error = e;
+      }
 
-      expect(requiredString2.type, isA<StringType>());
-      expect(requiredString2.isRequired, true);
+      expect(error, isNotNull);
     });
 
     test('Test List not supported anymore', () {

test/writer/object_model_writer/array/config.txt

@@ -3,7 +3,4 @@ Person:
   type: object
   properties:
     info:
-      required: true
-      type: array
-      items:
-        type: string
+      type: List<String>

test/writer/object_model_writer/converter/config.txt

@@ -5,8 +5,7 @@ Person:
     - DateTimeConverter
   properties:
     birthDay:
-      required: true
-      type: datetime
+      type: DateTime
 DateTimeConverter:
   path: user/person/
   type: json_converter

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

@@ -2,9 +2,7 @@ Person:
   path: user/person/
   type: object
   properties:
-    time:
-      required: true
-      type: Time
+    time: Time
 Time:
   path: user/person/
   type: custom_from_to_json

test/writer/object_model_writer/dart-import/config.txt

@@ -2,14 +2,10 @@ Person:
   path: user/custom_person.dart
   type: object
   properties:
-    address:
-      required: true
-      type: Address
+    address: Address
 
 Address:
   path: user/custom_address.dart
   type: object
   properties:
-    streetName:
-      required: true
-      type: string
+    streetName: String

test/writer/object_model_writer/dart-package-import/config.txt

@@ -2,14 +2,10 @@ Person:
   path: user/custom_person.dart
   type: object
   properties:
-    address:
-      required: true
-      type: Address
+    address: Address
 
 Address:
   path: package:shared/user/custom_address.dart
   type: object
   properties:
-    streetName:
-      required: true
-      type: string
+    streetName: String

test/writer/object_model_writer/default-field-required-null-disallowed/config.txt

@@ -4,7 +4,6 @@ Person:
   properties:
     firstName:
       description: A good description
-      type: string
-      required: true
+      type: String
       default_field: "'test'"
       disallow_null: true

test/writer/object_model_writer/default-field-required/config.txt

@@ -4,6 +4,5 @@ Person:
   properties:
     firstName:
       description: A good description
-      type: string
-      required: true
+      type: String
       default_field: "'test'"

test/writer/object_model_writer/explicit-to-json-false-pubspec/config.txt

@@ -2,5 +2,4 @@ Person:
   path: user/person/
   type: object
   properties:
-    firstName:
-      type: string
+    firstName: String

test/writer/object_model_writer/explicit-to-json-false/config.txt

@@ -3,5 +3,4 @@ Person:
   type: object
   explicit_to_json: false
   properties:
-    firstName:
-      type: string
+    firstName: String

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

@@ -3,20 +3,17 @@ Admin:
   type: object
   extends: User
   properties:
-    permission:
-      type: string
+    permission: String
 
 User:
   path: user/person/
   type: object
   extends: Person
   properties:
-    email:
-      type: string
+    email: String
 
 Person:
   path: user/person/
   type: object
   properties:
-    name:
-      type: string
+    name: String

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

@@ -3,26 +3,18 @@ User:
   type: object
   extends: Person
   properties:
-    email:
-      type: string
+    email: String
 
 Person:
   path: user/person/
   type: object
   properties:
     address:
       type: Address
-    info:
-      type: map
-      required: false
-      items:
-        key: string
-        value: Address
+    info: Map<String, Address>?
 
 Address:
   path: user/custom_address.dart
   type: object
   properties:
-    streetName:
-      required: true
-      type: string
+    streetName: String

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

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

test/writer/object_model_writer/extra-imports-on-model/config.txt

@@ -6,5 +6,4 @@ Person:
   extra_annotations:
     - '@veryGood'
   properties:
-    firstName:
-      type: string
+    firstName: String

test/writer/object_model_writer/extra-imports/config.txt

@@ -2,5 +2,4 @@ Person:
   path: user/person/
   type: object
   properties:
-    firstName:
-      type: string
+    firstName: String

test/writer/object_model_writer/generate-for-generics-override-2/config.txt

@@ -3,6 +3,4 @@ Person:
   type: object
   generate_for_generics: false
   properties:
-    firstName:
-      required: true
-      type: string
+    firstName: String

test/writer/object_model_writer/generate-for-generics-override/config.txt

@@ -3,6 +3,4 @@ Person:
   type: object
   generate_for_generics: true
   properties:
-    firstName:
-      required: true
-      type: string
+    firstName: String

test/writer/object_model_writer/generate-for-generics/config.txt

@@ -2,6 +2,4 @@ Person:
   path: user/person/
   type: object
   properties:
-    firstName:
-      required: true
-      type: string
+    firstName: String

test/writer/object_model_writer/ignore/config.txt

@@ -3,6 +3,5 @@ Person:
   type: object
   properties:
     firstName:
-      required: false
       ignore: true
-      type: string
+      type: String?

test/writer/object_model_writer/import_sorting/config.txt

@@ -2,11 +2,9 @@ BModel:
   path: user/b_model/
   type: object
   properties:
-    firstName:
-      type: AModel
+    firstName: AModel
 AModel:
   path: user/a_model/
   type: object
   properties:
-    firstName:
-      type: string
+    firstName: String

test/writer/object_model_writer/include-if-null/config.txt

@@ -3,6 +3,5 @@ Person:
   type: object
   properties:
     firstName:
-      required: false
       include_if_null: false
-      type: string
+      type: String?

test/writer/object_model_writer/includeFromJson/config.txt

@@ -3,6 +3,5 @@ Person:
   type: object
   properties:
     firstName:
-      required: false
       includeFromJson: false
-      type: string
+      type: String?

test/writer/object_model_writer/includeToJson-includeFromJson/config.txt

@@ -3,7 +3,6 @@ Person:
   type: object
   properties:
     firstName:
-      required: false
       includeFromJson: false
       includeToJson: false
-      type: string
+      type: String?

test/writer/object_model_writer/includeToJson/config.txt

@@ -3,6 +3,5 @@ Person:
   type: object
   properties:
     firstName:
-      required: false
       includeToJson: false
-      type: string
+      type: String?

test/writer/object_model_writer/map-reference/config.txt

@@ -3,8 +3,4 @@ Person:
   type: object
   properties:
     info:
-      required: false
-      type: map
-      items:
-        key: string
-        value: Person
+      type: Map<String, Person>?