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/main/jsonschema/test_main_jsonschema.py

@@ -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."""
@@ -771,6 +774,7 @@ def test_main_class_name_suffix_with_class_name(output_file: Path) -> None:
     )
 
 
+@pytest.mark.allow_direct_assert
 def test_main_class_name_prefix_invalid(output_file: Path) -> None:
     """Test that invalid --class-name-prefix is rejected."""
     return_code: Exit = main([
@@ -784,6 +788,7 @@ def test_main_class_name_prefix_invalid(output_file: Path) -> None:
     assert return_code == Exit.ERROR
 
 
+@pytest.mark.allow_direct_assert
 def test_main_class_name_suffix_invalid(output_file: Path) -> None:
     """Test that invalid --class-name-suffix is rejected."""
     return_code: Exit = main([
@@ -1002,6 +1007,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 +1915,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 +2156,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 +2182,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 +2249,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 +2361,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 +3315,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 +9018,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 +9083,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 +9281,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,
@@ -4064,6 +4068,7 @@ def test_main_openapi_external_ref_mapping_nested_relative_ref(output_file: Path
     )
 
 
+@pytest.mark.allow_direct_assert
 def test_main_openapi_external_ref_mapping_normalizes_imported_class_name(tmp_path: Path) -> None:
     """Mapped refs normalize schema keys to generated Python class names."""
     output_file = tmp_path / "output.py"
@@ -4078,6 +4083,7 @@ def test_main_openapi_external_ref_mapping_normalizes_imported_class_name(tmp_pa
     assert "class UserName(" not in content
 
 
+@pytest.mark.allow_direct_assert
 def test_main_openapi_external_ref_mapping_file_uri(tmp_path: Path) -> None:
     """Mappings accept file URI keys and refs."""
     common_uri = (EXTERNAL_REF_MAPPING_DATA_PATH / "common.yaml").resolve().as_uri()
@@ -4099,6 +4105,7 @@ def test_main_openapi_external_ref_mapping_file_uri(tmp_path: Path) -> None:
     assert "class User(" not in content
 
 
+@pytest.mark.allow_direct_assert
 def test_main_openapi_external_ref_mapping_absolute_path_ref(tmp_path: Path) -> None:
     """Mappings match absolute-path refs to external schemas."""
     common_path = str((EXTERNAL_REF_MAPPING_DATA_PATH / "common.yaml").resolve())
@@ -4120,6 +4127,7 @@ def test_main_openapi_external_ref_mapping_absolute_path_ref(tmp_path: Path) ->
     assert "class User(" not in content
 
 
+@pytest.mark.allow_direct_assert
 def test_main_openapi_external_ref_mapping_local_ref_unchanged(tmp_path: Path) -> None:
     """Local refs remain unchanged when external mapping is configured."""
     output_file = tmp_path / "output.py"
@@ -4147,6 +4155,7 @@ def test_main_openapi_external_ref_mapping_ref_without_fragment_errors(tmp_path:
         )
 
 
+@pytest.mark.allow_direct_assert
 def test_main_openapi_external_ref_mapping_no_duplicate_classes(tmp_path: Path) -> None:
     """When mapping is active, the external file's classes should not be generated."""
     output_file = tmp_path / "output.py"
@@ -4162,6 +4171,7 @@ def test_main_openapi_external_ref_mapping_no_duplicate_classes(tmp_path: Path)
     assert "from mypackage.shared.models import" in content
 
 
+@pytest.mark.allow_direct_assert
 def test_main_openapi_external_ref_mapping_without_flag_generates_classes(tmp_path: Path) -> None:
     """Without the flag, external refs generate classes (regression check)."""
     output_file = tmp_path / "output.py"
@@ -4225,6 +4235,7 @@ def test_main_openapi_external_ref_mapping_invalid_empty_part_in_pyproject(
     )
 
 
+@pytest.mark.allow_direct_assert
 def test_main_openapi_external_ref_mapping_programmatic_api(tmp_path: Path) -> None:
     """Test using GenerateConfig with external_ref_mapping."""
     output_file = tmp_path / "output.py"
@@ -5194,6 +5205,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

tests/main/test_exec_validation.py

@@ -129,12 +129,14 @@ def test_force_exec_with_different_target_version(output_file: Path) -> None:
     )
 
 
+@pytest.mark.allow_direct_assert
 def test_get_current_version_args_basic() -> None:
     """Test that get_current_version_args returns correct args."""
     args = get_current_version_args()
     assert args == ["--target-python-version", CURRENT_PYTHON_VERSION]
 
 
+@pytest.mark.allow_direct_assert
 def test_get_current_version_args_with_extra() -> None:
     """Test that get_current_version_args includes extra args."""
     args = get_current_version_args("--use-field-description", "--strict")
@@ -146,6 +148,7 @@ def test_get_current_version_args_with_extra() -> None:
     ]
 
 
+@pytest.mark.allow_direct_assert
 def test_current_python_version_format() -> None:
     """Test that CURRENT_PYTHON_VERSION matches expected format."""
     expected = f"{sys.version_info[0]}.{sys.version_info[1]}"