Enforce shared assertions in e2e tests

Author: koxudaxi

pyproject.toml

@@ -232,6 +232,7 @@ verbosity_assertions = 2
 markers = [
   "perf: marks tests as performance tests (excluded from CI benchmarks)",
   "benchmark: marks tests as benchmark tests",
+  "allow_direct_assert: marks e2e tests where direct assert statements are intentionally allowed",
 ]
 
 [tool.coverage]

tests/data/expected/main/openapi/external_ref_mapping_absolute_path.py

@@ -0,0 +1,12 @@
+# generated by datamodel-codegen:
+#   filename:  api_absolute_path.yaml
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from mypackage.shared.models import User
+from pydantic import BaseModel
+
+
+class UserResponse(BaseModel):
+    user: User

tests/data/expected/main/openapi/external_ref_mapping_file_uri.py

@@ -0,0 +1,12 @@
+# generated by datamodel-codegen:
+#   filename:  api_file_uri.yaml
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from mypackage.shared.models import User
+from pydantic import BaseModel
+
+
+class UserResponse(BaseModel):
+    user: User

tests/data/expected/main/openapi/external_ref_mapping_local_ref_unchanged.py

@@ -0,0 +1,15 @@
+# generated by datamodel-codegen:
+#   filename:  api_local_ref.yaml
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from pydantic import BaseModel
+
+
+class User(BaseModel):
+    id: int
+
+
+class UserResponse(BaseModel):
+    user: User

tests/data/expected/main/openapi/external_ref_mapping_normalized.py

@@ -0,0 +1,12 @@
+# generated by datamodel-codegen:
+#   filename:  api_normalized.yaml
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from mypackage.shared.models import UserName
+from pydantic import BaseModel
+
+
+class UserResponse(BaseModel):
+    user: UserName

tests/data/expected/main/openapi/external_ref_mapping_without_flag.py

@@ -0,0 +1,27 @@
+# generated by datamodel-codegen:
+#   filename:  api.yaml
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from pydantic import AwareDatetime, BaseModel
+
+
+class User(BaseModel):
+    id: int
+    name: str
+
+
+class Error(BaseModel):
+    code: int
+    message: str
+
+
+class ErrorResponse(BaseModel):
+    error: Error
+    timestamp: AwareDatetime
+
+
+class UserResponse(BaseModel):
+    user: User
+    request_id: str

tests/data/expected/main_kr/generate_cli_command/with_profile.txt

@@ -0,0 +1,2 @@
+datamodel-codegen --input api.yaml --snake-case-field --target-python-version 3.11
+

tests/data/expected/main_kr/pyproject_profile/ignore_pyproject_with_profile.py

@@ -0,0 +1,10 @@
+# generated by datamodel-codegen:
+#   filename:  schema.json
+
+from __future__ import annotations
+
+from pydantic import BaseModel
+
+
+class Model(BaseModel):
+    firstName: str | None = None

tests/main/jsonschema/test_main_jsonschema.py

@@ -26,7 +26,7 @@
     chdir,
     generate,
 )
-from datamodel_code_generator.__main__ import Exit, main
+from datamodel_code_generator.__main__ import Exit
 from datamodel_code_generator.format import is_supported_in_black
 from datamodel_code_generator.model import base as model_base
 from tests.conftest import assert_directory_content, freeze_time, validate_generated_code
@@ -53,6 +53,7 @@
 FixtureRequest = pytest.FixtureRequest
 
 
+@pytest.mark.allow_direct_assert
 def assert_run_main_with_args_error(args: list[str], capsys: pytest.CaptureFixture[str], expected_error: str) -> None:
     """Assert that running the CLI exits with code 2 and emits the expected error."""
     with pytest.raises(SystemExit) as exc_info:
@@ -212,6 +213,7 @@ def test_main_keep_model_order_field_references(output_file: Path) -> None:
     )
 
 
