reorganize

Author: eli-bl

end_to_end_tests/__init__.py

@@ -2,3 +2,4 @@
 import pytest
 
 pytest.register_assert_rewrite("end_to_end_tests.end_to_end_test_helpers")
+pytest.register_assert_rewrite("end_to_end_tests.functional_tests.helpers")

end_to_end_tests/end_to_end_test_helpers.py

@@ -37,7 +37,7 @@ components:
 """)
 @with_generated_code_import(".models.MyModel")
 class TestSimpleJsonObject:
-    def test_encoding(MyModel):
+    def test_encoding(self, MyModel):
         instance = MyModel(string_prop="abc")
         assert instance.to_dict() == {"stringProp": "abc"}
 ```
@@ -46,11 +46,30 @@ class TestSimpleJsonObject:
 
 These run the generator with an invalid API spec and make assertions about the warning/error output. Some of these invalid conditions are expected to only produce warnings about the affected schemas, while others are expected to produce fatal errors that terminate the generator.
 
-For warning conditions, each test class follows this pattern:
+For warning conditions, each test class uses `@with_generated_client_fixture` as above, then uses `assert_bad_schema` to parse the output and check for a specific warning message for a specific schema name.
 
-- Call `inline_spec_should_cause_warnings`, providing an inline API spec (JSON or YAML). If there are several test methods in the class using the same spec, use a fixture with scope "class" so the generator is only run once.
-- Use `assert_bad_schema_warning` to parse the output and check for a specific warning message for a specific schema name.
+```python
+@with_generated_client_fixture(
+"""
+components:
+  schemas:
+    MyModel:
+      # some kind of invalid schema
+""")
+class TestBadSchema:
+    def test_encoding(self, generated_client):
+        assert_bad_schema(generated_client, "MyModel", "some expected warning text")
+```
 
 Or, for fatal error conditions:
 
 - Call `inline_spec_should_fail`, providing an inline API spec (JSON or YAML).
+
+```python
+class TestBadSpec:
+    def test_some_spec_error(self):
+        result = inline_spec_should_fail("""
+# some kind of invalid spec
+""")
+        assert "some expected error text" in result.output
+```

end_to_end_tests/functional_tests/README.md

@@ -1,8 +1,6 @@
-import datetime
 from typing import Any, ForwardRef, List, Union
-import uuid
-import pytest
-from end_to_end_tests.end_to_end_test_helpers import (
+
+from end_to_end_tests.functional_tests.helpers import (
     assert_model_decode_encode,
     assert_model_property_type_hint,
     with_generated_client_fixture,

end_to_end_tests/functional_tests/generated_code_execution/test_arrays.py

@@ -1,6 +1,7 @@
 import datetime
 import uuid
-from end_to_end_tests.end_to_end_test_helpers import (
+
+from end_to_end_tests.functional_tests.helpers import (
     with_generated_client_fixture,
     with_generated_code_imports,
 )

end_to_end_tests/functional_tests/generated_code_execution/test_defaults.py

@@ -1,5 +1,6 @@
 from typing import Any, List
-from end_to_end_tests.end_to_end_test_helpers import (
+
+from end_to_end_tests.functional_tests.helpers import (
     with_generated_code_import,
     with_generated_client_fixture,
 )

end_to_end_tests/functional_tests/generated_code_execution/test_docstrings.py

@@ -1,9 +1,9 @@
 from typing import Literal, Union
 import pytest
-from end_to_end_tests.end_to_end_test_helpers import (
+
+from end_to_end_tests.functional_tests.helpers import (
     assert_model_decode_encode,
     assert_model_property_type_hint,
-    with_generated_code_import,
     with_generated_client_fixture,
     with_generated_code_imports,
 )
@@ -187,7 +187,7 @@ def test_type_hints(self, MyModel, MyEnum, Unset):
           const: 30
 """,
 )
-@with_generated_code_import(".models.MyModel")
+@with_generated_code_imports(".models.MyModel")
 class TestConst:
     def test_valid_string(self, MyModel):
         assert_model_decode_encode(
@@ -327,7 +327,7 @@ def test_invalid_values(self, MyModel):
 """,
     config="literal_enums: true",
 )
-@with_generated_code_import(".models.MyModel")
+@with_generated_code_imports(".models.MyModel")
 class TestNullableLiteralEnum:
     def test_nullable_enum_prop(self, MyModel):
         assert_model_decode_encode(MyModel, {"nullableEnumProp": "B"}, MyModel(nullable_enum_prop="B"))

end_to_end_tests/functional_tests/generated_code_execution/test_enums_and_consts.py

@@ -2,7 +2,8 @@
 from typing import Any, ForwardRef, Union
 import uuid
 import pytest
-from end_to_end_tests.end_to_end_test_helpers import (
+
+from end_to_end_tests.functional_tests.helpers import (
     assert_model_decode_encode,
     assert_model_property_type_hint,
     with_generated_client_fixture,

end_to_end_tests/functional_tests/generated_code_execution/test_properties.py

@@ -1,5 +1,6 @@
 from typing import ForwardRef, Union
-from end_to_end_tests.end_to_end_test_helpers import (
+
+from end_to_end_tests.functional_tests.helpers import (
     assert_model_decode_encode,
     assert_model_property_type_hint,
     with_generated_client_fixture,