add tests for #16217

Author: wing328

modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml

@@ -2246,3 +2246,30 @@ components:
           description: Property
           type: boolean
           default: false
+    Creature:
+      type: object
+      required:
+        - info
+        - type
+      properties:
+        info:
+          $ref: "#/components/schemas/CreatureInfo"
+        type:
+          type: string
+      discriminator:
+        propertyName: type
+    CreatureInfo:
+      type: object
+      required:
+        - name
+      properties:
+        name:
+          type: string
+    Tiger:
+      allOf:
+        - $ref: "#/components/schemas/Tiger"
+        - type: object
+          properties:
+            skill:
+              type: string
+

samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES

@@ -22,6 +22,8 @@ docs/CircularReferenceModel.md
 docs/ClassModel.md
 docs/Client.md
 docs/Color.md
+docs/Creature.md
+docs/CreatureInfo.md
 docs/DanishPig.md
 docs/DefaultApi.md
 docs/DeprecatedObject.md
@@ -79,6 +81,7 @@ docs/SpecialModelName.md
 docs/SpecialName.md
 docs/StoreApi.md
 docs/Tag.md
+docs/Tiger.md
 docs/User.md
 docs/UserApi.md
 docs/WithNestedOneOf.md
@@ -115,6 +118,8 @@ petstore_api/models/circular_reference_model.py
 petstore_api/models/class_model.py
 petstore_api/models/client.py
 petstore_api/models/color.py
+petstore_api/models/creature.py
+petstore_api/models/creature_info.py
 petstore_api/models/danish_pig.py
 petstore_api/models/deprecated_object.py
 petstore_api/models/dog.py
@@ -167,6 +172,7 @@ petstore_api/models/special_character_enum.py
 petstore_api/models/special_model_name.py
 petstore_api/models/special_name.py
 petstore_api/models/tag.py
+petstore_api/models/tiger.py
 petstore_api/models/user.py
 petstore_api/models/with_nested_one_of.py
 petstore_api/py.typed

samples/openapi3/client/petstore/python-aiohttp/README.md

@@ -150,6 +150,8 @@ Class | Method | HTTP request | Description
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Color](docs/Color.md)
+ - [Creature](docs/Creature.md)
+ - [CreatureInfo](docs/CreatureInfo.md)
  - [DanishPig](docs/DanishPig.md)
  - [DeprecatedObject](docs/DeprecatedObject.md)
  - [Dog](docs/Dog.md)
@@ -202,6 +204,7 @@ Class | Method | HTTP request | Description
  - [SpecialModelName](docs/SpecialModelName.md)
  - [SpecialName](docs/SpecialName.md)
  - [Tag](docs/Tag.md)
