Test Cases for more than two oneOf-Options (both passing, but important to narrow down observed bug)

Author: fkellner

modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java

@@ -766,9 +766,10 @@ public void testComposedSchemaOneOfWithProperties() {
         Set<String> oneOf = new TreeSet<>();
         oneOf.add("Apple");
         oneOf.add("Banana");
+        oneOf.add("Orange");
         assertEquals(fruit.oneOf, oneOf);
-        assertEquals(3, fruit.optionalVars.size());
-        assertEquals(3, fruit.vars.size());
+        assertEquals(4, fruit.optionalVars.size());
+        assertEquals(4, fruit.vars.size());
         // make sure that fruit has the property color
         boolean colorSeen = false;
         for (CodegenProperty cp : fruit.vars) {
@@ -788,6 +789,32 @@ public void testComposedSchemaOneOfWithProperties() {
         assertTrue(colorSeen);
     }
 
+    @Test
+    public void testComposedSchemaOneOfAllOf() {
+        final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/oneOf_inheritance.yaml");
+        final DefaultCodegen codegen = new DefaultCodegen();
+
+        final Schema schema = openAPI.getComponents().getSchemas().get("RandomAnimalsResponse_animals_inner");
+        codegen.setOpenAPI(openAPI);
+        CodegenModel randomAnimalsResponseInner = codegen.fromModel("RandomAnimalsResponse_animals_inner", schema);
+
+        Set<String> oneOf = new TreeSet<>();
+        oneOf.add("Mouse");
+        oneOf.add("Cat");
+        oneOf.add("Dog");
+        assertEquals(oneOf, randomAnimalsResponseInner.oneOf);
+        assertEquals(4, randomAnimalsResponseInner.vars.size());
+        // make sure that RandomAnimalsResponseInner has the property species
+        boolean speciesSeen = false;
+        for (CodegenProperty cp : randomAnimalsResponseInner.vars) {
+            if ("species".equals(cp.name)) {
+                speciesSeen = true;
+                break;
+            }
+        }
+        assertTrue(speciesSeen);
+    }
+
     @Test
     public void testEscapeText() {
         final DefaultCodegen codegen = new DefaultCodegen();

modules/openapi-generator/src/test/resources/3_0/oneOf.yaml

@@ -22,6 +22,7 @@ components:
          oneOf:
             - $ref: '#/components/schemas/apple'
             - $ref: '#/components/schemas/banana'
+            - $ref: '#/components/schemas/orange'
          # additionalProperties:
          #    type: string
          # uncomment this when https://github.com/swagger-api/swagger-parser/issues/1252 is resolved
@@ -37,3 +38,9 @@ components:
          properties:
             count:
                type: number
+      orange:
+         title: orange
+         type: object
+         properties:
+            sweet:
+               type: boolean

modules/openapi-generator/src/test/resources/3_0/oneOf_inheritance.yaml

@@ -0,0 +1,70 @@
+---
+openapi: 3.0.3
+info:
+  title: randimals
+  version: "1.0"
+paths:
+  /random-animals:
+    get:
+      tags:
+        - Random Animals Resource
+      responses:
+        "200":
+          description: OK
+          content:
+            '*/*':
+              schema:
+                $ref: '#/components/schemas/RandomAnimalsResponse'
+components:
+  schemas:
+    RandomAnimalsResponse:
+      type: object
+      properties:
+        animals:
+          type: array
+          items:
+            oneOf:
+              - $ref: '#/components/schemas/Dog'
+              - $ref: '#/components/schemas/Cat'
+              - $ref: '#/components/schemas/Mouse'
+      required:
+        - animals
+    Dog:
+      allOf:
+        - $ref: '#/components/schemas/Animal'
+        - type: object
+          properties:
+            dogId:
+              type: string
+      required:
+        - dogId
+    Animal:
+      discriminator:
+        propertyName: species
+        mapping:
+          Dog: '#/components/schemas/Dog'
+          Cat: '#/components/schemas/Cat'
+          Mouse: '#/components/schemas/Mouse'
+      properties:
+        species:
+          type: string
+      required:
+        - species
+    Cat:
+      allOf:
+        - $ref: '#/components/schemas/Animal'
+        - type: object
+          properties:
+            catId:
+              type: string
+      required:
+        - catId
+    Mouse:
+      allOf:
+        - $ref: '#/components/schemas/Mouse'
+        - type: object
+          properties:
+            mouseId:
+              type: string
+      required:
+        - mouseId