+@pytest.mark.allow_direct_assert
 @pytest.mark.parametrize(
     ("target_python_version", "keep_model_order", "disable_future_imports"),
     [
@@ -452,6 +454,7 @@ def test_main_jsonschema_multiple_files(output_dir: Path) -> None:
     )
 
 
+@pytest.mark.allow_direct_assert
 @pytest.mark.benchmark
 def test_main_jsonschema_no_empty_collapsed_external_model(tmp_path: Path) -> None:
     """Test no empty files with collapsed external models."""
@@ -773,28 +776,32 @@ def test_main_class_name_suffix_with_class_name(output_file: Path) -> None:
 
 def test_main_class_name_prefix_invalid(output_file: Path) -> None:
     """Test that invalid --class-name-prefix is rejected."""
-    return_code: Exit = main([
-        "--input",
-        str(JSON_SCHEMA_DATA_PATH / "class_name_affix.json"),
-        "--output",
-        str(output_file),
-        "--class-name-prefix",
-        "123Invalid",
-    ])
-    assert return_code == Exit.ERROR
+    run_main_with_args(
+        [
+            "--input",
+            str(JSON_SCHEMA_DATA_PATH / "class_name_affix.json"),
+            "--output",
+            str(output_file),
+            "--class-name-prefix",
+            "123Invalid",
+        ],
+        expected_exit=Exit.ERROR,
+    )
 
 
 def test_main_class_name_suffix_invalid(output_file: Path) -> None:
     """Test that invalid --class-name-suffix is rejected."""
-    return_code: Exit = main([
-        "--input",
-        str(JSON_SCHEMA_DATA_PATH / "class_name_affix.json"),
-        "--output",
-        str(output_file),
-        "--class-name-suffix",
-        "Schema!",
-    ])
-    assert return_code == Exit.ERROR
+    run_main_with_args(
+        [
+            "--input",
+            str(JSON_SCHEMA_DATA_PATH / "class_name_affix.json"),
+            "--output",
+            str(output_file),
+            "--class-name-suffix",
+            "Schema!",
+        ],
+        expected_exit=Exit.ERROR,
+    )
 
 
 def test_main_jsonschema_reserved_field_names(output_file: Path) -> None:
@@ -1002,6 +1009,7 @@ def test_main_root_id_jsonschema_with_absolute_local_file(output_file: Path) ->
     )
 
 
+@pytest.mark.allow_direct_assert
 def test_main_url_with_relative_root_id_resolves_relative_refs(mocker: MockerFixture, tmp_path: Path) -> None:
     """Test --url input keeps resolving relative refs remotely when root $id is path-only."""
     main_response = mocker.Mock()
@@ -1909,6 +1917,7 @@ def test_main_generate_relative_input_path(output_file: Path) -> None:
     )
 
 
+@pytest.mark.allow_direct_assert
 def test_main_generate_external_absolute_input_path(tmp_path: Path) -> None:
     """Test helper keeps absolute input paths that are outside the repository root."""
     with tempfile.TemporaryDirectory() as temp_dir:
@@ -2149,6 +2158,7 @@ def test_main_generate_pydantic_v2_dataclass_enum(output_file: Path) -> None:
     )
 
 
