Adds test_discriminator_works

Author: spacether

modules/openapi-json-schema-generator/src/main/resources/python/schemas.handlebars

@@ -1981,7 +1981,9 @@ class ComposedBase(Discriminable):
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]

samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/schemas.py

@@ -1948,7 +1948,9 @@ def _validate_oapg(
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]

samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test_manual/__init__.py

@@ -0,0 +1,46 @@
+# coding: utf-8
+
+"""
+    discriminator-test
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 1.0
+    Generated by: https://openapi-generator.tech
+"""
+
+import unittest
+
+from this_package.model.operator import Operator
+from this_package.model.addition_operator import AdditionOperator
+from this_package.model.subtraction_operator import SubtractionOperator
+from this_package import configuration
+
+
+class TestOperator(unittest.TestCase):
+    """Operator unit test stubs"""
+    _configuration = configuration.Configuration()
+
+    def test_discriminator_works(self):
+        op = Operator(
+            operator_id='ADD',
+            a=3.14,
+            b=3.14
+        )
+        assert op == dict(
+            operator_id='ADD',
+            a=3.14,
+            b=3.14
+        )
+        """
+        even though the payload validates with AdditionOperator + SubtractionOperator
+        only AdditionOperator is used because nonCompliantUseDiscriminatorIfCompositionFails=true
+        and discriminator validation was used when composed schema validation failed
+        """
+        assert isinstance(op, Operator)
+        assert isinstance(op, AdditionOperator)
+        assert not isinstance(op, SubtractionOperator)
+
+
+if __name__ == '__main__':
+    unittest.main()

samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test_manual/test_operator.py

@@ -1974,7 +1974,9 @@ def _validate_oapg(
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]

samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/schemas.py

@@ -1948,7 +1948,9 @@ def _validate_oapg(
         )
 
         # process composed schema
-        discriminator = getattr(cls, 'discriminator', None)
+        discriminator = None
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
+            discriminator = cls.MetaOapg.discriminator()
         discriminated_cls = None
         if discriminator and arg and isinstance(arg, frozendict.frozendict):
             disc_property_name = list(discriminator.keys())[0]