test: update tests to new method params and rename exception

matmoncon · matmoncon · commit 657dff43de3c · 2023-11-22T18:55:52.000+01:00
diff --git a/tests/integration/test_node_model_count.py b/tests/integration/test_node_model_count.py
@@ -5,7 +5,7 @@
 import pytest
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import NoResultsFound
+from pyneo4j_ogm.exceptions import UnexpectedEmptyResult
 from tests.fixtures.db_setup import Coffee, client, session, setup_test_data
 
 pytest_plugins = ("pytest_asyncio",)
@@ -26,5 +26,5 @@ async def test_count_no_query_result(client: Pyneo4jClient):
 
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = [[], []]
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             await Coffee.count({"milk": True})
diff --git a/tests/integration/test_node_model_create.py b/tests/integration/test_node_model_create.py
@@ -9,7 +9,7 @@
 from typing_extensions import LiteralString
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import NoResultsFound
+from pyneo4j_ogm.exceptions import UnexpectedEmptyResult
 from tests.fixtures.db_setup import Coffee, client, session
 
 pytest_plugins = ("pytest_asyncio",)
@@ -66,5 +66,5 @@ async def test_create_no_result(client: Pyneo4jClient):
 
         node = Coffee(flavor="Mocha", sugar=True, milk=True, note={"roast": "dark"})
 
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             await node.create()
diff --git a/tests/integration/test_node_model_delete.py b/tests/integration/test_node_model_delete.py
@@ -9,7 +9,7 @@
 from typing_extensions import LiteralString
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import NoResultsFound
+from pyneo4j_ogm.exceptions import UnexpectedEmptyResult
 from tests.fixtures.db_setup import CoffeeShop, client, session
 
 pytest_plugins = ("pytest_asyncio",)
@@ -51,5 +51,5 @@ async def test_delete_no_result(client: Pyneo4jClient):
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = ([], [])
 
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             await node.delete()
diff --git a/tests/integration/test_node_model_delete_many.py b/tests/integration/test_node_model_delete_many.py
@@ -9,7 +9,7 @@
 from typing_extensions import LiteralString
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import NoResultsFound
+from pyneo4j_ogm.exceptions import UnexpectedEmptyResult
 from tests.fixtures.db_setup import CoffeeShop, client, session, setup_test_data
 
 pytest_plugins = ("pytest_asyncio",)
