Fixed CLI tests, started OpenAPI tests

#3

Author: dbanty

openapi_python_client/openapi_parser/openapi.py

@@ -189,13 +189,12 @@ class OpenAPI:
     title: str
     description: str
     version: str
-    # security_schemes: Dict
     schemas: Dict[str, Schema]
     endpoint_collections_by_tag: Dict[str, EndpointCollection]
     enums: Dict[str, EnumProperty]
 
     @staticmethod
-    def check_enums(schemas: Iterable[Schema], collections: Iterable[EndpointCollection]) -> Dict[str, EnumProperty]:
+    def _check_enums(schemas: Iterable[Schema], collections: Iterable[EndpointCollection]) -> Dict[str, EnumProperty]:
         enums: Dict[str, EnumProperty] = {}
 
         def _iterate_properties() -> Generator[Property, None, None]:
@@ -225,14 +224,13 @@ def from_dict(d: Dict[str, Dict[str, Any]], /) -> OpenAPI:
         """ Create an OpenAPI from dict """
         schemas = Schema.dict(d["components"]["schemas"])
         endpoint_collections_by_tag = EndpointCollection.from_dict(d["paths"])
-        enums = OpenAPI.check_enums(schemas.values(), endpoint_collections_by_tag.values())
+        enums = OpenAPI._check_enums(schemas.values(), endpoint_collections_by_tag.values())
 
         return OpenAPI(
             title=d["info"]["title"],
             description=d["info"]["description"],
             version=d["info"]["version"],
             endpoint_collections_by_tag=endpoint_collections_by_tag,
             schemas=schemas,
-            # security_schemes=d["components"]["securitySchemes"],
             enums=enums,
         )

tests/test_cli.py

@@ -1,28 +1,32 @@
 from click.testing import CliRunner
 
 
-def test_generate_no_params():
+def test_generate_no_params(mocker):
+    main = mocker.patch("openapi_python_client.cli.main")
     from openapi_python_client.cli import generate
 
     runner = CliRunner()
     result = runner.invoke(generate)
 
     assert result.exit_code == 1
     assert result.output == "You must either provide --url or --path\n"
+    main.assert_not_called()
 
 
-def test_generate_url_and_path():
+def test_generate_url_and_path(mocker):
+    main = mocker.patch("openapi_python_client.cli.main")
     from openapi_python_client.cli import generate
 
     runner = CliRunner()
     result = runner.invoke(generate, ["--url=blah", "--path=blahblah"])
 
     assert result.exit_code == 1
     assert result.output == "Provide either --url or --path, not both\n"
+    main.assert_not_called()
 
 
 def test_generate_url(mocker):
-    main = mocker.patch("openapi_python_client.main")
+    main = mocker.patch("openapi_python_client.cli.main")
     url = mocker.MagicMock()
     from openapi_python_client.cli import generate
 
@@ -34,7 +38,7 @@ def test_generate_url(mocker):
 
 
 def test_generate_path(mocker):
-    main = mocker.patch("openapi_python_client.main")
+    main = mocker.patch("openapi_python_client.cli.main")
     path = mocker.MagicMock()
     from openapi_python_client.cli import generate
 

tests/test_openapi_parser/__init__.py

@@ -0,0 +1,34 @@
+MODULE_NAME = "openapi_python_client.openapi_parser.openapi"
+
+
+class TestOpenAPI:
+    def test_from_dict(self, mocker):
+        Schema = mocker.patch(f"{MODULE_NAME}.Schema")
+        schemas = mocker.MagicMock()
+        Schema.dict.return_value = schemas
+        EndpointCollection = mocker.patch(f"{MODULE_NAME}.EndpointCollection")
+        endpoint_collections_by_tag = mocker.MagicMock()
+        EndpointCollection.from_dict.return_value = endpoint_collections_by_tag
+        in_dict = {
+            "components": {"schemas": mocker.MagicMock()},
+            "paths": mocker.MagicMock(),
+            "info": {"title": mocker.MagicMock(), "description": mocker.MagicMock(), "version": mocker.MagicMock()},
+        }
+        enums = mocker.MagicMock()
+        _check_enums = mocker.patch(f"{MODULE_NAME}.OpenAPI._check_enums", return_value=enums)
+
+        from openapi_python_client.openapi_parser.openapi import OpenAPI
+
+        openapi = OpenAPI.from_dict(in_dict)
+
+        Schema.dict.assert_called_once_with(in_dict["components"]["schemas"])
+        EndpointCollection.from_dict.assert_called_once_with(in_dict["paths"])
+        _check_enums.assert_called_once_with(schemas.values(), endpoint_collections_by_tag.values())
+        assert openapi == OpenAPI(
+            title=in_dict["info"]["title"],
+            description=in_dict["info"]["description"],
+            version=in_dict["info"]["version"],
+            endpoint_collections_by_tag=endpoint_collections_by_tag,
+            schemas=schemas,
+            enums=enums,
+        )