ci: Improve test coverage

Author: dbanty

openapi_python_client/parser/properties/schemas.py

@@ -6,7 +6,7 @@
 
 from ..errors import ParseError
 
-if TYPE_CHECKING:
+if TYPE_CHECKING:  # pragma: no cover
     from .enum_property import EnumProperty
     from .model_property import ModelProperty
 else:

tests/test_parser/test_properties/test_model_property.py

@@ -241,7 +241,7 @@ def string_property(**kwargs) -> StringProperty:
 
 
 class TestProcessProperties:
-    def test_conflicting_properties(self, model_property):
+    def test_conflicting_properties_different_types(self, model_property):
         from openapi_python_client.parser.properties import Schemas
         from openapi_python_client.parser.properties.model_property import _process_properties
 
@@ -261,6 +261,22 @@ def test_conflicting_properties(self, model_property):
 
         assert isinstance(result, PropertyError)
 
+    def test_conflicting_properties_same_types(self, model_property):
+        from openapi_python_client.parser.properties import Schemas
+        from openapi_python_client.parser.properties.model_property import _process_properties
+
+        data = oai.Schema.construct(allOf=[oai.Reference.construct(ref="First"), oai.Reference.construct(ref="Second")])
+        schemas = Schemas(
+            models={
+                "First": model_property(optional_properties=[string_property(default="abc")]),
+                "Second": model_property(optional_properties=[string_property()]),
+            }
+        )
+
+        result = _process_properties(data=data, schemas=schemas, class_name="")
+
+        assert isinstance(result, PropertyError)
+
     def test_duplicate_properties(self, model_property):
         from openapi_python_client.parser.properties import Schemas
         from openapi_python_client.parser.properties.model_property import _process_properties
@@ -311,3 +327,25 @@ def test_mixed_requirements(self, model_property, first_nullable, second_nullabl
             assert result.optional_props == [expected_prop]
         else:
             assert result.required_props == [expected_prop]
+
+    def test_direct_properties_non_ref(self):
+        from openapi_python_client.parser.properties import Schemas
+        from openapi_python_client.parser.properties.model_property import _process_properties
+
+        data = oai.Schema.construct(
+            allOf=[
+                oai.Schema.construct(
+                    required=["first"],
+                    properties={
+                        "first": oai.Schema.construct(type="string"),
+                        "second": oai.Schema.construct(type="string"),
+                    },
+                )
+            ]
+        )
+        schemas = Schemas()
+
+        result = _process_properties(data=data, schemas=schemas, class_name="")
+
+        assert result.optional_props == [string_property(name="second", required=False, nullable=False)]
+        assert result.required_props == [string_property(name="first", required=True, nullable=False)]