diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index 33016c16ef..ed21defd13 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -16,11 +16,8 @@
from twisted.internet import defer
from tests import unittest
-from synapse.api.events.room import (
- MessageEvent,
-)
-
-from synapse.api.events import SynapseEvent
+from synapse.api.constants import EventTypes
+from synapse.events import FrozenEvent
from synapse.handlers.federation import FederationHandler
from synapse.server import HomeServer
@@ -37,7 +34,7 @@ class FederationTestCase(unittest.TestCase):
self.mock_config.signing_key = [MockKey()]
self.state_handler = NonCallableMock(spec_set=[
- "annotate_event_with_state",
+ "compute_event_context",
])
self.auth = NonCallableMock(spec_set=[
@@ -53,6 +50,8 @@ class FederationTestCase(unittest.TestCase):
"persist_event",
"store_room",
"get_room",
+ "get_destination_retry_timings",
+ "set_destination_retry_timings",
]),
resource_for_federation=NonCallableMock(),
http_client=NonCallableMock(spec_set=[]),
@@ -76,43 +75,47 @@ class FederationTestCase(unittest.TestCase):
@defer.inlineCallbacks
def test_msg(self):
- pdu = SynapseEvent(
- type=MessageEvent.TYPE,
- room_id="foo",
- content={"msgtype": u"fooo"},
- origin_server_ts=0,
- event_id="$a:b",
- user_id="@a:b",
- origin="b",
- auth_events=[],
- hashes={"sha256":"AcLrgtUIqqwaGoHhrEvYG1YLDIsVPYJdSRGhkp3jJp8"},
- )
+ pdu = FrozenEvent({
+ "type": EventTypes.Message,
+ "room_id": "foo",
+ "content": {"msgtype": u"fooo"},
+ "origin_server_ts": 0,
+ "event_id": "$a:b",
+ "user_id":"@a:b",
+ "origin": "b",
+ "auth_events": [],
+ "hashes": {"sha256":"AcLrgtUIqqwaGoHhrEvYG1YLDIsVPYJdSRGhkp3jJp8"},
+ })
self.datastore.persist_event.return_value = defer.succeed(None)
self.datastore.get_room.return_value = defer.succeed(True)
self.auth.check_host_in_room.return_value = defer.succeed(True)
def annotate(ev, old_state=None):
- ev.old_state_events = []
- return defer.succeed(False)
- self.state_handler.annotate_event_with_state.side_effect = annotate
+ context = Mock()
+ context.current_state = {}
+ context.auth_events = {}
+ return defer.succeed(context)
+ self.state_handler.compute_event_context.side_effect = annotate
yield self.handlers.federation_handler.on_receive_pdu(
"fo", pdu, False
)
self.datastore.persist_event.assert_called_once_with(
- ANY, is_new_state=False, backfilled=False, current_state=None
+ ANY,
+ is_new_state=True,
+ backfilled=False,
+ current_state=None,
+ context=ANY,
)
- self.state_handler.annotate_event_with_state.assert_called_once_with(
- ANY,
- old_state=None,
+ self.state_handler.compute_event_context.assert_called_once_with(
+ ANY, old_state=None,
)
self.auth.check.assert_called_once_with(ANY, auth_events={})
self.notifier.on_new_room_event.assert_called_once_with(
- ANY,
- extra_users=[]
+ ANY, extra_users=[]
)
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index fe69ce47eb..b85a89052a 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -30,7 +30,7 @@ from synapse.api.constants import PresenceState
from synapse.api.errors import SynapseError
from synapse.handlers.presence import PresenceHandler, UserPresenceCache
from synapse.streams.config import SourcePaginationConfig
-
+from synapse.storage.transactions import DestinationsTable
OFFLINE = PresenceState.OFFLINE
UNAVAILABLE = PresenceState.UNAVAILABLE
@@ -528,6 +528,7 @@ class PresencePushTestCase(unittest.TestCase):
"delivered_txn",
"get_received_txn_response",
"set_received_txn_response",
+ "get_destination_retry_timings",
]),
handlers=None,
resource_for_client=Mock(),
@@ -539,6 +540,9 @@ class PresencePushTestCase(unittest.TestCase):
hs.handlers = JustPresenceHandlers(hs)
self.datastore = hs.get_datastore()
+ self.datastore.get_destination_retry_timings.return_value = (
+ defer.succeed(DestinationsTable.EntryType("", 0, 0))
+ )
def get_received_txn_response(*args):
return defer.succeed(None)
@@ -1037,6 +1041,7 @@ class PresencePollingTestCase(unittest.TestCase):
"delivered_txn",
"get_received_txn_response",
"set_received_txn_response",
+ "get_destination_retry_timings",
]),
handlers=None,
resource_for_client=Mock(),
@@ -1048,6 +1053,9 @@ class PresencePollingTestCase(unittest.TestCase):
hs.handlers = JustPresenceHandlers(hs)
self.datastore = hs.get_datastore()
+ self.datastore.get_destination_retry_timings.return_value = (
+ defer.succeed(DestinationsTable.EntryType("", 0, 0))
+ )
def get_received_txn_response(*args):
return defer.succeed(None)
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index 0279ab703a..0cb8aa4fbc 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -17,10 +17,7 @@
from twisted.internet import defer
from tests import unittest
-from synapse.api.events.room import (
- RoomMemberEvent,
-)
-from synapse.api.constants import Membership
+from synapse.api.constants import EventTypes, Membership
from synapse.handlers.room import RoomMemberHandler, RoomCreationHandler
from synapse.handlers.profile import ProfileHandler
from synapse.server import HomeServer
@@ -47,7 +44,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
"get_room_member",
"get_room",
"store_room",
- "snapshot_room",
+ "get_latest_events_in_room",
]),
resource_for_federation=NonCallableMock(),
http_client=NonCallableMock(spec_set=[]),
@@ -63,7 +60,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
"check_host_in_room",
]),
state_handler=NonCallableMock(spec_set=[
- "annotate_event_with_state",
+ "compute_event_context",
"get_current_state",
]),
config=self.mock_config,
@@ -91,9 +88,6 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
self.handlers.profile_handler = ProfileHandler(self.hs)
self.room_member_handler = self.handlers.room_member_handler
- self.snapshot = Mock()
- self.datastore.snapshot_room.return_value = self.snapshot
-
self.ratelimiter = hs.get_ratelimiter()
self.ratelimiter.send_message.return_value = (True, 0)
@@ -104,50 +98,70 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
target_user_id = "@red:blue"
content = {"membership": Membership.INVITE}
- event = self.hs.get_event_factory().create_event(
- etype=RoomMemberEvent.TYPE,
- user_id=user_id,
- state_key=target_user_id,
- room_id=room_id,
- membership=Membership.INVITE,
- content=content,
+ builder = self.hs.get_event_builder_factory().new({
+ "type": EventTypes.Member,
+ "sender": user_id,
+ "state_key": target_user_id,
+ "room_id": room_id,
+ "content": content,
+ })
+
+ self.datastore.get_latest_events_in_room.return_value = (
+ defer.succeed([])
)
- self.auth.check_host_in_room.return_value = defer.succeed(True)
+ def annotate(_):
+ ctx = Mock()
+ ctx.current_state = {
+ (EventTypes.Member, "@alice:green"): self._create_member(
+ user_id="@alice:green",
+ room_id=room_id,
+ ),
+ (EventTypes.Member, "@bob:red"): self._create_member(
+ user_id="@bob:red",
+ room_id=room_id,
+ ),
+ }
+ ctx.prev_state_events = []
- store_id = "store_id_fooo"
- self.datastore.persist_event.return_value = defer.succeed(store_id)
+ return defer.succeed(ctx)
- self.datastore.get_room_member.return_value = defer.succeed(None)
+ self.state_handler.compute_event_context.side_effect = annotate
- event.old_state_events = {
- (RoomMemberEvent.TYPE, "@alice:green"): self._create_member(
- user_id="@alice:green",
- room_id=room_id,
- ),
- (RoomMemberEvent.TYPE, "@bob:red"): self._create_member(
- user_id="@bob:red",
- room_id=room_id,
- ),
- }
+ def add_auth(_, ctx):
+ ctx.auth_events = ctx.current_state[
+ (EventTypes.Member, "@bob:red")
+ ]
- event.state_events = event.old_state_events
- event.state_events[(RoomMemberEvent.TYPE, target_user_id)] = event
+ return defer.succeed(True)
+ self.auth.add_auth_events.side_effect = add_auth
- # Actual invocation
- yield self.room_member_handler.change_membership(event)
+ def send_invite(domain, event):
+ return defer.succeed(event)
- self.federation.handle_new_event.assert_called_once_with(
- event, self.snapshot,
+ self.federation.send_invite.side_effect = send_invite
+
+ room_handler = self.room_member_handler
+ event, context = yield room_handler._create_new_client_event(
+ builder
+ )
+
+ yield room_handler.change_membership(event, context)
+
+ self.state_handler.compute_event_context.assert_called_once_with(
+ builder
+ )
+
+ self.auth.add_auth_events.assert_called_once_with(
+ builder, context
)
- self.assertEquals(
- set(["red", "green"]),
- set(event.destinations)
+ self.federation.send_invite.assert_called_once_with(
+ "blue", event,
)
self.datastore.persist_event.assert_called_once_with(
- event
+ event, context=context,
)
self.notifier.on_new_room_event.assert_called_once_with(
event, extra_users=[self.hs.parse_userid(target_user_id)]
@@ -162,57 +176,58 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
user_id = "@bob:red"
user = self.hs.parse_userid(user_id)
- event = self._create_member(
- user_id=user_id,
- room_id=room_id,
- )
+ join_signal_observer = Mock()
+ self.distributor.observe("user_joined_room", join_signal_observer)
- self.auth.check_host_in_room.return_value = defer.succeed(True)
+ builder = self.hs.get_event_builder_factory().new({
+ "type": EventTypes.Member,
+ "sender": user_id,
+ "state_key": user_id,
+ "room_id": room_id,
+ "content": {"membership": Membership.JOIN},
+ })
- store_id = "store_id_fooo"
- self.datastore.persist_event.return_value = defer.succeed(store_id)
- self.datastore.get_room.return_value = defer.succeed(1) # Not None.
+ self.datastore.get_latest_events_in_room.return_value = (
+ defer.succeed([])
+ )
- prev_state = NonCallableMock()
- prev_state.membership = Membership.INVITE
- prev_state.sender = "@foo:red"
- self.datastore.get_room_member.return_value = defer.succeed(prev_state)
+ def annotate(_):
+ ctx = Mock()
+ ctx.current_state = {
+ (EventTypes.Member, "@bob:red"): self._create_member(
+ user_id="@bob:red",
+ room_id=room_id,
+ membership=Membership.INVITE
+ ),
+ }
+ ctx.prev_state_events = []
- join_signal_observer = Mock()
- self.distributor.observe("user_joined_room", join_signal_observer)
+ return defer.succeed(ctx)
+
+ self.state_handler.compute_event_context.side_effect = annotate
- event.state_events = {
- (RoomMemberEvent.TYPE, "@alice:green"): self._create_member(
- user_id="@alice:green",
- room_id=room_id,
- ),
- (RoomMemberEvent.TYPE, user_id): event,
- }
+ def add_auth(_, ctx):
+ ctx.auth_events = ctx.current_state[
+ (EventTypes.Member, "@bob:red")
+ ]
- event.old_state_events = {
- (RoomMemberEvent.TYPE, "@alice:green"): self._create_member(
- user_id="@alice:green",
- room_id=room_id,
- ),
- }
+ return defer.succeed(True)
+ self.auth.add_auth_events.side_effect = add_auth
- event.state_events = event.old_state_events
- event.state_events[(RoomMemberEvent.TYPE, user_id)] = event
+ room_handler = self.room_member_handler
+ event, context = yield room_handler._create_new_client_event(
+ builder
+ )
# Actual invocation
- yield self.room_member_handler.change_membership(event)
+ yield room_handler.change_membership(event, context)
self.federation.handle_new_event.assert_called_once_with(
- event, self.snapshot
- )
-
- self.assertEquals(
- set(["red", "green"]),
- set(event.destinations)
+ event, None, destinations=set()
)
self.datastore.persist_event.assert_called_once_with(
- event
+ event, context=context
)
self.notifier.on_new_room_event.assert_called_once_with(
event, extra_users=[user]
@@ -222,14 +237,82 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
user=user, room_id=room_id
)
- def _create_member(self, user_id, room_id):
- return self.hs.get_event_factory().create_event(
- etype=RoomMemberEvent.TYPE,
- user_id=user_id,
- state_key=user_id,
- room_id=room_id,
- membership=Membership.JOIN,
- content={"membership": Membership.JOIN},
+ def _create_member(self, user_id, room_id, membership=Membership.JOIN):
+ builder = self.hs.get_event_builder_factory().new({
+ "type": EventTypes.Member,
+ "sender": user_id,
+ "state_key": user_id,
+ "room_id": room_id,
+ "content": {"membership": membership},
+ })
+
+ return builder.build()
+
+ @defer.inlineCallbacks
+ def test_simple_leave(self):
+ room_id = "!foo:red"
+ user_id = "@bob:red"
+ user = self.hs.parse_userid(user_id)
+
+ builder = self.hs.get_event_builder_factory().new({
+ "type": EventTypes.Member,
+ "sender": user_id,
+ "state_key": user_id,
+ "room_id": room_id,
+ "content": {"membership": Membership.LEAVE},
+ })
+
+ self.datastore.get_latest_events_in_room.return_value = (
+ defer.succeed([])
+ )
+
+ def annotate(_):
+ ctx = Mock()
+ ctx.current_state = {
+ (EventTypes.Member, "@bob:red"): self._create_member(
+ user_id="@bob:red",
+ room_id=room_id,
+ membership=Membership.JOIN
+ ),
+ }
+ ctx.prev_state_events = []
+
+ return defer.succeed(ctx)
+
+ self.state_handler.compute_event_context.side_effect = annotate
+
+ def add_auth(_, ctx):
+ ctx.auth_events = ctx.current_state[
+ (EventTypes.Member, "@bob:red")
+ ]
+
+ return defer.succeed(True)
+ self.auth.add_auth_events.side_effect = add_auth
+
+ room_handler = self.room_member_handler
+ event, context = yield room_handler._create_new_client_event(
+ builder
+ )
+
+ leave_signal_observer = Mock()
+ self.distributor.observe("user_left_room", leave_signal_observer)
+
+ # Actual invocation
+ yield room_handler.change_membership(event, context)
+
+ self.federation.handle_new_event.assert_called_once_with(
+ event, None, destinations=set(['red'])
+ )
+
+ self.datastore.persist_event.assert_called_once_with(
+ event, context=context
+ )
+ self.notifier.on_new_room_event.assert_called_once_with(
+ event, extra_users=[user]
+ )
+
+ leave_signal_observer.assert_called_with(
+ user=user, room_id=room_id
)
@@ -254,13 +337,9 @@ class RoomCreationTest(unittest.TestCase):
notifier=NonCallableMock(spec_set=["on_new_room_event"]),
handlers=NonCallableMock(spec_set=[
"room_creation_handler",
- "room_member_handler",
- "federation_handler",
+ "message_handler",
]),
auth=NonCallableMock(spec_set=["check", "add_auth_events"]),
- state_handler=NonCallableMock(spec_set=[
- "annotate_event_with_state",
- ]),
ratelimiter=NonCallableMock(spec_set=[
"send_message",
]),
@@ -271,30 +350,12 @@ class RoomCreationTest(unittest.TestCase):
"handle_new_event",
])
- self.datastore = hs.get_datastore()
self.handlers = hs.get_handlers()
- self.notifier = hs.get_notifier()
- self.state_handler = hs.get_state_handler()
- self.hs = hs
- self.handlers.federation_handler = self.federation
-
- self.handlers.room_creation_handler = RoomCreationHandler(self.hs)
+ self.handlers.room_creation_handler = RoomCreationHandler(hs)
self.room_creation_handler = self.handlers.room_creation_handler
- self.handlers.room_member_handler = NonCallableMock(spec_set=[
- "change_membership"
- ])
- self.room_member_handler = self.handlers.room_member_handler
-
- def annotate(event):
- event.state_events = {}
- return defer.succeed(None)
- self.state_handler.annotate_event_with_state.side_effect = annotate
-
- def hosts(room):
- return defer.succeed([])
- self.datastore.get_joined_hosts_for_room.side_effect = hosts
+ self.message_handler = self.handlers.message_handler
self.ratelimiter = hs.get_ratelimiter()
self.ratelimiter.send_message.return_value = (True, 0)
@@ -311,14 +372,37 @@ class RoomCreationTest(unittest.TestCase):
config=config,
)
- self.assertTrue(self.room_member_handler.change_membership.called)
- join_event = self.room_member_handler.change_membership.call_args[0][0]
+ self.assertTrue(self.message_handler.create_and_send_event.called)
- self.assertEquals(RoomMemberEvent.TYPE, join_event.type)
- self.assertEquals(room_id, join_event.room_id)
- self.assertEquals(user_id, join_event.user_id)
- self.assertEquals(user_id, join_event.state_key)
+ event_dicts = [
+ e[0][0]
+ for e in self.message_handler.create_and_send_event.call_args_list
+ ]
- self.assertTrue(self.state_handler.annotate_event_with_state.called)
+ self.assertTrue(len(event_dicts) > 3)
+
+ self.assertDictContainsSubset(
+ {
+ "type": EventTypes.Create,
+ "sender": user_id,
+ "room_id": room_id,
+ },
+ event_dicts[0]
+ )
- self.assertTrue(self.federation.handle_new_event.called)
+ self.assertEqual(user_id, event_dicts[0]["content"]["creator"])
+
+ self.assertDictContainsSubset(
+ {
+ "type": EventTypes.Member,
+ "sender": user_id,
+ "room_id": room_id,
+ "state_key": user_id,
+ },
+ event_dicts[1]
+ )
+
+ self.assertEqual(
+ Membership.JOIN,
+ event_dicts[1]["content"]["membership"]
+ )
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index adb5148351..0d4b368a43 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -22,9 +22,12 @@ import json
from ..utils import MockHttpResource, MockClock, DeferredMockCallable, MockKey
+from synapse.api.errors import AuthError
from synapse.server import HomeServer
from synapse.handlers.typing import TypingNotificationHandler
+from synapse.storage.transactions import DestinationsTable
+
def _expect_edu(destination, edu_type, content, origin="test"):
return {
@@ -63,7 +66,13 @@ class TypingNotificationsTestCase(unittest.TestCase):
self.mock_config = Mock()
self.mock_config.signing_key = [MockKey()]
+ mock_notifier = Mock(spec=["on_new_user_event"])
+ self.on_new_user_event = mock_notifier.on_new_user_event
+
+ self.auth = Mock(spec=[])
+
hs = HomeServer("test",
+ auth=self.auth,
clock=self.clock,
db_pool=None,
datastore=Mock(spec=[
@@ -72,8 +81,10 @@ class TypingNotificationsTestCase(unittest.TestCase):
"delivered_txn",
"get_received_txn_response",
"set_received_txn_response",
+ "get_destination_retry_timings",
]),
handlers=None,
+ notifier=mock_notifier,
resource_for_client=Mock(),
resource_for_federation=self.mock_federation_resource,
http_client=self.mock_http_client,
@@ -82,13 +93,14 @@ class TypingNotificationsTestCase(unittest.TestCase):
)
hs.handlers = JustTypingNotificationHandlers(hs)
- self.mock_update_client = Mock()
- self.mock_update_client.return_value = defer.succeed(None)
-
self.handler = hs.get_handlers().typing_notification_handler
- self.handler.push_update_to_clients = self.mock_update_client
+
+ self.event_source = hs.get_event_sources().sources["typing"]
self.datastore = hs.get_datastore()
+ self.datastore.get_destination_retry_timings.return_value = (
+ defer.succeed(DestinationsTable.EntryType("", 0, 0))
+ )
def get_received_txn_response(*args):
return defer.succeed(None)
@@ -125,7 +137,7 @@ class TypingNotificationsTestCase(unittest.TestCase):
if ignore_user is not None and member == ignore_user:
continue
- if member.is_mine:
+ if hs.is_mine(member):
if localusers is not None:
localusers.add(member)
else:
@@ -134,6 +146,12 @@ class TypingNotificationsTestCase(unittest.TestCase):
self.room_member_handler.fetch_room_distributions_into = (
fetch_room_distributions_into)
+ def check_joined_room(room_id, user_id):
+ if user_id not in [u.to_string() for u in self.room_members]:
+ raise AuthError(401, "User is not in the room")
+
+ self.auth.check_joined_room = check_joined_room
+
# Some local users to test with
self.u_apple = hs.parse_userid("@apple:test")
self.u_banana = hs.parse_userid("@banana:test")
@@ -145,6 +163,8 @@ class TypingNotificationsTestCase(unittest.TestCase):
def test_started_typing_local(self):
self.room_members = [self.u_apple, self.u_banana]
+ self.assertEquals(self.event_source.get_current_key(), 0)
+
yield self.handler.started_typing(
target_user=self.u_apple,
auth_user=self.u_apple,
@@ -152,13 +172,22 @@ class TypingNotificationsTestCase(unittest.TestCase):
timeout=20000,
)
- self.mock_update_client.assert_has_calls([
- call(observer_user=self.u_banana,
- observed_user=self.u_apple,
- room_id=self.room_id,
- typing=True),
+ self.on_new_user_event.assert_has_calls([
+ call(rooms=[self.room_id]),
])
+ self.assertEquals(self.event_source.get_current_key(), 1)
+ self.assertEquals(
+ self.event_source.get_new_events_for_user(self.u_apple, 0, None)[0],
+ [
+ {"type": "m.typing",
+ "room_id": self.room_id,
+ "content": {
+ "user_ids": [self.u_apple.to_string()],
+ }},
+ ]
+ )
+
@defer.inlineCallbacks
def test_started_typing_remote_send(self):
self.room_members = [self.u_apple, self.u_onion]
@@ -192,6 +221,8 @@ class TypingNotificationsTestCase(unittest.TestCase):
def test_started_typing_remote_recv(self):
self.room_members = [self.u_apple, self.u_onion]
+ self.assertEquals(self.event_source.get_current_key(), 0)
+
yield self.mock_federation_resource.trigger("PUT",
"/_matrix/federation/v1/send/1000000/",
_make_edu_json("farm", "m.typing",
@@ -203,13 +234,22 @@ class TypingNotificationsTestCase(unittest.TestCase):
)
)
- self.mock_update_client.assert_has_calls([
- call(observer_user=self.u_apple,
- observed_user=self.u_onion,
- room_id=self.room_id,
- typing=True),
+ self.on_new_user_event.assert_has_calls([
+ call(rooms=[self.room_id]),
])
+ self.assertEquals(self.event_source.get_current_key(), 1)
+ self.assertEquals(
+ self.event_source.get_new_events_for_user(self.u_apple, 0, None)[0],
+ [
+ {"type": "m.typing",
+ "room_id": self.room_id,
+ "content": {
+ "user_ids": [self.u_onion.to_string()],
+ }},
+ ]
+ )
+
@defer.inlineCallbacks
def test_stopped_typing(self):
self.room_members = [self.u_apple, self.u_banana, self.u_onion]
@@ -232,9 +272,14 @@ class TypingNotificationsTestCase(unittest.TestCase):
# Gut-wrenching
from synapse.handlers.typing import RoomMember
- self.handler._member_typing_until[
- RoomMember(self.room_id, self.u_apple)
- ] = 1002000
+ member = RoomMember(self.room_id, self.u_apple)
+ self.handler._member_typing_until[member] = 1002000
+ self.handler._member_typing_timer[member] = (
+ self.clock.call_later(1002, lambda: 0)
+ )
+ self.handler._room_typing[self.room_id] = set((self.u_apple,))
+
+ self.assertEquals(self.event_source.get_current_key(), 0)
yield self.handler.stopped_typing(
target_user=self.u_apple,
@@ -242,11 +287,68 @@ class TypingNotificationsTestCase(unittest.TestCase):
room_id=self.room_id,
)
- self.mock_update_client.assert_has_calls([
- call(observer_user=self.u_banana,
- observed_user=self.u_apple,
- room_id=self.room_id,
- typing=False),
+ self.on_new_user_event.assert_has_calls([
+ call(rooms=[self.room_id]),
])
yield put_json.await_calls()
+
+ self.assertEquals(self.event_source.get_current_key(), 1)
+ self.assertEquals(
+ self.event_source.get_new_events_for_user(self.u_apple, 0, None)[0],
+ [
+ {"type": "m.typing",
+ "room_id": self.room_id,
+ "content": {
+ "user_ids": [],
+ }},
+ ]
+ )
+
+ @defer.inlineCallbacks
+ def test_typing_timeout(self):
+ self.room_members = [self.u_apple, self.u_banana]
+
+ self.assertEquals(self.event_source.get_current_key(), 0)
+
+ yield self.handler.started_typing(
+ target_user=self.u_apple,
+ auth_user=self.u_apple,
+ room_id=self.room_id,
+ timeout=10000,
+ )
+
+ self.on_new_user_event.assert_has_calls([
+ call(rooms=[self.room_id]),
+ ])
+ self.on_new_user_event.reset_mock()
+
+ self.assertEquals(self.event_source.get_current_key(), 1)
+ self.assertEquals(
+ self.event_source.get_new_events_for_user(self.u_apple, 0, None)[0],
+ [
+ {"type": "m.typing",
+ "room_id": self.room_id,
+ "content": {
+ "user_ids": [self.u_apple.to_string()],
+ }},
+ ]
+ )
+
+ self.clock.advance_time(11)
+
+ self.on_new_user_event.assert_has_calls([
+ call(rooms=[self.room_id]),
+ ])
+
+ self.assertEquals(self.event_source.get_current_key(), 2)
+ self.assertEquals(
+ self.event_source.get_new_events_for_user(self.u_apple, 1, None)[0],
+ [
+ {"type": "m.typing",
+ "room_id": self.room_id,
+ "content": {
+ "user_ids": [],
+ }},
+ ]
+ )
|