+@pytest.mark.allow_direct_assert
 @pytest.mark.parametrize(
     ("input_file", "expected_file"),
     [
@@ -2174,6 +2184,7 @@ def test_main_generate_pydantic_v2_model_default_dict(input_file: str, expected_
     assert_file_content(output_file, expected_file)
 
 
+@pytest.mark.allow_direct_assert
 def test_main_generate_from_directory(tmp_path: Path) -> None:
     """Test generation from directory input."""
     input_ = (JSON_SCHEMA_DATA_PATH / "external_files_in_directory").relative_to(Path.cwd())
@@ -2240,6 +2251,7 @@ def keep_underscores(name: str) -> str:
     )
 
 
+@pytest.mark.allow_direct_assert
 def test_main_http_jsonschema(mocker: MockerFixture, output_file: Path) -> None:
     """Test HTTP JSON Schema fetching."""
     external_directory = JSON_SCHEMA_DATA_PATH / "external_files_in_directory"
@@ -2351,6 +2363,7 @@ def get_mock_response(url: str, **_: object) -> mocker.Mock:
     assert httpx_get_mock.call_count == 8
 
 
+@pytest.mark.allow_direct_assert
 @pytest.mark.parametrize(
     (
         "headers_arguments",
@@ -3304,6 +3317,7 @@ def test_long_description_wrap_string_literal(output_file: Path) -> None:
     )
 
 
+@pytest.mark.allow_direct_assert
 def test_version(capsys: pytest.CaptureFixture) -> None:
     """Test version output."""
     with pytest.raises(SystemExit) as e:
@@ -9006,6 +9020,7 @@ def test_field_validators_wrap_mode(output_file: Path, tmp_path: Path) -> None:
     )
 
 
+@pytest.mark.allow_direct_assert
 def test_field_validators_with_no_field_skipped(output_file: Path, tmp_path: Path) -> None:
     """Test that validators without fields are skipped gracefully."""
     config_file = tmp_path / "no_field_validators_config.json"
@@ -9070,6 +9085,7 @@ def test_field_validators_plain_mode(output_file: Path, tmp_path: Path) -> None:
     )
 
 
+@pytest.mark.allow_direct_assert
 def test_field_validators_all_skipped(output_file: Path, tmp_path: Path) -> None:
     """Test that when all validators have no fields, output has no validators."""
     config_file = tmp_path / "all_skipped_config.json"
@@ -9267,6 +9283,7 @@ def test_main_circular_ref_external_relative_keywords(output_file: Path) -> None
     )
 
 
+@pytest.mark.allow_direct_assert
 @pytest.mark.benchmark
 def test_main_circular_ref_external_url_keywords(mocker: MockerFixture, output_file: Path) -> None:
     """Test circular external refs with relative paths and schema keywords via URL input."""

tests/main/openapi/test_main_openapi.py

@@ -1727,6 +1727,7 @@ def test_main_openapi_pattern_with_lookaround_pydantic_v2(
     )
 
 
+@pytest.mark.allow_direct_assert
 def test_main_generate_custom_class_name_generator_modular(
     tmp_path: Path,
 ) -> None:
@@ -1795,6 +1796,7 @@ def get_mock_response(path: str) -> Mock:
     ])
 
 
