Use base_uri for validate in cli; add tests

Author: p1c2u

openapi_spec_validator/__main__.py

@@ -84,7 +84,7 @@ def main(args: Optional[Sequence[str]] = None) -> None:
 
         # read source
         try:
-            spec, spec_url = reader(filename)
+            spec, base_uri = reader(filename)
         except Exception as exc:
             print(exc)
             sys.exit(1)
@@ -103,7 +103,7 @@ def main(args: Optional[Sequence[str]] = None) -> None:
 
         # validate
         try:
-            validator.validate(spec, spec_url=spec_url)
+            validator.validate(spec, base_uri=base_uri)
         except ValidationError as exc:
             print_validationerror(filename, exc, args_parsed.errors)
             sys.exit(1)

tests/integration/test_main.py

@@ -6,46 +6,74 @@
 from openapi_spec_validator.__main__ import main
 
 
-def test_schema_v2_detect():
+def test_schema_v2_detect(capsys):
     """Test schema v2 is detected"""
     testargs = ["./tests/integration/data/v2.0/petstore.yaml"]
     main(testargs)
+    out, err = capsys.readouterr()
+    assert not err
+    assert "./tests/integration/data/v2.0/petstore.yaml: OK\n" in out
 
 
-def test_schema_v31_detect():
+def test_schema_v31_detect(capsys):
     """Test schema v3.1 is detected"""
     testargs = ["./tests/integration/data/v3.1/petstore.yaml"]
     main(testargs)
+    out, err = capsys.readouterr()
+    assert not err
+    assert "./tests/integration/data/v3.1/petstore.yaml: OK\n" in out
 
 
-def test_schema_v31():
+def test_schema_v31(capsys):
     """No errors when calling proper v3.1 file."""
     testargs = [
         "--schema",
         "3.1.0",
         "./tests/integration/data/v3.1/petstore.yaml",
     ]
     main(testargs)
+    out, err = capsys.readouterr()
+    assert not err
+    assert "./tests/integration/data/v3.1/petstore.yaml: OK\n" in out
 
 
-def test_schema_v30():
+def test_schema_v30(capsys):
     """No errors when calling proper v3.0 file."""
     testargs = [
         "--schema",
         "3.0.0",
         "./tests/integration/data/v3.0/petstore.yaml",
     ]
     main(testargs)
+    out, err = capsys.readouterr()
+    assert not err
+    assert "./tests/integration/data/v3.0/petstore.yaml: OK\n" in out
 
 
-def test_schema_v2():
+def test_schema_v2(capsys):
     """No errors when calling with proper v2 file."""
     testargs = [
         "--schema",
         "2.0",
         "./tests/integration/data/v2.0/petstore.yaml",
     ]
     main(testargs)
+    out, err = capsys.readouterr()
+    assert not err
+    assert "./tests/integration/data/v2.0/petstore.yaml: OK\n" in out
+
+
+def test_many(capsys):
+    """No errors when calling with proper v2 and v3 files."""
+    testargs = [
+        "./tests/integration/data/v2.0/petstore.yaml",
+        "./tests/integration/data/v3.0/petstore.yaml",
+    ]
+    main(testargs)
+    out, err = capsys.readouterr()
+    assert not err
+    assert "./tests/integration/data/v2.0/petstore.yaml: OK\n" in out
+    assert "./tests/integration/data/v3.0/petstore.yaml: OK\n" in out
 
 
 def test_errors_on_missing_description_best(capsys):
@@ -57,6 +85,11 @@ def test_errors_on_missing_description_best(capsys):
     with pytest.raises(SystemExit):
         main(testargs)
     out, err = capsys.readouterr()
+    assert not err
+    assert (
+        "./tests/integration/data/v3.0/missing-description.yaml: Validation Error:"
+        in out
+    )
     assert "Failed validating" in out
     assert "'description' is a required property" in out
     assert "'$ref' is a required property" not in out
@@ -73,13 +106,18 @@ def test_errors_on_missing_description_full(capsys):
     with pytest.raises(SystemExit):
         main(testargs)
     out, err = capsys.readouterr()
+    assert not err
+    assert (
+        "./tests/integration/data/v3.0/missing-description.yaml: Validation Error:"
+        in out
+    )
     assert "Failed validating" in out
     assert "'description' is a required property" in out
     assert "'$ref' is a required property" in out
     assert "1 more subschema error" not in out
 
 
-def test_schema_unknown():
+def test_schema_unknown(capsys):
     """Errors on running with unknown schema."""
     testargs = [
         "--schema",
@@ -88,9 +126,12 @@ def test_schema_unknown():
     ]
     with pytest.raises(SystemExit):
         main(testargs)
+    out, err = capsys.readouterr()
+    assert "error: argument --schema" in err
+    assert not out
 
 
-def test_validation_error():
+def test_validation_error(capsys):
     """SystemExit on running with ValidationError."""
     testargs = [
         "--schema",
@@ -99,13 +140,20 @@ def test_validation_error():
     ]
     with pytest.raises(SystemExit):
         main(testargs)
+    out, err = capsys.readouterr()
+    assert not err
+    assert (
+        "./tests/integration/data/v2.0/petstore.yaml: Validation Error:" in out
+    )
+    assert "Failed validating" in out
+    assert "'openapi' is a required property" in out
 
 
 @mock.patch(
     "openapi_spec_validator.__main__.openapi_v30_spec_validator.validate",
     side_effect=Exception,
 )
-def test_unknown_error(m_validate):
+def test_unknown_error(m_validate, capsys):
     """SystemExit on running with unknown error."""
     testargs = [
         "--schema",
@@ -114,16 +162,22 @@ def test_unknown_error(m_validate):
     ]
     with pytest.raises(SystemExit):
         main(testargs)
+    out, err = capsys.readouterr()
+    assert not err
+    assert "./tests/integration/data/v2.0/petstore.yaml: Error:" in out
 
 
-def test_nonexisting_file():
+def test_nonexisting_file(capsys):
     """Calling with non-existing file should sys.exit."""
     testargs = ["i_dont_exist.yaml"]
     with pytest.raises(SystemExit):
         main(testargs)
+    out, err = capsys.readouterr()
+    assert not err
+    assert "No such file: i_dont_exist.yaml\n" in out
 
 
-def test_schema_stdin():
+def test_schema_stdin(capsys):
     """Test schema from STDIN"""
     spes_path = "./tests/integration/data/v3.0/petstore.yaml"
     with open(spes_path) as spec_file:
@@ -133,3 +187,6 @@ def test_schema_stdin():
     testargs = ["--schema", "3.0.0", "-"]
     with mock.patch("openapi_spec_validator.__main__.sys.stdin", spec_io):
         main(testargs)
+    out, err = capsys.readouterr()
+    assert not err
+    assert "stdin: OK\n" in out