restore some missing test coverage

Author: eli-bl

end_to_end_tests/end_to_end_test_helpers.py

@@ -78,18 +78,17 @@ def generate_client(
     extra_args: List[str] = [],
     output_path: str = "my-test-api-client",
     base_module: str = "my_test_api_client",
+    specify_output_path_explicitly: bool = True,
     overwrite: bool = True,
     raise_on_error: bool = True,
 ) -> GeneratedClientContext:
     """Run the generator and return a GeneratedClientContext for accessing the generated code."""
     full_output_path = Path.cwd() / output_path
     if not overwrite:
         shutil.rmtree(full_output_path, ignore_errors=True)
-    args = [
-        *extra_args,
-        "--output-path",
-        str(full_output_path),
-    ]
+    args = extra_args
+    if specify_output_path_explicitly:
+        args = [*args, "--output-path", str(full_output_path)]
     if overwrite:
         args = [*args, "--overwrite"]
     generator_result = _run_command("generate", args, openapi_document, raise_on_error=raise_on_error)

end_to_end_tests/generated_code_live_tests/test_defaults.py

@@ -36,6 +36,12 @@
         numberWithStringValue: {"type": "number", "default": "5.5"}
         stringWithNumberValue: {"type": "string", "default": 6}
         stringConst: {"type": "string", "const": "always", "default": "always"}
+        unionWithValidDefaultForType1:
+          anyOf: [{"type": "boolean"}, {"type": "integer"}]
+          default: true
+        unionWithValidDefaultForType2:
+          anyOf: [{"type": "boolean"}, {"type": "integer"}]
+          default: 3
 """)
 @with_generated_code_imports(".models.MyModel")
 class TestSimpleDefaults:
@@ -62,6 +68,8 @@ def test_defaults_in_initializer(self, MyModel):
             number_with_string_value=5.5,
             string_with_number_value="6",
             string_const="always",
+            union_with_valid_default_for_type_1=True,
+            union_with_valid_default_for_type_2=3,
         )
 
 
@@ -131,6 +139,13 @@ def warnings(self):
     WithBadEnum:
       properties:
         badEnum: {"type": "string", "enum": ["a", "b"], "default": "x"}
+    UnionWithNoValidDefault:
+      properties:
+        badBoolOrInt:
+          anyOf:
+            - type: boolean
+            - type: integer
+          default: "xxx"
 """
         )
     # Note, the null/None type, and binary strings (files), are not covered here due to a known bug:
@@ -151,6 +166,7 @@ def warnings(self):
             ("WithBadUuidAsString", "Invalid UUID value"),
             ("WithBadUuidAsOther", "Invalid UUID value"),
             ("WithBadEnum", "Value x is not valid for enum"),
+            ("UnionWithNoValidDefault", "Invalid int value"),
         ]
     )
     def test_bad_default_warning(self, model_name, message, warnings):

end_to_end_tests/test_end_to_end.py

@@ -86,8 +86,9 @@ def run_e2e_test(
     golden_record_path: str = "golden-record",
     output_path: str = "my-test-api-client",
     expected_missing: Optional[Set[str]] = None,
+    specify_output_path_explicitly: bool = True,
 ) -> Result:
-    with generate_client(openapi_document, extra_args, output_path) as g:
+    with generate_client(openapi_document, extra_args, output_path, specify_output_path_explicitly=specify_output_path_explicitly) as g:
         gr_path = Path(__file__).parent / golden_record_path
 
         expected_differences = expected_differences or {}
@@ -165,6 +166,7 @@ def test_none_meta():
         golden_record_path="test-3-1-golden-record/test_3_1_features_client",
         output_path="test_3_1_features_client",
         expected_missing={"py.typed"},
+        specify_output_path_explicitly=False,
     )
 
 

pyproject.toml

@@ -67,7 +67,7 @@ ignore = ["E501", "PLR0913", "PLR2004"]
 "tests/*" = ["PLR2004"]
 
 [tool.coverage.run]
-omit = ["openapi_python_client/__main__.py", "openapi_python_client/templates/*"]
+omit = ["openapi_python_client/__main__.py", "openapi_python_client/templates/*", "end_to_end_tests/*", "integration_tests/*", "tests/*"]
 
 [tool.mypy]
 plugins = ["pydantic.mypy"]
@@ -119,7 +119,7 @@ re = {composite = ["regen_e2e", "e2e --snapshot-update"]}
 regen_e2e = "python -m end_to_end_tests.regen_golden_record"
 
 [tool.pdm.scripts.test]
-cmd = "pytest tests end_to_end_tests/test_end_to_end.py --basetemp=tests/tmp"
+cmd = "pytest tests end_to_end_tests/test_end_to_end.py end_to_end_tests/generated_code_live_tests --basetemp=tests/tmp"
 [tool.pdm.scripts.test.env]
 "TEST_RELATIVE" = "true"