+@pytest.mark.allow_direct_assert
 def test_main_http_openapi_with_custom_port(mocker: MockerFixture, output_file: Path) -> None:
     """Test OpenAPI code generation from HTTP URL with custom port preserves port in refs."""
     schema_content = """\
@@ -2534,6 +2536,7 @@ def test_main_openapi_allof_with_required_inherited_edge_cases(output_file: Path
     )
 
 
+@pytest.mark.allow_direct_assert
 @LEGACY_BLACK_SKIP
 def test_main_openapi_allof_with_required_inherited_coverage(output_file: Path) -> None:
     """Test OpenAPI generation with allOf coverage for edge case branches."""
@@ -3977,6 +3980,7 @@ def test_main_openapi_external_ref_with_transitive_local_ref(output_file: Path)
     )
 
 
+@pytest.mark.allow_direct_assert
 def _assert_external_ref_mapping_cli_parse_error(
     capsys: pytest.CaptureFixture[str],
     mapping: str,
@@ -4073,9 +4077,7 @@ def test_main_openapi_external_ref_mapping_normalizes_imported_class_name(tmp_pa
         output=output_file,
         external_ref_mapping={"common_normalized.yaml": "mypackage.shared.models"},
     )
-    content = output_file.read_text()
-    assert "from mypackage.shared.models import UserName" in content
-    assert "class UserName(" not in content
+    assert_file_content(output_file, "external_ref_mapping_normalized.py")
 
 
 def test_main_openapi_external_ref_mapping_file_uri(tmp_path: Path) -> None:
@@ -4094,9 +4096,7 @@ def test_main_openapi_external_ref_mapping_file_uri(tmp_path: Path) -> None:
         output=output_file,
         external_ref_mapping={common_uri: "mypackage.shared.models"},
     )
-    content = output_file.read_text()
-    assert "from mypackage.shared.models import User" in content
-    assert "class User(" not in content
+    assert_file_content(output_file, "external_ref_mapping_file_uri.py")
 
 
 def test_main_openapi_external_ref_mapping_absolute_path_ref(tmp_path: Path) -> None:
@@ -4115,9 +4115,7 @@ def test_main_openapi_external_ref_mapping_absolute_path_ref(tmp_path: Path) ->
         output=output_file,
         external_ref_mapping={common_path: "mypackage.shared.models"},
     )
-    content = output_file.read_text()
-    assert "from mypackage.shared.models import User" in content
-    assert "class User(" not in content
+    assert_file_content(output_file, "external_ref_mapping_absolute_path.py")
 
 
 def test_main_openapi_external_ref_mapping_local_ref_unchanged(tmp_path: Path) -> None:
@@ -4129,10 +4127,7 @@ def test_main_openapi_external_ref_mapping_local_ref_unchanged(tmp_path: Path) -
         output=output_file,
         external_ref_mapping={"common.yaml": "mypackage.shared.models"},
     )
-    content = output_file.read_text()
-    assert "class User(" in content
-    assert "class UserResponse(" in content
-    assert "from mypackage.shared.models import" not in content
+    assert_file_content(output_file, "external_ref_mapping_local_ref_unchanged.py")
 
 
 def test_main_openapi_external_ref_mapping_ref_without_fragment_errors(tmp_path: Path) -> None:
@@ -4156,10 +4151,7 @@ def test_main_openapi_external_ref_mapping_no_duplicate_classes(tmp_path: Path)
         output=output_file,
         external_ref_mapping={"common.yaml": "mypackage.shared.models"},
     )
-    content = output_file.read_text()
-    assert "class User(" not in content
-    assert "class Error(" not in content
-    assert "from mypackage.shared.models import" in content
+    assert_file_content(output_file, "external_ref_mapping.py")
 
 
 def test_main_openapi_external_ref_mapping_without_flag_generates_classes(tmp_path: Path) -> None:
@@ -4170,9 +4162,7 @@ def test_main_openapi_external_ref_mapping_without_flag_generates_classes(tmp_pa
         input_file_type=InputFileType.OpenAPI,
         output=output_file,
     )
-    content = output_file.read_text()
-    assert "class User(" in content
-    assert "class Error(" in content
+    assert_file_content(output_file, "external_ref_mapping_without_flag.py")
 
 
 def test_main_openapi_external_ref_mapping_invalid_format(capsys: pytest.CaptureFixture[str]) -> None:
@@ -4237,9 +4227,7 @@ def test_main_openapi_external_ref_mapping_programmatic_api(tmp_path: Path) -> N
         input_=EXTERNAL_REF_MAPPING_DATA_PATH / "api.yaml",
         config=config,
     )
-    content = output_file.read_text()
-    assert "class User(" not in content
-    assert "from mypackage.shared.models import" in content
+    assert_file_content(output_file, "external_ref_mapping.py")
 
 
 def test_main_openapi_namespace_subns_ref(output_dir: Path) -> None:
@@ -5194,6 +5182,7 @@ def test_main_openapi_include_paths_without_leading_slash(output_file: Path) ->
     )
 
 
+@pytest.mark.allow_direct_assert
 def test_main_openapi_include_paths_warning_without_paths_scope() -> None:
     """Warn when --openapi-include-paths used without paths scope."""
     import warnings