+ - [Tiger](docs/Tiger.md)
  - [User](docs/User.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
 

samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py

@@ -56,6 +56,8 @@
 from petstore_api.models.class_model import ClassModel
 from petstore_api.models.client import Client
 from petstore_api.models.color import Color
+from petstore_api.models.creature import Creature
+from petstore_api.models.creature_info import CreatureInfo
 from petstore_api.models.danish_pig import DanishPig
 from petstore_api.models.deprecated_object import DeprecatedObject
 from petstore_api.models.dog import Dog
@@ -108,5 +110,6 @@
 from petstore_api.models.special_model_name import SpecialModelName
 from petstore_api.models.special_name import SpecialName
 from petstore_api.models.tag import Tag
+from petstore_api.models.tiger import Tiger
 from petstore_api.models.user import User
 from petstore_api.models.with_nested_one_of import WithNestedOneOf

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py

@@ -32,6 +32,8 @@
 from petstore_api.models.class_model import ClassModel
 from petstore_api.models.client import Client
 from petstore_api.models.color import Color
+from petstore_api.models.creature import Creature
+from petstore_api.models.creature_info import CreatureInfo
 from petstore_api.models.danish_pig import DanishPig
 from petstore_api.models.deprecated_object import DeprecatedObject
 from petstore_api.models.dog import Dog
@@ -84,5 +86,6 @@
 from petstore_api.models.special_model_name import SpecialModelName
 from petstore_api.models.special_name import SpecialName
 from petstore_api.models.tag import Tag
+from petstore_api.models.tiger import Tiger
 from petstore_api.models.user import User
 from petstore_api.models.with_nested_one_of import WithNestedOneOf

samples/openapi3/client/petstore/python/.openapi-generator/FILES

@@ -22,6 +22,8 @@ docs/CircularReferenceModel.md
 docs/ClassModel.md
 docs/Client.md
 docs/Color.md
+docs/Creature.md
+docs/CreatureInfo.md
 docs/DanishPig.md
 docs/DefaultApi.md
 docs/DeprecatedObject.md
@@ -79,6 +81,7 @@ docs/SpecialModelName.md
 docs/SpecialName.md
 docs/StoreApi.md
 docs/Tag.md
+docs/Tiger.md
 docs/User.md
 docs/UserApi.md
 docs/WithNestedOneOf.md
@@ -115,6 +118,8 @@ petstore_api/models/circular_reference_model.py
 petstore_api/models/class_model.py
 petstore_api/models/client.py
 petstore_api/models/color.py
+petstore_api/models/creature.py
+petstore_api/models/creature_info.py
 petstore_api/models/danish_pig.py
 petstore_api/models/deprecated_object.py
 petstore_api/models/dog.py
@@ -167,6 +172,7 @@ petstore_api/models/special_character_enum.py
 petstore_api/models/special_model_name.py
 petstore_api/models/special_name.py
 petstore_api/models/tag.py
+petstore_api/models/tiger.py
 petstore_api/models/user.py
 petstore_api/models/with_nested_one_of.py
 petstore_api/py.typed

samples/openapi3/client/petstore/python/README.md

@@ -150,6 +150,8 @@ Class | Method | HTTP request | Description
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Color](docs/Color.md)
+ - [Creature](docs/Creature.md)
+ - [CreatureInfo](docs/CreatureInfo.md)
  - [DanishPig](docs/DanishPig.md)
  - [DeprecatedObject](docs/DeprecatedObject.md)
  - [Dog](docs/Dog.md)
@@ -202,6 +204,7 @@ Class | Method | HTTP request | Description
  - [SpecialModelName](docs/SpecialModelName.md)
  - [SpecialName](docs/SpecialName.md)
  - [Tag](docs/Tag.md)
+ - [Tiger](docs/Tiger.md)
  - [User](docs/User.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
 

samples/openapi3/client/petstore/python/petstore_api/__init__.py

@@ -56,6 +56,8 @@
 from petstore_api.models.class_model import ClassModel
 from petstore_api.models.client import Client
 from petstore_api.models.color import Color
+from petstore_api.models.creature import Creature
+from petstore_api.models.creature_info import CreatureInfo
 from petstore_api.models.danish_pig import DanishPig
 from petstore_api.models.deprecated_object import DeprecatedObject
 from petstore_api.models.dog import Dog
@@ -108,5 +110,6 @@
 from petstore_api.models.special_model_name import SpecialModelName
 from petstore_api.models.special_name import SpecialName
 from petstore_api.models.tag import Tag
+from petstore_api.models.tiger import Tiger
 from petstore_api.models.user import User
 from petstore_api.models.with_nested_one_of import WithNestedOneOf

samples/openapi3/client/petstore/python/petstore_api/models/__init__.py

@@ -32,6 +32,8 @@
 from petstore_api.models.class_model import ClassModel
 from petstore_api.models.client import Client
 from petstore_api.models.color import Color
+from petstore_api.models.creature import Creature
+from petstore_api.models.creature_info import CreatureInfo
 from petstore_api.models.danish_pig import DanishPig
 from petstore_api.models.deprecated_object import DeprecatedObject
 from petstore_api.models.dog import Dog
@@ -84,5 +86,6 @@
 from petstore_api.models.special_model_name import SpecialModelName
 from petstore_api.models.special_name import SpecialName
 from petstore_api.models.tag import Tag
+from petstore_api.models.tiger import Tiger
 from petstore_api.models.user import User
 from petstore_api.models.with_nested_one_of import WithNestedOneOf

samples/openapi3/client/petstore/python/tests/test_model.py

@@ -513,3 +513,10 @@ def test_first_ref(self):
         a = petstore_api.FirstRef.from_dict({})
         self.assertEqual(a.to_json(), "{}")
 
+    def test_allof(self):
+        # for issue 16104
+        model = petstore_api.Tiger.from_json('{"skill": "none", "type": "tiger", "info": {"name": "creature info"}}')
+        # shouldn't throw NameError
+        self.assertEqual(model.to_json(), '{"skill": "none", "type": "tiger", "info": {"name": "creature info"}}')
+
+