Added test definitions for discriminator use with allOf

Author: FWiesner

src/test/resources/openapi3/discriminator.json

@@ -1,6 +1,6 @@
 [
     {
-        "description": "discriminator with oneOf and explicitly mapped single alternative for Dog and an implicit mapping for Cat",
+        "description": "discriminator with oneOf",
         "schema": {
             "oneOf": [
                 {
@@ -51,7 +51,9 @@
                             },
                             {
                                 "type": "object",
-                                "required": ["bark"],
+                                "required": [
+                                    "bark"
+                                ],
                                 "properties": {
                                     "bark": {
                                         "type": "string"
@@ -95,5 +97,198 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "discriminator with allOf",
+        "schema": {
+            "$ref": "#/components/schemas/Room",
+            "components": {
+                "schemas": {
+                    "Room": {
+                        "type": "object",
+                        "properties": {
+                            "@type": {
+                                "type": "string",
+                                "pattern": "^(?!Room$)"
+                            },
+                            "floor": {
+                                "type": "int32"
+                            }
+                        },
+                        "required": [
+                            "@type"
+                        ],
+                        "discriminator": {
+                            "propertyName": "@type",
+                            "mapping": {
+                                "bed": "#/components/schemas/BedRoom"
+                            }
+                        }
+                    },
+                    "BedRoom": {
+                        "type": "object",
+                        "allOf": "#/components/schemas/Room",
+                        "properties": {
+                            "numberOfBeds": {
+                                "type": "int32"
+                            }
+                        },
+                        "required": [
+                            "numberOfBeds"
+                        ]
+                    },
+                    "KidsBedRoom": {
+                        "type": "object",
+                        "allOf": "#/components/schemas/BedRoom",
+                        "properties": {
+                            "isTidy": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "isTidy"
+                        ]
+                    },
+                    "Kitchen": {
+                        "type": "object",
+                        "allOf": "#/components/schemas/Room",
+                        "properties": {
+                            "hasMicrowaveOven": "boolean"
+                        },
+                        "required": [
+                            "hasMicrowaveOven"
+                        ]
+                    }
+                }
+            }
+        },
+        "tests": [
+            {
+                "description": "Forbidden mapping to base type",
+                "data": {
+                    "@type": "Room"
+                },
+                "valid": false
+            },
+            {
+                "description": "mapped to Bedroom",
+                "data": {
+                    "@type": "bed",
+                    "numberOfBeds": 2
+                },
+                "valid": true
+            },
+            {
+                "description": "mapped to Kitchen",
+                "data": {
+                    "@type": "bed",
+                    "hasMicrowaveOven": true
+                },
+                "valid": true
+            },
+            {
+                "description": "mapped to KidsBedRoom",
+                "data": {
+                    "@type": "KidsBedRoom",
+                    "numberOfBeds": 1,
+                    "isTidy": false
+                },
+                "valid": true
+            },
+            {
+                "description": "mapped to Bedroom with missing number of beds",
+                "data": {
+                    "@type": "bed"
+                },
+                "valid": false
+            },
+            {
+                "description": "mapped to KidsBedroom with missing number of beds",
+                "data": {
+                    "@type": "KidsBedRoom",
+                    "isTidy": true
+                },
+                "valid": false
+            },
+            {
+                "description": "mapped to KidsBedroom with missing tidiness",
+                "data": {
+                    "@type": "KidsBedRoom",
+                    "numberOfBeds": 1
+                },
+                "valid": false
+            },
+            {
+                "description": "mapped to invalid Room",
+                "data": {
+                    "@type": "Bathroom"
+                },
+                "valid": false
+            }
+        ]
+    },
+    {
+        "description": "Conflicting discriminators",
+        "schema": {
+            "$ref": "#/components/schemas/Room",
+            "components": {
+                "schemas": {
+                    "Room": {
+                        "type": "object",
+                        "properties": {
+                            "@type": {
+                                "type": "string"
+                            },
+                            "floor": {
+                                "type": "int32"
+                            }
+                        },
+                        "required": [
+                            "@type"
+                        ],
+                        "discriminator": {
+                            "propertyName": "@type",
+                            "mapping": {
+                                "bed": "#/components/schemas/BedRoom"
+                            }
+                        }
+                    },
+                    "BedRoom": {
+                        "type": "object",
+                        "allOf": "#/components/schemas/Room",
+                        "properties": {
+                            "redefinedDiscriminatorProperty": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "redefinedDiscriminatorProperty"
+                        ],
+                        "discriminator": {
+                            "propertyName": "redefinedDiscriminatorProperty"
+                        }
+                    },
+                    "KidsBedRoom": {
+                        "type": "object",
+                        "allOf": "#/components/schemas/BedRoom",
+                        "properties": {
+                            "isTidy": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "isTidy"
+                        ]
+                    }
+                }
+            }
+        },
+        "tests": [
+            {
+                "description": "Schema invalid",
+                "data": "{}",
+                "valid": false
+            }
+        ]
     }
 ]