Add test for allOf without object type (OpenAPITools#6042)

* add test for allof without object type * add comments to test cases
MikailBag · May 31, 2020 · 179cc09 · 179cc09
1 parent b32c715
commit 179cc09
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
@@ -611,15 +611,23 @@ public void testAllOfSingleAndDoubleRefWithOwnPropsNoDiscriminator() {
 
         codegen.setOpenAPI(openAPI);
 
+        // to test allOf with double refs
         Schema supermanSchema = openAPI.getComponents().getSchemas().get("SuperMan");
         CodegenModel supermanModel = codegen.fromModel("SuperMan", supermanSchema);
         Assert.assertEquals(supermanModel.parent, null);
         Assert.assertEquals(supermanModel.allParents, null);
 
+        // to test allOf with single ref
         Schema superboySchema = openAPI.getComponents().getSchemas().get("SuperBoy");
         CodegenModel superboyModel = codegen.fromModel("SuperBoy", superboySchema);
         Assert.assertEquals(superboyModel.parent, null);
         Assert.assertEquals(superboyModel.allParents, null);
+
+        // to test allOf with single ref and no "type: object" in the (last) inline schema
+        Schema superbabySchema = openAPI.getComponents().getSchemas().get("SuperBaby");
+        CodegenModel superbabyModel = codegen.fromModel("SuperBaby", superbabySchema);
+        Assert.assertEquals(superbabyModel.parent, null);
+        Assert.assertEquals(superbabyModel.allParents, null);
     }
 
     @Test

diff --git a/modules/openapi-generator/src/test/resources/3_0/allOf_composition.yaml b/modules/openapi-generator/src/test/resources/3_0/allOf_composition.yaml
@@ -26,6 +26,16 @@ paths:
                 $ref: "#/components/schemas/SuperMan"
 components:
   schemas:
+    SuperBaby: # to test single ref (Human) only
+      allOf:
+      - $ref: '#/components/schemas/Human'
+      - required: # without type: object
+          - level
+        properties:
+          gender:
+            type: string
+          age:
+            type: integer 
     SuperBoy: # to test single ref (Human) only
       allOf:
       - $ref: '#/components/schemas/Human'