Merge pull request #459 from python-jsonschema/enhance-testing

Minor testing enhancements

Author: sirosen

tests/acceptance/test_custom_validator_class.py

@@ -147,3 +147,28 @@ def test_custom_validator_class_can_pass_when_valid(run_line, tmp_path):
         ],
     )
     assert result.exit_code == 0  # pass
+
+
+@pytest.mark.parametrize(
+    "add_opts",
+    (
+        ["--builtin-schema", "vendor.github-workflows"],
+        ["--check-metaschema"],
+    ),
+)
+def test_custom_validator_class_is_incompatible_with_schema_opts(
+    run_line, tmp_path, add_opts
+):
+    doc = tmp_path / "instance.json"
+    doc.write_text("{}")
+    result = run_line(
+        [
+            "check-jsonschema",
+            "--validator-class",
+            "foo:MyValidator",
+            str(doc),
+        ]
+        + add_opts
+    )
+    assert result.exit_code == 2
+    assert "--validator-class can only be used with --schemafile" in result.stderr

tests/unit/cli/conftest.py

@@ -0,0 +1,7 @@
+import pytest
+from click.testing import CliRunner
+
+
+@pytest.fixture
+def runner() -> CliRunner:
+    return CliRunner(mix_stderr=False)

tests/unit/test_cli_annotations.py renamed to tests/unit/cli/test_annotations.py

@@ -0,0 +1,51 @@
+import click
+import pytest
+
+from check_jsonschema.cli.warnings import deprecation_warning_callback
+
+
+@click.command("foo")
+@click.option(
+    "--bar",
+    is_flag=True,
+    callback=deprecation_warning_callback("--bar", is_flag=True),
+)
+@click.option(
+    "--baz",
+    callback=deprecation_warning_callback(
+        "--baz", append_message="Use --frob instead!"
+    ),
+)
+def mycli(bar, baz):
+    print(bar)
+    if baz:
+        print(baz)
+
+
+def test_deprecation_warning_callback_on_missing_opts(runner):
+    result = runner.invoke(mycli, [])
+    assert result.exit_code == 0
+    assert result.stdout == "False\n"
+
+
+def test_deprecation_warning_callback_on_flag(runner):
+    with pytest.warns(
+        UserWarning,
+        match="'--bar' is deprecated and will be removed in a future release",
+    ):
+        result = runner.invoke(mycli, ["--bar"], catch_exceptions=False)
+    assert result.exit_code == 0, result.stdout
+    assert result.stdout == "True\n"
+
+
+def test_deprecation_warning_callback_added_message(runner):
+    with pytest.warns(
+        UserWarning,
+        match=(
+            "'--baz' is deprecated and will be removed in a future release. "
+            "Use --frob instead!"
+        ),
+    ):
+        result = runner.invoke(mycli, ["--baz", "ok"], catch_exceptions=False)
+    assert result.exit_code == 0, result.stdout
+    assert result.stdout == "False\nok\n"

tests/unit/cli/test_callbacks.py

@@ -4,7 +4,6 @@
 
 import click
 import pytest
-from click.testing import CliRunner
 
 from check_jsonschema import main as cli_main
 from check_jsonschema.cli.parse_result import ParseResult, SchemaLoadingMode
@@ -43,11 +42,6 @@ def get_ctx(*args):
         yield m
 
 
-@pytest.fixture
-def runner() -> CliRunner:
-    return CliRunner(mix_stderr=False)
-
-
 @pytest.mark.parametrize(
     "schemafile,builtin_schema,check_metaschema,expect_mode",
     [

tests/unit/test_cli_parse.py renamed to tests/unit/cli/test_parse.py

@@ -22,6 +22,7 @@ def test_simple_positive_cases(datestr):
 @pytest.mark.parametrize(
     "datestr",
     (
+        object(),
         "2018-12-31T23:59:59",
         "2018-12-31T23:59:59+00:00Z",
         "2018-12-31 23:59:59",

tests/unit/formats/test_rfc3339.py

@@ -21,6 +21,7 @@ def test_simple_positive_cases(timestr):
 @pytest.mark.parametrize(
     "timestr",
     (
+        object(),
         "12:34:56",
         "23:59:60Z",
         "23:59:59+24:00",