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

@@ -48,7 +48,7 @@ These run the generator with an invalid API spec and make assertions about the w
 
 For warning conditions, each test class follows this pattern:
 
-- 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.
+- Call `GeneratorWarnings.from_inline_spec`, 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.
 
 Or, for fatal error conditions:

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,

end_to_end_tests/functional_tests/generated_code_execution/test_unions.py

@@ -1,14 +1,13 @@
 import pytest
-from end_to_end_tests.end_to_end_test_helpers import (
-    assert_bad_schema_warning,
-    inline_spec_should_cause_warnings,
-)
+
+from end_to_end_tests.functional_tests.helpers import GeneratorWarnings
+from end_to_end_tests.generated_client import generate_client_from_inline_spec
 
 
 class TestArrayInvalidSchemas:
     @pytest.fixture(scope="class")
     def warnings(self):
-        return inline_spec_should_cause_warnings(
+        with generate_client_from_inline_spec(
 """
 components:
   schemas:
@@ -19,10 +18,11 @@ def warnings(self):
       items:
         $ref: "#/components/schemas/DoesntExist"
 """
-        )
+        ) as generated_client:
+            return GeneratorWarnings(generated_client)
 
     def test_no_items(self, warnings):
-        assert_bad_schema_warning(warnings, "ArrayWithNoItems", "must have items or prefixItems defined")
+        warnings.assert_bad_schema("ArrayWithNoItems", "must have items or prefixItems defined")
 
     def test_invalid_items_ref(self, warnings):
-        assert_bad_schema_warning(warnings, "ArrayWithInvalidItemsRef", "invalid data in items of array")
+        warnings.assert_bad_schema("ArrayWithInvalidItemsRef", "invalid data in items of array")