Added some tests

cyclosproject · Aug 9, 2019 · 3160d93 · 3160d93
1 parent b77b866
commit 3160d93
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/test/all-types.json b/test/all-types.json
@@ -104,6 +104,9 @@
         "allOf": [
           {
             "type": "object",
+            "required": [
+              "numberProp"
+            ],
             "properties": {
               "stringProp": {
                 "type": "string",
@@ -131,6 +134,10 @@
           },
           {
             "type": "object",
+            "required": [
+              "refEnumProp",
+              "refObjectProp"
+            ],
             "properties": {
               "refEnumProp": {
                 "$ref": "#/components/schemas/RefEnum",

diff --git a/test/all-types.spec.ts b/test/all-types.spec.ts
@@ -131,21 +131,22 @@ describe('Generation tests using all-types.json', () => {
       expect(decl.properties.length).toBe(18);
 
       // Assert the simple types
-      function assertProperty(name: string, type: string) {
+      function assertProperty(name: string, type: string, required = false) {
         const prop = decl.properties.find(p => p.name === name);
         expect(prop).withContext(`${name} property`).toBeDefined();
         if (prop) {
-          expect(prop.type).toEqual(type);
+          expect(prop.type).withContext(`${name} type`).toEqual(type);
+          expect(prop.isOptional).withContext(`${name} required`).toBe(!required);
         }
       }
       assertProperty('stringProp', 'string');
       assertProperty('integerProp', 'number');
-      assertProperty('numberProp', 'number');
+      assertProperty('numberProp', 'number', true);
       assertProperty('booleanProp', 'boolean');
       assertProperty('anyProp', 'any');
 
-      assertProperty('refEnumProp', 'RefEnum');
-      assertProperty('refObjectProp', 'RefObject');
+      assertProperty('refEnumProp', 'RefEnum', true);
+      assertProperty('refObjectProp', 'RefObject', true);
       assertProperty('unionProp', 'Union');
       assertProperty('containerProp', 'Container');
       assertProperty('arrayOfStringsProp', 'Array<string>');