@@ -61,5 +61,5 @@ async def test_delete_many_no_results(client: Pyneo4jClient, session: AsyncSessi
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = [[], []]
 
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             await CoffeeShop.delete_many({"tags": {"$in": ["oh-no"]}})
diff --git a/tests/integration/test_node_model_delete_one.py b/tests/integration/test_node_model_delete_one.py
@@ -7,7 +7,7 @@
 from neo4j.graph import Node
 from typing_extensions import LiteralString
 
-from pyneo4j_ogm.exceptions import InvalidFilters, NoResultsFound
+from pyneo4j_ogm.exceptions import InvalidFilters, NoResultFound, UnexpectedEmptyResult
 from tests.fixtures.db_setup import CoffeeShop, client, session, setup_test_data
 
 pytest_plugins = ("pytest_asyncio",)
@@ -36,6 +36,9 @@ async def test_delete_one_no_match(session: AsyncSession, setup_test_data):
     results = await CoffeeShop.delete_one({"tags": {"$in": ["oh-no"]}})
     assert results == 0
 
+    with pytest.raises(NoResultFound):
+        await CoffeeShop.delete_one({"tags": {"$in": ["oh-no"]}}, raise_on_empty=True)
+
     results = await session.run(
         cast(
             LiteralString,
diff --git a/tests/integration/test_node_model_find_one.py b/tests/integration/test_node_model_find_one.py
@@ -7,7 +7,7 @@
 from neo4j.graph import Graph, Node
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import InvalidFilters, UnregisteredModel
+from pyneo4j_ogm.exceptions import InvalidFilters, NoResultFound, UnregisteredModel
 from tests.fixtures.db_setup import (
     Coffee,
     Consumed,
@@ -38,6 +38,9 @@ async def test_find_one_no_match(setup_test_data):
 
     assert found_node is None
 
+    with pytest.raises(NoResultFound):
+        await Developer.find_one({"my_prop": "non-existent"}, raise_on_empty=True)
+
 
 async def test_find_one_raw_result(client: Pyneo4jClient):
     await client.register_models([Developer])
diff --git a/tests/integration/test_node_model_refresh.py b/tests/integration/test_node_model_refresh.py
@@ -9,7 +9,7 @@
 from typing_extensions import LiteralString
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import NoResultsFound
+from pyneo4j_ogm.exceptions import UnexpectedEmptyResult
 from tests.fixtures.db_setup import CoffeeShop, client, session
 
 pytest_plugins = ("pytest_asyncio",)
@@ -56,5 +56,5 @@ async def test_refresh_no_result(client: Pyneo4jClient):
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = ([], [])
 
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             await node.refresh()
diff --git a/tests/integration/test_node_model_update.py b/tests/integration/test_node_model_update.py
@@ -9,7 +9,7 @@
 from typing_extensions import LiteralString
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import NoResultsFound
+from pyneo4j_ogm.exceptions import UnexpectedEmptyResult
 from tests.fixtures.db_setup import CoffeeShop, client, session
 
 pytest_plugins = ("pytest_asyncio",)
@@ -56,6 +56,6 @@ async def test_update_no_result(client: Pyneo4jClient):
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = ([], [])
 
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             node.rating = 2
             await node.update()
diff --git a/tests/integration/test_node_model_update_one.py b/tests/integration/test_node_model_update_one.py
@@ -9,7 +9,7 @@
 from typing_extensions import LiteralString
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import InvalidFilters
+from pyneo4j_ogm.exceptions import InvalidFilters, NoResultFound
 from tests.fixtures.db_setup import Developer, client, session, setup_test_data
 
 pytest_plugins = ("pytest_asyncio",)
@@ -79,6 +79,9 @@ async def test_update_one_no_match(setup_test_data):
 
     assert updated_node is None
 
+    with pytest.raises(NoResultFound):
+        await Developer.update_one({"age": 50}, {"uid": 99999}, raise_on_empty=True)
+
 
 async def test_update_one_missing_filters(client: Pyneo4jClient):
     await client.register_models([Developer])
diff --git a/tests/integration/test_relationship_model_count.py b/tests/integration/test_relationship_model_count.py
@@ -5,7 +5,7 @@
 import pytest
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import NoResultsFound
+from pyneo4j_ogm.exceptions import UnexpectedEmptyResult
 from tests.fixtures.db_setup import WorkedWith, client, session, setup_test_data
 
 pytest_plugins = ("pytest_asyncio",)
@@ -30,5 +30,5 @@ async def test_count_no_query_result(client: Pyneo4jClient, setup_test_data):
 
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = [[], []]
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             await WorkedWith.count({})
diff --git a/tests/integration/test_relationship_model_delete_many.py b/tests/integration/test_relationship_model_delete_many.py
@@ -6,7 +6,7 @@
 from neo4j import AsyncSession
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import NoResultsFound
+from pyneo4j_ogm.exceptions import UnexpectedEmptyResult
 from tests.fixtures.db_setup import WorkedWith, client, session, setup_test_data
 
 pytest_plugins = ("pytest_asyncio",)
@@ -60,5 +60,5 @@ async def test_delete_many_no_results(client: Pyneo4jClient, session: AsyncSessi
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = [[], []]
 
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             await WorkedWith.delete_many({"language": "non-existent"})
diff --git a/tests/integration/test_relationship_model_delete_one.py b/tests/integration/test_relationship_model_delete_one.py
@@ -6,7 +6,7 @@
 from neo4j import AsyncSession
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import InvalidFilters, NoResultsFound
+from pyneo4j_ogm.exceptions import InvalidFilters, NoResultFound, UnexpectedEmptyResult
 from tests.fixtures.db_setup import WorkedWith, client, session, setup_test_data
 
 pytest_plugins = ("pytest_asyncio",)
@@ -36,10 +36,32 @@ async def test_delete_one(client: Pyneo4jClient, session: AsyncSession, setup_te
 async def test_delete_one_no_match(client: Pyneo4jClient, session: AsyncSession, setup_test_data):
     await client.register_models([WorkedWith])
 
+    result = await WorkedWith.delete_one({"language": "I dont exist"})
+    assert result == 0
+
+    with pytest.raises(NoResultFound):
+        await WorkedWith.delete_one({"language": "I dont exist"}, raise_on_empty=True)
+
+    results = await session.run(
+        """
+        MATCH ()-[r:WAS_WORK_BUDDY_WITH]->()
+        RETURN DISTINCT r
+        """,
+    )
+
+    query_result = await results.values()
+    await results.consume()
+
+    assert len(query_result) == 7
+
+
+async def test_delete_one_no_result(client: Pyneo4jClient, session: AsyncSession, setup_test_data):
+    await client.register_models([WorkedWith])
+
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = [[], []]
 
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             await WorkedWith.delete_one({"language": "non-existent"})
 
     results = await session.run(
diff --git a/tests/integration/test_relationship_model_end_node.py b/tests/integration/test_relationship_model_end_node.py
@@ -7,7 +7,7 @@
 from neo4j.graph import Node, Relationship
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import NoResultsFound
+from pyneo4j_ogm.exceptions import UnexpectedEmptyResult
 from tests.fixtures.db_setup import (
     Developer,
     WorkedWith,
@@ -64,5 +64,5 @@ async def test_end_node_no_result(client: Pyneo4jClient, setup_test_data):
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = ([], [])
 
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             await relationship_model.end_node()
diff --git a/tests/integration/test_relationship_model_find_one.py b/tests/integration/test_relationship_model_find_one.py
@@ -7,7 +7,7 @@
 from neo4j.graph import Graph, Node, Relationship
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import InvalidFilters
+from pyneo4j_ogm.exceptions import InvalidFilters, NoResultFound
 from tests.fixtures.db_setup import WorkedWith, client, session, setup_test_data
 
 pytest_plugins = ("pytest_asyncio",)
@@ -28,6 +28,9 @@ async def test_find_one_no_match(client: Pyneo4jClient, setup_test_data):
     result = await WorkedWith.find_one({"language": "non-existent"})
     assert result is None
 
+    with pytest.raises(NoResultFound):
+        await WorkedWith.find_one({"language": "non-existent"}, raise_on_empty=True)
+
 
 async def test_find_one_missing_filter(client: Pyneo4jClient, setup_test_data):
     await client.register_models([WorkedWith])
diff --git a/tests/integration/test_relationship_model_refresh.py b/tests/integration/test_relationship_model_refresh.py
@@ -7,7 +7,7 @@
 from neo4j.graph import Node, Relationship
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import NoResultsFound
+from pyneo4j_ogm.exceptions import UnexpectedEmptyResult
 from tests.fixtures.db_setup import WorkedWith, client, session, setup_test_data
 
 pytest_plugins = ("pytest_asyncio",)
@@ -55,6 +55,6 @@ async def test_refresh_no_result(client: Pyneo4jClient, setup_test_data):
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = ([], [])
 
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             relationship_model.language = "TypeScript"
             await relationship_model.refresh()
diff --git a/tests/integration/test_relationship_model_start_node.py b/tests/integration/test_relationship_model_start_node.py
@@ -7,7 +7,7 @@
 from neo4j.graph import Node, Relationship
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import NoResultsFound
+from pyneo4j_ogm.exceptions import UnexpectedEmptyResult
 from tests.fixtures.db_setup import (
     Developer,
     WorkedWith,
@@ -64,5 +64,5 @@ async def test_start_node_no_result(client: Pyneo4jClient, setup_test_data):
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = ([], [])
 
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             await relationship_model.start_node()
diff --git a/tests/integration/test_relationship_model_update.py b/tests/integration/test_relationship_model_update.py
@@ -9,7 +9,7 @@
 from typing_extensions import LiteralString
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import NoResultsFound
+from pyneo4j_ogm.exceptions import UnexpectedEmptyResult
 from tests.fixtures.db_setup import WorkedWith, client, session, setup_test_data
 
 pytest_plugins = ("pytest_asyncio",)
@@ -78,6 +78,6 @@ async def test_update_no_result(client: Pyneo4jClient, setup_test_data):
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = ([], [])
 
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             relationship_model.language = "TypeScript"
             await relationship_model.update()
diff --git a/tests/integration/test_relationship_model_update_one.py b/tests/integration/test_relationship_model_update_one.py
@@ -8,7 +8,7 @@
 from neo4j.graph import Graph, Node, Relationship
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import InvalidFilters
+from pyneo4j_ogm.exceptions import InvalidFilters, NoResultFound
 from tests.fixtures.db_setup import WorkedWith, client, session, setup_test_data
 
 pytest_plugins = ("pytest_asyncio",)
@@ -52,6 +52,9 @@ async def test_update_one_no_match(client: Pyneo4jClient, setup_test_data):
     result = await WorkedWith.update_one({"language": "non-existent"}, {"language": "non-existent"})
     assert result is None
 
+    with pytest.raises(NoResultFound):
+        await WorkedWith.update_one({"language": "non-existent"}, {"language": "non-existent"}, raise_on_empty=True)
+
 
 async def test_update_one_missing_filter(client: Pyneo4jClient, setup_test_data):
     await client.register_models([WorkedWith])
diff --git a/tests/integration/test_relationship_property_connect.py b/tests/integration/test_relationship_property_connect.py
@@ -8,7 +8,7 @@
 from typing_extensions import LiteralString
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
-from pyneo4j_ogm.exceptions import NoResultsFound
+from pyneo4j_ogm.exceptions import UnexpectedEmptyResult
 from tests.fixtures.db_setup import (
     Coffee,
     Consumed,
@@ -109,5 +109,5 @@ async def test_connect_no_result(
     with patch.object(john_model.colleagues._client, "cypher") as mock_cypher:
         mock_cypher.return_value = [[], []]
 
-        with pytest.raises(NoResultsFound):
+        with pytest.raises(UnexpectedEmptyResult):
             await john_model.colleagues.connect(sam_model, {"language": "PHP"})
diff --git a/tests/integration/test_relationship_property_disconnect.py b/tests/integration/test_relationship_property_disconnect.py
@@ -2,10 +2,12 @@
 
 from typing import cast
 
+import pytest
 from neo4j import AsyncSession
 from typing_extensions import LiteralString
 
 from pyneo4j_ogm.core.client import Pyneo4jClient
+from pyneo4j_ogm.exceptions import NotConnectedToSourceNode
 from tests.fixtures.db_setup import (
     Coffee,
     Consumed,
@@ -88,3 +90,6 @@ async def test_disconnect_no_connections(
     count = await john_model.coffee.disconnect(mocha_model)
 
     assert count == 0
+
+    with pytest.raises(NotConnectedToSourceNode):
+        await john_model.coffee.disconnect(mocha_model, raise_on_empty=True)
