Test/messagesreceived

acapy_plugin_pickup/protocol.py

@@ -180,15 +180,6 @@ class MessagesReceived(AgentMessage):
     message_type = f"{PROTOCOL}/messages-received"
     message_id_list: Set[str]
 
-    @staticmethod
-    def determine_session(manager: InboundTransportManager, key: str):
-        """Determine the session associated with the given key."""
-        for session in manager.sessions.values():
-            session = cast(InboundSession, session)
-            if key in session.reply_verkeys:
-                return session
-        return None
-
     async def handle(self, context: RequestContext, responder: BaseResponder):
         """Handle MessageReceived message."""
         if not self.transport or self.transport.return_route != "all":

int/tests/conftest.py

@@ -6,7 +6,6 @@
 import hashlib
 import os
 
-# TODO: Remove debugging tools before final commit
 import logging
 
 from acapy_client.client import Client

int/tests/test_messagesreceived.py

@@ -0,0 +1,118 @@
+from echo_agent.client import EchoClient
+from echo_agent.client import ConnectionInfo
+import pytest
+
+
+@pytest.mark.asyncio
+async def test_messages_received_no_id(echo: EchoClient, connection: ConnectionInfo):
+    """Testing that an empty ID list does not alter the queue."""
+
+    await echo.send_message(
+        connection,
+        {
+            "@type": "https://didcomm.org/messagepickup/2.0/status-request",
+            "~transport": {"return_route": "all"},
+        },
+    )
+    initial_status = await echo.get_message(connection)
+    inital_count = initial_status["message_count"]
+
+    await echo.send_message(
+        connection,
+        {
+            "@type": "https://didcomm.org/messagepickup/2.0/messages-received",
+            "message_id_list": [],
+            "~transport": {"return_route": "all"},
+        },
+    )
+
+    final_status = await echo.get_message(connection)
+    assert final_status["@type"] == "https://didcomm.org/messagepickup/2.0/status"
+    final_count = final_status["message_count"]
+    assert inital_count == final_count
+
+
+@pytest.mark.asyncio
+async def test_messages_received_with_id(echo: EchoClient, connection: ConnectionInfo):
+    """Testing that accurate ID's remove messages from the queue."""
+
+    for _ in range(2):
+        await echo.send_message(
+            connection,
+            {
+                "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/trust_ping/1.0/ping",
+                "response_resquested": True,
+            },
+        )
+
+    await echo.send_message(
+        connection,
+        {
+            "@type": "https://didcomm.org/messagepickup/2.0/status-request",
+            "~transport": {"return_route": "all"},
+        },
+    )
+    initial_status = await echo.get_message(connection)
+    inital_count = initial_status["message_count"]
+
+    await echo.send_message(
+        connection,
+        {
+            "@type": "https://didcomm.org/messagepickup/2.0/delivery-request",
+            "~transport": {"return_route": "all"},
+            "limit": 2,
+        },
+    )
+
+    wrapped_msgs = await echo.get_message(connection)
+    assert wrapped_msgs["@type"] == "https://didcomm.org/messagepickup/2.0/delivery"
+    msg_ids = []
+
+    for _ in wrapped_msgs["~attach"]:
+        msg_ids.append(_["@id"])
+
+    await echo.send_message(
+        connection,
+        {
+            "@type": "https://didcomm.org/messagepickup/2.0/messages-received",
+            "message_id_list": msg_ids,
+            "~transport": {"return_route": "all"},
+        },
+    )
+
+    final_status = await echo.get_message(connection)
+    assert final_status["@type"] == "https://didcomm.org/messagepickup/2.0/status"
+    final_count = final_status["message_count"]
+
+    assert final_count == inital_count - 2
+
+
+@pytest.mark.asyncio
+async def test_messages_received_junk_id(echo: EchoClient, connection: ConnectionInfo):
+    """Testing that an incorrect ID list does not alter the queue."""
+
+    await echo.send_message(
+        connection,
+        {
+            "@type": "https://didcomm.org/messagepickup/2.0/status-request",
+            "~transport": {"return_route": "all"},
+        },
+    )
+    initial_status = await echo.get_message(connection)
+    inital_count = initial_status["message_count"]
+
+    await echo.send_message(
+        connection,
+        {
+            "@type": "https://didcomm.org/messagepickup/2.0/messages-received",
+            "message_id_list": [
+                "A communications disruption can mean only one thing: invasion"
+            ],
+            "~transport": {"return_route": "all"},
+        },
+    )
+
+    final_status = await echo.get_message(connection)
+    assert final_status["@type"] == "https://didcomm.org/messagepickup/2.0/status"
+    final_count = final_status["message_count"]
+    assert inital_count == final_count