Separate out api vs function tests

Author: PGijsbers

tests/conftest.py

@@ -2,15 +2,15 @@
 import json
 from enum import StrEnum
 from pathlib import Path
-from typing import Any, Iterator
+from typing import Any, Iterator, NamedTuple
 
 import httpx
 import pytest
 from database.setup import expdb_database, user_database
 from fastapi.testclient import TestClient
 from main import create_api
 from routers.dependencies import expdb_connection, userdb_connection
-from sqlalchemy import Connection, Engine
+from sqlalchemy import Connection, Engine, text
 
 
 class ApiKey(StrEnum):
@@ -65,3 +65,25 @@ def dataset_130() -> Iterator[dict[str, Any]]:
 @pytest.fixture()
 def default_configuration_file() -> Path:
     return Path().parent.parent / "src" / "config.toml"
+
+
+class Flow(NamedTuple):
+    """To be replaced by an actual ORM class."""
+
+    id: int
+    name: str
+    external_version: str
+
+
+@pytest.fixture()
+def flow(expdb_test: Connection) -> Flow:
+    expdb_test.execute(
+        text(
+            """
+            INSERT INTO implementation(fullname,name,version,external_version,uploadDate)
+            VALUES ('a','name',2,'external_version','2024-02-02 02:23:23');
+            """,
+        ),
+    )
+    (flow_id,) = expdb_test.execute(text("""SELECT LAST_INSERT_ID();""")).one()
+    return Flow(id=flow_id, name="name", external_version="external_version")

tests/database/flows_test.py

@@ -1,30 +1,7 @@
-from typing import NamedTuple
-
 import database.flows
-import pytest
-from sqlalchemy import Connection, text
-
-
-class Flow(NamedTuple):
-    """To be replaced by an actual ORM class."""
+from sqlalchemy import Connection
 
-    id: int
-    name: str
-    external_version: str
-
-
-@pytest.fixture()
-def flow(expdb_test: Connection) -> Flow:
-    expdb_test.execute(
-        text(
-            """
-            INSERT INTO implementation(fullname,name,version,external_version,uploadDate)
-            VALUES ('a','name',2,'external_version','2024-02-02 02:23:23');
-            """,
-        ),
-    )
-    (flow_id,) = expdb_test.execute(text("""SELECT LAST_INSERT_ID();""")).one()
-    return Flow(id=flow_id, name="name", external_version="external_version")
+from tests.conftest import Flow
 
 
 def test_database_flow_exists(flow: Flow, expdb_test: Connection) -> None:

tests/routers/openml/flows_test.py

@@ -2,12 +2,13 @@
 
 import deepdiff.diff
 import pytest
+from fastapi import HTTPException
 from pytest_mock import MockerFixture
 from routers.openml.flows import flow_exists
 from sqlalchemy import Connection
 from starlette.testclient import TestClient
 
-from tests.database.flows_test import Flow
+from tests.conftest import Flow
 
 
 @pytest.mark.parametrize(
@@ -36,7 +37,7 @@ def test_flow_exists_calls_db_correctly(
     "flow_id",
     [1, 2],
 )
-def test_flow_exists_handles_flow_found(
+def test_flow_exists_processes_found(
     flow_id: int,
     mocker: MockerFixture,
     expdb_test: Connection,
@@ -50,27 +51,24 @@ def test_flow_exists_handles_flow_found(
     assert response == {"flow_id": fake_flow.id}
 
 
-def test_flow_exists_handles_flow_not_found(py_api: TestClient, mocker: MockerFixture) -> None:
+def test_flow_exists_handles_flow_not_found(mocker: MockerFixture, expdb_test: Connection) -> None:
     mocker.patch("database.flows.get_by_name", return_value=None)
-    response = py_api.get("/flows/exists/weka.ZeroR/Weka_3.9.0_12024")
-    assert response.status_code == http.client.NOT_FOUND
+    with pytest.raises(HTTPException) as error:
+        flow_exists("foo", "bar", expdb_test)
+    assert error.value.status_code == http.client.NOT_FOUND
+    assert error.value.detail == "Flow not found."
 
 
-def test_full_stack_exists(flow: Flow, py_api: TestClient) -> None:
+def test_flow_exists(flow: Flow, py_api: TestClient) -> None:
     response = py_api.get(f"/flows/exists/{flow.name}/{flow.external_version}")
     assert response.status_code == http.client.OK
     assert response.json() == {"flow_id": flow.id}
 
 
-def test_flow_exists(py_api: TestClient) -> None:
-    response = py_api.get("/flows/exists/weka.ZeroR/Weka_3.9.0_12024")
-    assert response.status_code == http.client.OK
-    assert response.json() == {"flow_id": 1}
-
-
 def test_flow_exists_not_exists(py_api: TestClient) -> None:
-    response = py_api.get("/flows/exists/does_not_exist/Weka_3.9.0_12024")
+    response = py_api.get("/flows/exists/foo/bar")
     assert response.status_code == http.client.NOT_FOUND
+    assert response.json()["detail"] == "Flow not found."
 
 
 def test_get_flow_no_subflow(py_api: TestClient) -> None: