Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-08-04 19:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename MockHttpServer to MockHttpResource as it stands for one server resource rather than an entire server

Browse Source
This commit is contained in:
Paul "LeoNerd" Evans 2014-08-18 14:03:07 +01:00
parent f48792eec4
commit bb793019a5
7 changed files with 147 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/federation/test_federation.py
View File

@ -20,7 +20,7 @@ from twisted.trial import unittest
from mock import Mock from mock import Mock
import logging import logging
from ..utils import MockHttpServer, MockClock from ..utils import MockHttpResource, MockClock
from synapse.server import HomeServer from synapse.server import HomeServer
from synapse.federation import initialize_http_replication from synapse.federation import initialize_http_replication
@ -50,7 +50,7 @@ def make_pdu(prev_pdus=[], **kwargs):
class FederationTestCase(unittest.TestCase): class FederationTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.mock_http_server = MockHttpServer() self.mock_resource = MockHttpResource()
self.mock_http_client = Mock(spec=[ self.mock_http_client = Mock(spec=[
"get_json", "get_json",
"put_json", "put_json",
@ -70,7 +70,7 @@ class FederationTestCase(unittest.TestCase):
) )
self.clock = MockClock() self.clock = MockClock()
hs = HomeServer("test", hs = HomeServer("test",
resource_for_federation=self.mock_http_server, resource_for_federation=self.mock_resource,
http_client=self.mock_http_client, http_client=self.mock_http_client,
db_pool=None, db_pool=None,
datastore=self.mock_persistence, datastore=self.mock_persistence,
@ -86,7 +86,7 @@ class FederationTestCase(unittest.TestCase):
) )
# Empty context initially # Empty context initially
(code, response) = yield self.mock_http_server.trigger("GET", (code, response) = yield self.mock_resource.trigger("GET",
"/matrix/federation/v1/state/my-context/", None) "/matrix/federation/v1/state/my-context/", None)
self.assertEquals(200, code) self.assertEquals(200, code)
self.assertFalse(response["pdus"]) self.assertFalse(response["pdus"])
@ -111,7 +111,7 @@ class FederationTestCase(unittest.TestCase):
]) ])
) )
(code, response) = yield self.mock_http_server.trigger("GET", (code, response) = yield self.mock_resource.trigger("GET",
"/matrix/federation/v1/state/my-context/", None) "/matrix/federation/v1/state/my-context/", None)
self.assertEquals(200, code) self.assertEquals(200, code)
self.assertEquals(1, len(response["pdus"])) self.assertEquals(1, len(response["pdus"]))
@ -122,7 +122,7 @@ class FederationTestCase(unittest.TestCase):
defer.succeed(None) defer.succeed(None)
) )
(code, response) = yield self.mock_http_server.trigger("GET", (code, response) = yield self.mock_resource.trigger("GET",
"/matrix/federation/v1/pdu/red/abc123def456/", None) "/matrix/federation/v1/pdu/red/abc123def456/", None)
self.assertEquals(404, code) self.assertEquals(404, code)
@ -141,7 +141,7 @@ class FederationTestCase(unittest.TestCase):
) )
) )
(code, response) = yield self.mock_http_server.trigger("GET", (code, response) = yield self.mock_resource.trigger("GET",
"/matrix/federation/v1/pdu/red/abc123def456/", None) "/matrix/federation/v1/pdu/red/abc123def456/", None)
self.assertEquals(200, code) self.assertEquals(200, code)
self.assertEquals(1, len(response["pdus"])) self.assertEquals(1, len(response["pdus"]))
@ -225,7 +225,7 @@ class FederationTestCase(unittest.TestCase):
self.federation.register_edu_handler("m.test", recv_observer) self.federation.register_edu_handler("m.test", recv_observer)
yield self.mock_http_server.trigger("PUT", yield self.mock_resource.trigger("PUT",
"/matrix/federation/v1/send/1001000/", "/matrix/federation/v1/send/1001000/",
"""{ """{
"origin": "remote", "origin": "remote",
@ -272,7 +272,7 @@ class FederationTestCase(unittest.TestCase):
self.federation.register_query_handler("a-question", recv_handler) self.federation.register_query_handler("a-question", recv_handler)
code, response = yield self.mock_http_server.trigger("GET", code, response = yield self.mock_resource.trigger("GET",
"/matrix/federation/v1/query/a-question?three=3&four=4", None) "/matrix/federation/v1/query/a-question?three=3&four=4", None)
self.assertEquals(200, code) self.assertEquals(200, code)

16
tests/rest/test_events.py
View File

@ -29,7 +29,7 @@ from synapse.server import HomeServer
import json import json
import logging import logging
from ..utils import MockHttpServer, MemoryDataStore from ..utils import MockHttpResource, MemoryDataStore
from .utils import RestTestCase from .utils import RestTestCase
from mock import Mock from mock import Mock
@ -116,7 +116,7 @@ class EventStreamPermissionsTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def setUp(self): def setUp(self):
self.mock_server = MockHttpServer(prefix=PATH_PREFIX) self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
state_handler = Mock(spec=["handle_new_event"]) state_handler = Mock(spec=["handle_new_event"])
state_handler.handle_new_event.return_value = True state_handler.handle_new_event.return_value = True
@ -142,9 +142,9 @@ class EventStreamPermissionsTestCase(RestTestCase):
hs.get_clock().time_msec.return_value = 1000000 hs.get_clock().time_msec.return_value = 1000000
hs.datastore = MemoryDataStore() hs.datastore = MemoryDataStore()
synapse.rest.register.register_servlets(hs, self.mock_server) synapse.rest.register.register_servlets(hs, self.mock_resource)
synapse.rest.events.register_servlets(hs, self.mock_server) synapse.rest.events.register_servlets(hs, self.mock_resource)
synapse.rest.room.register_servlets(hs, self.mock_server) synapse.rest.room.register_servlets(hs, self.mock_resource)
# register an account # register an account
self.user_id = "sid1" self.user_id = "sid1"
@ -164,12 +164,12 @@ class EventStreamPermissionsTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_stream_basic_permissions(self): def test_stream_basic_permissions(self):
# invalid token, expect 403 # invalid token, expect 403
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
"/events?access_token=%s" % ("invalid" + self.token)) "/events?access_token=%s" % ("invalid" + self.token))
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
# valid token, expect content # valid token, expect content
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
"/events?access_token=%s&timeout=0" % (self.token)) "/events?access_token=%s&timeout=0" % (self.token))
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
self.assertTrue("chunk" in response) self.assertTrue("chunk" in response)
@ -186,7 +186,7 @@ class EventStreamPermissionsTestCase(RestTestCase):
# invited to room (expect no content for room) # invited to room (expect no content for room)
yield self.invite(room_id, src=self.other_user, targ=self.user_id, yield self.invite(room_id, src=self.other_user, targ=self.user_id,
tok=self.other_token) tok=self.other_token)
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
"/events?access_token=%s&timeout=0" % (self.token)) "/events?access_token=%s&timeout=0" % (self.token))
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))

34
tests/rest/test_presence.py
View File

@ -21,7 +21,7 @@ from twisted.internet import defer
from mock import Mock from mock import Mock
import logging import logging
from ..utils import MockHttpServer from ..utils import MockHttpResource
from synapse.api.constants import PresenceState from synapse.api.constants import PresenceState
from synapse.server import HomeServer from synapse.server import HomeServer
@ -42,7 +42,7 @@ PATH_PREFIX = "/matrix/client/api/v1"
class PresenceStateTestCase(unittest.TestCase): class PresenceStateTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.mock_server = MockHttpServer(prefix=PATH_PREFIX) self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
self.mock_handler = Mock(spec=[ self.mock_handler = Mock(spec=[
"get_state", "get_state",
"set_state", "set_state",
@ -51,8 +51,8 @@ class PresenceStateTestCase(unittest.TestCase):
hs = HomeServer("test", hs = HomeServer("test",
db_pool=None, db_pool=None,
http_client=None, http_client=None,
resource_for_client=self.mock_server, resource_for_client=self.mock_resource,
resource_for_federation=self.mock_server, resource_for_federation=self.mock_resource,
) )
def _get_user_by_token(token=None): def _get_user_by_token(token=None):
@ -72,7 +72,7 @@ class PresenceStateTestCase(unittest.TestCase):
mocked_get.return_value = defer.succeed( mocked_get.return_value = defer.succeed(
{"state": ONLINE, "status_msg": "Available"}) {"state": ONLINE, "status_msg": "Available"})
(code, response) = yield self.mock_server.trigger("GET", (code, response) = yield self.mock_resource.trigger("GET",
"/presence/%s/status" % (myid), None) "/presence/%s/status" % (myid), None)
self.assertEquals(200, code) self.assertEquals(200, code)
@ -86,7 +86,7 @@ class PresenceStateTestCase(unittest.TestCase):
mocked_set = self.mock_handler.set_state mocked_set = self.mock_handler.set_state
mocked_set.return_value = defer.succeed(()) mocked_set.return_value = defer.succeed(())
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
"/presence/%s/status" % (myid), "/presence/%s/status" % (myid),
'{"state": "unavailable", "status_msg": "Away"}') '{"state": "unavailable", "status_msg": "Away"}')
@ -99,7 +99,7 @@ class PresenceStateTestCase(unittest.TestCase):
class PresenceListTestCase(unittest.TestCase): class PresenceListTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.mock_server = MockHttpServer(prefix=PATH_PREFIX) self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
self.mock_handler = Mock(spec=[ self.mock_handler = Mock(spec=[
"get_presence_list", "get_presence_list",
"send_invite", "send_invite",
@ -109,8 +109,8 @@ class PresenceListTestCase(unittest.TestCase):
hs = HomeServer("test", hs = HomeServer("test",
db_pool=None, db_pool=None,
http_client=None, http_client=None,
resource_for_client=self.mock_server, resource_for_client=self.mock_resource,
resource_for_federation=self.mock_server resource_for_federation=self.mock_resource
) )
def _get_user_by_token(token=None): def _get_user_by_token(token=None):
@ -131,7 +131,7 @@ class PresenceListTestCase(unittest.TestCase):
[{"observed_user": self.u_banana}] [{"observed_user": self.u_banana}]
) )
(code, response) = yield self.mock_server.trigger("GET", (code, response) = yield self.mock_resource.trigger("GET",
"/presence_list/%s" % (myid), None) "/presence_list/%s" % (myid), None)
self.assertEquals(200, code) self.assertEquals(200, code)
@ -141,7 +141,7 @@ class PresenceListTestCase(unittest.TestCase):
def test_invite(self): def test_invite(self):
self.mock_handler.send_invite.return_value = defer.succeed(()) self.mock_handler.send_invite.return_value = defer.succeed(())
(code, response) = yield self.mock_server.trigger("POST", (code, response) = yield self.mock_resource.trigger("POST",
"/presence_list/%s" % (myid), "/presence_list/%s" % (myid),
"""{ """{
"invite": ["@banana:test"] "invite": ["@banana:test"]
@ -156,7 +156,7 @@ class PresenceListTestCase(unittest.TestCase):
def test_drop(self): def test_drop(self):
self.mock_handler.drop.return_value = defer.succeed(()) self.mock_handler.drop.return_value = defer.succeed(())
(code, response) = yield self.mock_server.trigger("POST", (code, response) = yield self.mock_resource.trigger("POST",
"/presence_list/%s" % (myid), "/presence_list/%s" % (myid),
"""{ """{
"drop": ["@banana:test"] "drop": ["@banana:test"]
@ -170,7 +170,7 @@ class PresenceListTestCase(unittest.TestCase):
class PresenceEventStreamTestCase(unittest.TestCase): class PresenceEventStreamTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.mock_server = MockHttpServer(prefix=PATH_PREFIX) self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
# TODO: mocked data store # TODO: mocked data store
@ -185,8 +185,8 @@ class PresenceEventStreamTestCase(unittest.TestCase):
hs = HomeServer("test", hs = HomeServer("test",
db_pool=None, db_pool=None,
http_client=None, http_client=None,
resource_for_client=self.mock_server, resource_for_client=self.mock_resource,
resource_for_federation=self.mock_server, resource_for_federation=self.mock_resource,
datastore=Mock(spec=[ datastore=Mock(spec=[
"set_presence_state", "set_presence_state",
"get_presence_list", "get_presence_list",
@ -226,7 +226,7 @@ class PresenceEventStreamTestCase(unittest.TestCase):
self.mock_datastore.get_presence_list.return_value = defer.succeed( self.mock_datastore.get_presence_list.return_value = defer.succeed(
[]) [])
(code, response) = yield self.mock_server.trigger("GET", (code, response) = yield self.mock_resource.trigger("GET",
"/events?timeout=0", None) "/events?timeout=0", None)
self.assertEquals(200, code) self.assertEquals(200, code)
@ -252,7 +252,7 @@ class PresenceEventStreamTestCase(unittest.TestCase):
yield self.presence.set_state(self.u_banana, self.u_banana, yield self.presence.set_state(self.u_banana, self.u_banana,
state={"state": ONLINE}) state={"state": ONLINE})
(code, response) = yield self.mock_server.trigger("GET", (code, response) = yield self.mock_resource.trigger("GET",
"/events?from=1&timeout=0", None) "/events?from=1&timeout=0", None)
self.assertEquals(200, code) self.assertEquals(200, code)

20
tests/rest/test_profile.py
View File

@ -20,7 +20,7 @@ from twisted.internet import defer
from mock import Mock from mock import Mock
from ..utils import MockHttpServer from ..utils import MockHttpResource
from synapse.api.errors import SynapseError, AuthError from synapse.api.errors import SynapseError, AuthError
from synapse.server import HomeServer from synapse.server import HomeServer
@ -32,7 +32,7 @@ class ProfileTestCase(unittest.TestCase):
""" Tests profile management. """ """ Tests profile management. """
def setUp(self): def setUp(self):
self.mock_server = MockHttpServer(prefix=PATH_PREFIX) self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
self.mock_handler = Mock(spec=[ self.mock_handler = Mock(spec=[
"get_displayname", "get_displayname",
"set_displayname", "set_displayname",
@ -43,7 +43,7 @@ class ProfileTestCase(unittest.TestCase):
hs = HomeServer("test", hs = HomeServer("test",
db_pool=None, db_pool=None,
http_client=None, http_client=None,
resource_for_client=self.mock_server, resource_for_client=self.mock_resource,
federation=Mock(), federation=Mock(),
replication_layer=Mock(), replication_layer=Mock(),
) )
@ -62,7 +62,7 @@ class ProfileTestCase(unittest.TestCase):
mocked_get = self.mock_handler.get_displayname mocked_get = self.mock_handler.get_displayname
mocked_get.return_value = defer.succeed("Frank") mocked_get.return_value = defer.succeed("Frank")
(code, response) = yield self.mock_server.trigger("GET", (code, response) = yield self.mock_resource.trigger("GET",
"/profile/%s/displayname" % (myid), None) "/profile/%s/displayname" % (myid), None)
self.assertEquals(200, code) self.assertEquals(200, code)
@ -74,7 +74,7 @@ class ProfileTestCase(unittest.TestCase):
mocked_set = self.mock_handler.set_displayname mocked_set = self.mock_handler.set_displayname
mocked_set.return_value = defer.succeed(()) mocked_set.return_value = defer.succeed(())
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
"/profile/%s/displayname" % (myid), "/profile/%s/displayname" % (myid),
'{"displayname": "Frank Jr."}') '{"displayname": "Frank Jr."}')
@ -88,7 +88,7 @@ class ProfileTestCase(unittest.TestCase):
mocked_set = self.mock_handler.set_displayname mocked_set = self.mock_handler.set_displayname
mocked_set.side_effect = AuthError(400, "message") mocked_set.side_effect = AuthError(400, "message")
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
"/profile/%s/displayname" % ("@4567:test"), '"Frank Jr."') "/profile/%s/displayname" % ("@4567:test"), '"Frank Jr."')
self.assertTrue(400 <= code < 499, self.assertTrue(400 <= code < 499,
@ -99,7 +99,7 @@ class ProfileTestCase(unittest.TestCase):
mocked_get = self.mock_handler.get_displayname mocked_get = self.mock_handler.get_displayname
mocked_get.return_value = defer.succeed("Bob") mocked_get.return_value = defer.succeed("Bob")
(code, response) = yield self.mock_server.trigger("GET", (code, response) = yield self.mock_resource.trigger("GET",
"/profile/%s/displayname" % ("@opaque:elsewhere"), None) "/profile/%s/displayname" % ("@opaque:elsewhere"), None)
self.assertEquals(200, code) self.assertEquals(200, code)
@ -110,7 +110,7 @@ class ProfileTestCase(unittest.TestCase):
mocked_set = self.mock_handler.set_displayname mocked_set = self.mock_handler.set_displayname
mocked_set.side_effect = SynapseError(400, "message") mocked_set.side_effect = SynapseError(400, "message")
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
"/profile/%s/displayname" % ("@opaque:elsewhere"), None) "/profile/%s/displayname" % ("@opaque:elsewhere"), None)
self.assertTrue(400 <= code <= 499, self.assertTrue(400 <= code <= 499,
@ -121,7 +121,7 @@ class ProfileTestCase(unittest.TestCase):
mocked_get = self.mock_handler.get_avatar_url mocked_get = self.mock_handler.get_avatar_url
mocked_get.return_value = defer.succeed("http://my.server/me.png") mocked_get.return_value = defer.succeed("http://my.server/me.png")
(code, response) = yield self.mock_server.trigger("GET", (code, response) = yield self.mock_resource.trigger("GET",
"/profile/%s/avatar_url" % (myid), None) "/profile/%s/avatar_url" % (myid), None)
self.assertEquals(200, code) self.assertEquals(200, code)
@ -133,7 +133,7 @@ class ProfileTestCase(unittest.TestCase):
mocked_set = self.mock_handler.set_avatar_url mocked_set = self.mock_handler.set_avatar_url
mocked_set.return_value = defer.succeed(()) mocked_set.return_value = defer.succeed(())
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
"/profile/%s/avatar_url" % (myid), "/profile/%s/avatar_url" % (myid),
'{"avatar_url": "http://my.server/pic.gif"}') '{"avatar_url": "http://my.server/pic.gif"}')

188
tests/rest/test_rooms.py
View File

@ -27,7 +27,7 @@ from synapse.server import HomeServer
import json import json
import urllib import urllib
from ..utils import MockHttpServer, MemoryDataStore from ..utils import MockHttpResource, MemoryDataStore
from .utils import RestTestCase from .utils import RestTestCase
from mock import Mock from mock import Mock
@ -42,7 +42,7 @@ class RoomPermissionsTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def setUp(self): def setUp(self):
self.mock_server = MockHttpServer(prefix=PATH_PREFIX) self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
state_handler = Mock(spec=["handle_new_event"]) state_handler = Mock(spec=["handle_new_event"])
state_handler.handle_new_event.return_value = True state_handler.handle_new_event.return_value = True
@ -67,7 +67,7 @@ class RoomPermissionsTestCase(RestTestCase):
self.auth_user_id = self.rmcreator_id self.auth_user_id = self.rmcreator_id
synapse.rest.room.register_servlets(hs, self.mock_server) synapse.rest.room.register_servlets(hs, self.mock_resource)
self.auth = hs.get_auth() self.auth = hs.get_auth()
@ -85,14 +85,14 @@ class RoomPermissionsTestCase(RestTestCase):
# send a message in one of the rooms # send a message in one of the rooms
self.created_rmid_msg_path = ("/rooms/%s/messages/%s/midaaa1" % self.created_rmid_msg_path = ("/rooms/%s/messages/%s/midaaa1" %
(self.created_rmid, self.rmcreator_id)) (self.created_rmid, self.rmcreator_id))
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", "PUT",
self.created_rmid_msg_path, self.created_rmid_msg_path,
'{"msgtype":"m.text","body":"test msg"}') '{"msgtype":"m.text","body":"test msg"}')
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
# set topic for public room # set topic for public room
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", "PUT",
"/rooms/%s/topic" % self.created_public_rmid, "/rooms/%s/topic" % self.created_public_rmid,
'{"topic":"Public Room Topic"}') '{"topic":"Public Room Topic"}')
@ -107,31 +107,31 @@ class RoomPermissionsTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_get_message(self): def test_get_message(self):
# get message in uncreated room, expect 403 # get message in uncreated room, expect 403
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
"/rooms/noroom/messages/someid/m1") "/rooms/noroom/messages/someid/m1")
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
# get message in created room not joined (no state), expect 403 # get message in created room not joined (no state), expect 403
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
self.created_rmid_msg_path) self.created_rmid_msg_path)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
# get message in created room and invited, expect 403 # get message in created room and invited, expect 403
yield self.invite(room=self.created_rmid, src=self.rmcreator_id, yield self.invite(room=self.created_rmid, src=self.rmcreator_id,
targ=self.user_id) targ=self.user_id)
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
self.created_rmid_msg_path) self.created_rmid_msg_path)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
# get message in created room and joined, expect 200 # get message in created room and joined, expect 200
yield self.join(room=self.created_rmid, user=self.user_id) yield self.join(room=self.created_rmid, user=self.user_id)
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
self.created_rmid_msg_path) self.created_rmid_msg_path)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
# get message in created room and left, expect 403 # get message in created room and left, expect 403
yield self.leave(room=self.created_rmid, user=self.user_id) yield self.leave(room=self.created_rmid, user=self.user_id)
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
self.created_rmid_msg_path) self.created_rmid_msg_path)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
@ -142,33 +142,33 @@ class RoomPermissionsTestCase(RestTestCase):
(self.created_rmid, self.user_id)) (self.created_rmid, self.user_id))
# send message in uncreated room, expect 403 # send message in uncreated room, expect 403
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", "PUT",
"/rooms/%s/messages/%s/mid1" % "/rooms/%s/messages/%s/mid1" %
(self.uncreated_rmid, self.user_id), msg_content) (self.uncreated_rmid, self.user_id), msg_content)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
# send message in created room not joined (no state), expect 403 # send message in created room not joined (no state), expect 403
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", send_msg_path, msg_content) "PUT", send_msg_path, msg_content)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
# send message in created room and invited, expect 403 # send message in created room and invited, expect 403
yield self.invite(room=self.created_rmid, src=self.rmcreator_id, yield self.invite(room=self.created_rmid, src=self.rmcreator_id,
targ=self.user_id) targ=self.user_id)
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", send_msg_path, msg_content) "PUT", send_msg_path, msg_content)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
# send message in created room and joined, expect 200 # send message in created room and joined, expect 200
yield self.join(room=self.created_rmid, user=self.user_id) yield self.join(room=self.created_rmid, user=self.user_id)
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", send_msg_path, msg_content) "PUT", send_msg_path, msg_content)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
# send message in created room and left, expect 403 # send message in created room and left, expect 403
yield self.leave(room=self.created_rmid, user=self.user_id) yield self.leave(room=self.created_rmid, user=self.user_id)
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", send_msg_path, msg_content) "PUT", send_msg_path, msg_content)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
@ -178,56 +178,56 @@ class RoomPermissionsTestCase(RestTestCase):
topic_path = "/rooms/%s/topic" % self.created_rmid topic_path = "/rooms/%s/topic" % self.created_rmid
# set/get topic in uncreated room, expect 403 # set/get topic in uncreated room, expect 403
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", "/rooms/%s/topic" % self.uncreated_rmid, "PUT", "/rooms/%s/topic" % self.uncreated_rmid,
topic_content) topic_content)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
"/rooms/%s/topic" % self.uncreated_rmid) "/rooms/%s/topic" % self.uncreated_rmid)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
# set/get topic in created PRIVATE room not joined, expect 403 # set/get topic in created PRIVATE room not joined, expect 403
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", topic_path, topic_content) "PUT", topic_path, topic_content)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
(code, response) = yield self.mock_server.trigger_get(topic_path) (code, response) = yield self.mock_resource.trigger_get(topic_path)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
# set topic in created PRIVATE room and invited, expect 403 # set topic in created PRIVATE room and invited, expect 403
yield self.invite(room=self.created_rmid, src=self.rmcreator_id, yield self.invite(room=self.created_rmid, src=self.rmcreator_id,
targ=self.user_id) targ=self.user_id)
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", topic_path, topic_content) "PUT", topic_path, topic_content)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
# get topic in created PRIVATE room and invited, expect 200 (or 404) # get topic in created PRIVATE room and invited, expect 200 (or 404)
(code, response) = yield self.mock_server.trigger_get(topic_path) (code, response) = yield self.mock_resource.trigger_get(topic_path)
self.assertEquals(404, code, msg=str(response)) self.assertEquals(404, code, msg=str(response))
# set/get topic in created PRIVATE room and joined, expect 200 # set/get topic in created PRIVATE room and joined, expect 200
yield self.join(room=self.created_rmid, user=self.user_id) yield self.join(room=self.created_rmid, user=self.user_id)
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", topic_path, topic_content) "PUT", topic_path, topic_content)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
(code, response) = yield self.mock_server.trigger_get(topic_path) (code, response) = yield self.mock_resource.trigger_get(topic_path)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
self.assert_dict(json.loads(topic_content), response) self.assert_dict(json.loads(topic_content), response)
# set/get topic in created PRIVATE room and left, expect 403 # set/get topic in created PRIVATE room and left, expect 403
yield self.leave(room=self.created_rmid, user=self.user_id) yield self.leave(room=self.created_rmid, user=self.user_id)
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", topic_path, topic_content) "PUT", topic_path, topic_content)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
(code, response) = yield self.mock_server.trigger_get(topic_path) (code, response) = yield self.mock_resource.trigger_get(topic_path)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
# get topic in PUBLIC room, not joined, expect 200 (or 404) # get topic in PUBLIC room, not joined, expect 200 (or 404)
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
"/rooms/%s/topic" % self.created_public_rmid) "/rooms/%s/topic" % self.created_public_rmid)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
# set topic in PUBLIC room, not joined, expect 403 # set topic in PUBLIC room, not joined, expect 403
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", "PUT",
"/rooms/%s/topic" % self.created_public_rmid, "/rooms/%s/topic" % self.created_public_rmid,
topic_content) topic_content)
@ -237,7 +237,7 @@ class RoomPermissionsTestCase(RestTestCase):
def _test_get_membership(self, room=None, members=[], expect_code=None): def _test_get_membership(self, room=None, members=[], expect_code=None):
path = "/rooms/%s/members/%s/state" path = "/rooms/%s/members/%s/state"
for member in members: for member in members:
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
path % path %
(room, member)) (room, member))
self.assertEquals(expect_code, code) self.assertEquals(expect_code, code)
@ -391,7 +391,7 @@ class RoomsMemberListTestCase(RestTestCase):
user_id = "@sid1:red" user_id = "@sid1:red"
def setUp(self): def setUp(self):
self.mock_server = MockHttpServer(prefix=PATH_PREFIX) self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
state_handler = Mock(spec=["handle_new_event"]) state_handler = Mock(spec=["handle_new_event"])
state_handler.handle_new_event.return_value = True state_handler.handle_new_event.return_value = True
@ -416,7 +416,7 @@ class RoomsMemberListTestCase(RestTestCase):
return hs.parse_userid(self.auth_user_id) return hs.parse_userid(self.auth_user_id)
hs.get_auth().get_user_by_token = _get_user_by_token hs.get_auth().get_user_by_token = _get_user_by_token
synapse.rest.room.register_servlets(hs, self.mock_server) synapse.rest.room.register_servlets(hs, self.mock_resource)
def tearDown(self): def tearDown(self):
pass pass
@ -425,13 +425,13 @@ class RoomsMemberListTestCase(RestTestCase):
def test_get_member_list(self): def test_get_member_list(self):
room_id = "!aa:test" room_id = "!aa:test"
yield self.create_room_as(room_id, self.user_id) yield self.create_room_as(room_id, self.user_id)
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
"/rooms/%s/members/list" % room_id) "/rooms/%s/members/list" % room_id)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
@defer.inlineCallbacks @defer.inlineCallbacks
def test_get_member_list_no_room(self): def test_get_member_list_no_room(self):
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
"/rooms/roomdoesnotexist/members/list") "/rooms/roomdoesnotexist/members/list")
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
@ -439,7 +439,7 @@ class RoomsMemberListTestCase(RestTestCase):
def test_get_member_list_no_permission(self): def test_get_member_list_no_permission(self):
room_id = "!bb:test" room_id = "!bb:test"
yield self.create_room_as(room_id, "@some_other_guy:red") yield self.create_room_as(room_id, "@some_other_guy:red")
(code, response) = yield self.mock_server.trigger_get( (code, response) = yield self.mock_resource.trigger_get(
"/rooms/%s/members/list" % room_id) "/rooms/%s/members/list" % room_id)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
@ -452,17 +452,17 @@ class RoomsMemberListTestCase(RestTestCase):
yield self.invite(room=room_id, src=room_creator, yield self.invite(room=room_id, src=room_creator,
targ=self.user_id) targ=self.user_id)
# can't see list if you're just invited. # can't see list if you're just invited.
(code, response) = yield self.mock_server.trigger_get(room_path) (code, response) = yield self.mock_resource.trigger_get(room_path)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
yield self.join(room=room_id, user=self.user_id) yield self.join(room=room_id, user=self.user_id)
# can see list now joined # can see list now joined
(code, response) = yield self.mock_server.trigger_get(room_path) (code, response) = yield self.mock_resource.trigger_get(room_path)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
yield self.leave(room=room_id, user=self.user_id) yield self.leave(room=room_id, user=self.user_id)
# can no longer see list, you've left. # can no longer see list, you've left.
(code, response) = yield self.mock_server.trigger_get(room_path) (code, response) = yield self.mock_resource.trigger_get(room_path)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))
@ -471,7 +471,7 @@ class RoomsCreateTestCase(RestTestCase):
user_id = "@sid1:red" user_id = "@sid1:red"
def setUp(self): def setUp(self):
self.mock_server = MockHttpServer(prefix=PATH_PREFIX) self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
self.auth_user_id = self.user_id self.auth_user_id = self.user_id
state_handler = Mock(spec=["handle_new_event"]) state_handler = Mock(spec=["handle_new_event"])
@ -495,7 +495,7 @@ class RoomsCreateTestCase(RestTestCase):
return hs.parse_userid(self.auth_user_id) return hs.parse_userid(self.auth_user_id)
hs.get_auth().get_user_by_token = _get_user_by_token hs.get_auth().get_user_by_token = _get_user_by_token
synapse.rest.room.register_servlets(hs, self.mock_server) synapse.rest.room.register_servlets(hs, self.mock_resource)
def tearDown(self): def tearDown(self):
pass pass
@ -503,7 +503,7 @@ class RoomsCreateTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_post_room_no_keys(self): def test_post_room_no_keys(self):
# POST with no config keys, expect new room id # POST with no config keys, expect new room id
(code, response) = yield self.mock_server.trigger("POST", "/rooms", (code, response) = yield self.mock_resource.trigger("POST", "/rooms",
"{}") "{}")
self.assertEquals(200, code, response) self.assertEquals(200, code, response)
self.assertTrue("room_id" in response) self.assertTrue("room_id" in response)
@ -511,7 +511,7 @@ class RoomsCreateTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_post_room_visibility_key(self): def test_post_room_visibility_key(self):
# POST with visibility config key, expect new room id # POST with visibility config key, expect new room id
(code, response) = yield self.mock_server.trigger("POST", "/rooms", (code, response) = yield self.mock_resource.trigger("POST", "/rooms",
'{"visibility":"private"}') '{"visibility":"private"}')
self.assertEquals(200, code) self.assertEquals(200, code)
self.assertTrue("room_id" in response) self.assertTrue("room_id" in response)
@ -519,7 +519,7 @@ class RoomsCreateTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_post_room_custom_key(self): def test_post_room_custom_key(self):
# POST with custom config keys, expect new room id # POST with custom config keys, expect new room id
(code, response) = yield self.mock_server.trigger("POST", "/rooms", (code, response) = yield self.mock_resource.trigger("POST", "/rooms",
'{"custom":"stuff"}') '{"custom":"stuff"}')
self.assertEquals(200, code) self.assertEquals(200, code)
self.assertTrue("room_id" in response) self.assertTrue("room_id" in response)
@ -527,7 +527,7 @@ class RoomsCreateTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_post_room_known_and_unknown_keys(self): def test_post_room_known_and_unknown_keys(self):
# POST with custom + known config keys, expect new room id # POST with custom + known config keys, expect new room id
(code, response) = yield self.mock_server.trigger("POST", "/rooms", (code, response) = yield self.mock_resource.trigger("POST", "/rooms",
'{"visibility":"private","custom":"things"}') '{"visibility":"private","custom":"things"}')
self.assertEquals(200, code) self.assertEquals(200, code)
self.assertTrue("room_id" in response) self.assertTrue("room_id" in response)
@ -535,18 +535,18 @@ class RoomsCreateTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_post_room_invalid_content(self): def test_post_room_invalid_content(self):
# POST with invalid content / paths, expect 400 # POST with invalid content / paths, expect 400
(code, response) = yield self.mock_server.trigger("POST", "/rooms", (code, response) = yield self.mock_resource.trigger("POST", "/rooms",
'{"visibili') '{"visibili')
self.assertEquals(400, code) self.assertEquals(400, code)
(code, response) = yield self.mock_server.trigger("POST", "/rooms", (code, response) = yield self.mock_resource.trigger("POST", "/rooms",
'["hello"]') '["hello"]')
self.assertEquals(400, code) self.assertEquals(400, code)
@defer.inlineCallbacks @defer.inlineCallbacks
def test_put_room_no_keys(self): def test_put_room_no_keys(self):
# PUT with no config keys, expect new room id # PUT with no config keys, expect new room id
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", "/rooms/%21aa%3Atest", "{}" "PUT", "/rooms/%21aa%3Atest", "{}"
) )
self.assertEquals(200, code) self.assertEquals(200, code)
@ -555,7 +555,7 @@ class RoomsCreateTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_put_room_visibility_key(self): def test_put_room_visibility_key(self):
# PUT with known config keys, expect new room id # PUT with known config keys, expect new room id
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", "/rooms/%21bb%3Atest", '{"visibility":"private"}' "PUT", "/rooms/%21bb%3Atest", '{"visibility":"private"}'
) )
self.assertEquals(200, code) self.assertEquals(200, code)
@ -564,7 +564,7 @@ class RoomsCreateTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_put_room_custom_key(self): def test_put_room_custom_key(self):
# PUT with custom config keys, expect new room id # PUT with custom config keys, expect new room id
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", "/rooms/%21cc%3Atest", '{"custom":"stuff"}' "PUT", "/rooms/%21cc%3Atest", '{"custom":"stuff"}'
) )
self.assertEquals(200, code) self.assertEquals(200, code)
@ -573,7 +573,7 @@ class RoomsCreateTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_put_room_known_and_unknown_keys(self): def test_put_room_known_and_unknown_keys(self):
# PUT with custom + known config keys, expect new room id # PUT with custom + known config keys, expect new room id
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", "/rooms/%21dd%3Atest", "PUT", "/rooms/%21dd%3Atest",
'{"visibility":"private","custom":"things"}' '{"visibility":"private","custom":"things"}'
) )
@ -584,12 +584,12 @@ class RoomsCreateTestCase(RestTestCase):
def test_put_room_invalid_content(self): def test_put_room_invalid_content(self):
# PUT with invalid content / room names, expect 400 # PUT with invalid content / room names, expect 400
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", "/rooms/ee", '{"sdf"' "PUT", "/rooms/ee", '{"sdf"'
) )
self.assertEquals(400, code) self.assertEquals(400, code)
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", "/rooms/ee", '["hello"]' "PUT", "/rooms/ee", '["hello"]'
) )
self.assertEquals(400, code) self.assertEquals(400, code)
@ -599,7 +599,7 @@ class RoomsCreateTestCase(RestTestCase):
yield self.create_room_as("!aa:test", self.user_id) yield self.create_room_as("!aa:test", self.user_id)
# PUT with conflicting room ID, expect 409 # PUT with conflicting room ID, expect 409
(code, response) = yield self.mock_server.trigger( (code, response) = yield self.mock_resource.trigger(
"PUT", "/rooms/%21aa%3Atest", "{}" "PUT", "/rooms/%21aa%3Atest", "{}"
) )
self.assertEquals(409, code) self.assertEquals(409, code)
@ -611,7 +611,7 @@ class RoomTopicTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def setUp(self): def setUp(self):
self.mock_server = MockHttpServer(prefix=PATH_PREFIX) self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
self.auth_user_id = self.user_id self.auth_user_id = self.user_id
self.room_id = "!rid1:test" self.room_id = "!rid1:test"
self.path = "/rooms/%s/topic" % self.room_id self.path = "/rooms/%s/topic" % self.room_id
@ -637,7 +637,7 @@ class RoomTopicTestCase(RestTestCase):
return hs.parse_userid(self.auth_user_id) return hs.parse_userid(self.auth_user_id)
hs.get_auth().get_user_by_token = _get_user_by_token hs.get_auth().get_user_by_token = _get_user_by_token
synapse.rest.room.register_servlets(hs, self.mock_server) synapse.rest.room.register_servlets(hs, self.mock_resource)
# create the room # create the room
yield self.create_room_as(self.room_id, self.user_id) yield self.create_room_as(self.room_id, self.user_id)
@ -648,50 +648,50 @@ class RoomTopicTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_invalid_puts(self): def test_invalid_puts(self):
# missing keys or invalid json # missing keys or invalid json
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
self.path, '{}') self.path, '{}')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
self.path, '{"_name":"bob"}') self.path, '{"_name":"bob"}')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
self.path, '{"nao') self.path, '{"nao')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
self.path, '[{"_name":"bob"},{"_name":"jill"}]') self.path, '[{"_name":"bob"},{"_name":"jill"}]')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
self.path, 'text only') self.path, 'text only')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
self.path, '') self.path, '')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
# valid key, wrong type # valid key, wrong type
content = '{"topic":["Topic name"]}' content = '{"topic":["Topic name"]}'
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
self.path, content) self.path, content)
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
@defer.inlineCallbacks @defer.inlineCallbacks
def test_rooms_topic(self): def test_rooms_topic(self):
# nothing should be there # nothing should be there
(code, response) = yield self.mock_server.trigger_get(self.path) (code, response) = yield self.mock_resource.trigger_get(self.path)
self.assertEquals(404, code, msg=str(response)) self.assertEquals(404, code, msg=str(response))
# valid put # valid put
content = '{"topic":"Topic name"}' content = '{"topic":"Topic name"}'
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
self.path, content) self.path, content)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
# valid get # valid get
(code, response) = yield self.mock_server.trigger_get(self.path) (code, response) = yield self.mock_resource.trigger_get(self.path)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
self.assert_dict(json.loads(content), response) self.assert_dict(json.loads(content), response)
@ -699,12 +699,12 @@ class RoomTopicTestCase(RestTestCase):
def test_rooms_topic_with_extra_keys(self): def test_rooms_topic_with_extra_keys(self):
# valid put with extra keys # valid put with extra keys
content = '{"topic":"Seasons","subtopic":"Summer"}' content = '{"topic":"Seasons","subtopic":"Summer"}'
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
self.path, content) self.path, content)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
# valid get # valid get
(code, response) = yield self.mock_server.trigger_get(self.path) (code, response) = yield self.mock_resource.trigger_get(self.path)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
self.assert_dict(json.loads(content), response) self.assert_dict(json.loads(content), response)
@ -715,7 +715,7 @@ class RoomMemberStateTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def setUp(self): def setUp(self):
self.mock_server = MockHttpServer(prefix=PATH_PREFIX) self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
self.auth_user_id = self.user_id self.auth_user_id = self.user_id
self.room_id = "!rid1:test" self.room_id = "!rid1:test"
@ -740,7 +740,7 @@ class RoomMemberStateTestCase(RestTestCase):
return hs.parse_userid(self.auth_user_id) return hs.parse_userid(self.auth_user_id)
hs.get_auth().get_user_by_token = _get_user_by_token hs.get_auth().get_user_by_token = _get_user_by_token
synapse.rest.room.register_servlets(hs, self.mock_server) synapse.rest.room.register_servlets(hs, self.mock_resource)
yield self.create_room_as(self.room_id, self.user_id) yield self.create_room_as(self.room_id, self.user_id)
@ -751,34 +751,34 @@ class RoomMemberStateTestCase(RestTestCase):
def test_invalid_puts(self): def test_invalid_puts(self):
path = "/rooms/%s/members/%s/state" % (self.room_id, self.user_id) path = "/rooms/%s/members/%s/state" % (self.room_id, self.user_id)
# missing keys or invalid json # missing keys or invalid json
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
path, '{}') path, '{}')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
path, '{"_name":"bob"}') path, '{"_name":"bob"}')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
path, '{"nao') path, '{"nao')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
path, '[{"_name":"bob"},{"_name":"jill"}]') path, '[{"_name":"bob"},{"_name":"jill"}]')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
path, 'text only') path, 'text only')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
path, '') path, '')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
# valid keys, wrong types # valid keys, wrong types
content = ('{"membership":["%s","%s","%s"]}' % content = ('{"membership":["%s","%s","%s"]}' %
(Membership.INVITE, Membership.JOIN, Membership.LEAVE)) (Membership.INVITE, Membership.JOIN, Membership.LEAVE))
(code, response) = yield self.mock_server.trigger("PUT", path, content) (code, response) = yield self.mock_resource.trigger("PUT", path, content)
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
@defer.inlineCallbacks @defer.inlineCallbacks
@ -789,10 +789,10 @@ class RoomMemberStateTestCase(RestTestCase):
# valid join message (NOOP since we made the room) # valid join message (NOOP since we made the room)
content = '{"membership":"%s"}' % Membership.JOIN content = '{"membership":"%s"}' % Membership.JOIN
(code, response) = yield self.mock_server.trigger("PUT", path, content) (code, response) = yield self.mock_resource.trigger("PUT", path, content)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("GET", path, None) (code, response) = yield self.mock_resource.trigger("GET", path, None)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
self.assertEquals(json.loads(content), response) self.assertEquals(json.loads(content), response)
@ -805,10 +805,10 @@ class RoomMemberStateTestCase(RestTestCase):
# valid invite message # valid invite message
content = '{"membership":"%s"}' % Membership.INVITE content = '{"membership":"%s"}' % Membership.INVITE
(code, response) = yield self.mock_server.trigger("PUT", path, content) (code, response) = yield self.mock_resource.trigger("PUT", path, content)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("GET", path, None) (code, response) = yield self.mock_resource.trigger("GET", path, None)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
self.assertEquals(json.loads(content), response) self.assertEquals(json.loads(content), response)
@ -822,10 +822,10 @@ class RoomMemberStateTestCase(RestTestCase):
# valid invite message with custom key # valid invite message with custom key
content = ('{"membership":"%s","invite_text":"%s"}' % content = ('{"membership":"%s","invite_text":"%s"}' %
(Membership.INVITE, "Join us!")) (Membership.INVITE, "Join us!"))
(code, response) = yield self.mock_server.trigger("PUT", path, content) (code, response) = yield self.mock_resource.trigger("PUT", path, content)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("GET", path, None) (code, response) = yield self.mock_resource.trigger("GET", path, None)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
self.assertEquals(json.loads(content), response) self.assertEquals(json.loads(content), response)
@ -836,7 +836,7 @@ class RoomMessagesTestCase(RestTestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def setUp(self): def setUp(self):
self.mock_server = MockHttpServer(prefix=PATH_PREFIX) self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
self.auth_user_id = self.user_id self.auth_user_id = self.user_id
self.room_id = "!rid1:test" self.room_id = "!rid1:test"
@ -861,7 +861,7 @@ class RoomMessagesTestCase(RestTestCase):
return hs.parse_userid(self.auth_user_id) return hs.parse_userid(self.auth_user_id)
hs.get_auth().get_user_by_token = _get_user_by_token hs.get_auth().get_user_by_token = _get_user_by_token
synapse.rest.room.register_servlets(hs, self.mock_server) synapse.rest.room.register_servlets(hs, self.mock_resource)
yield self.create_room_as(self.room_id, self.user_id) yield self.create_room_as(self.room_id, self.user_id)
@ -874,27 +874,27 @@ class RoomMessagesTestCase(RestTestCase):
urllib.quote(self.room_id), self.user_id urllib.quote(self.room_id), self.user_id
) )
# missing keys or invalid json # missing keys or invalid json
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
path, '{}') path, '{}')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
path, '{"_name":"bob"}') path, '{"_name":"bob"}')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
path, '{"nao') path, '{"nao')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
path, '[{"_name":"bob"},{"_name":"jill"}]') path, '[{"_name":"bob"},{"_name":"jill"}]')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
path, 'text only') path, 'text only')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("PUT", (code, response) = yield self.mock_resource.trigger("PUT",
path, '') path, '')
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
@ -905,15 +905,15 @@ class RoomMessagesTestCase(RestTestCase):
) )
content = '{"body":"test","msgtype":{"type":"a"}}' content = '{"body":"test","msgtype":{"type":"a"}}'
(code, response) = yield self.mock_server.trigger("PUT", path, content) (code, response) = yield self.mock_resource.trigger("PUT", path, content)
self.assertEquals(400, code, msg=str(response)) self.assertEquals(400, code, msg=str(response))
# custom message types # custom message types
content = '{"body":"test","msgtype":"test.custom.text"}' content = '{"body":"test","msgtype":"test.custom.text"}'
(code, response) = yield self.mock_server.trigger("PUT", path, content) (code, response) = yield self.mock_resource.trigger("PUT", path, content)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("GET", path, None) (code, response) = yield self.mock_resource.trigger("GET", path, None)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
self.assert_dict(json.loads(content), response) self.assert_dict(json.loads(content), response)
@ -922,10 +922,10 @@ class RoomMessagesTestCase(RestTestCase):
urllib.quote(self.room_id), self.user_id urllib.quote(self.room_id), self.user_id
) )
content = '{"body":"test2","msgtype":"m.text"}' content = '{"body":"test2","msgtype":"m.text"}'
(code, response) = yield self.mock_server.trigger("PUT", path, content) (code, response) = yield self.mock_resource.trigger("PUT", path, content)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
(code, response) = yield self.mock_server.trigger("GET", path, None) (code, response) = yield self.mock_resource.trigger("GET", path, None)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
self.assert_dict(json.loads(content), response) self.assert_dict(json.loads(content), response)
@ -934,5 +934,5 @@ class RoomMessagesTestCase(RestTestCase):
urllib.quote(self.room_id), "invalid" + self.user_id urllib.quote(self.room_id), "invalid" + self.user_id
) )
content = '{"body":"test2","msgtype":"m.text"}' content = '{"body":"test2","msgtype":"m.text"}'
(code, response) = yield self.mock_server.trigger("PUT", path, content) (code, response) = yield self.mock_resource.trigger("PUT", path, content)
self.assertEquals(403, code, msg=str(response)) self.assertEquals(403, code, msg=str(response))

14
tests/rest/utils.py
View File

@ -27,12 +27,12 @@ class RestTestCase(unittest.TestCase):
"""Contains extra helper functions to quickly and clearly perform a given """Contains extra helper functions to quickly and clearly perform a given
REST action, which isn't the focus of the test. REST action, which isn't the focus of the test.
This subclass assumes there are mock_server and auth_user_id attributes. This subclass assumes there are mock_resource and auth_user_id attributes.
""" """
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(RestTestCase, self).__init__(*args, **kwargs) super(RestTestCase, self).__init__(*args, **kwargs)
self.mock_server = None self.mock_resource = None
self.auth_user_id = None self.auth_user_id = None
def mock_get_user_by_token(self, token=None): def mock_get_user_by_token(self, token=None):
@ -48,7 +48,7 @@ class RestTestCase(unittest.TestCase):
content = '{"visibility":"private"}' content = '{"visibility":"private"}'
if tok: if tok:
path = path + "?access_token=%s" % tok path = path + "?access_token=%s" % tok
(code, response) = yield self.mock_server.trigger("PUT", path, content) (code, response) = yield self.mock_resource.trigger("PUT", path, content)
self.assertEquals(200, code, msg=str(response)) self.assertEquals(200, code, msg=str(response))
self.auth_user_id = temp_id self.auth_user_id = temp_id
@ -81,11 +81,11 @@ class RestTestCase(unittest.TestCase):
path = path + "?access_token=%s" % tok path = path + "?access_token=%s" % tok
if membership == Membership.LEAVE: if membership == Membership.LEAVE:
(code, response) = yield self.mock_server.trigger("DELETE", path, (code, response) = yield self.mock_resource.trigger("DELETE", path,
None) None)
self.assertEquals(expect_code, code, msg=str(response)) self.assertEquals(expect_code, code, msg=str(response))
else: else:
(code, response) = yield self.mock_server.trigger("PUT", path, (code, response) = yield self.mock_resource.trigger("PUT", path,
'{"membership":"%s"}' % membership) '{"membership":"%s"}' % membership)
self.assertEquals(expect_code, code, msg=str(response)) self.assertEquals(expect_code, code, msg=str(response))
@ -93,7 +93,7 @@ class RestTestCase(unittest.TestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def register(self, user_id): def register(self, user_id):
(code, response) = yield self.mock_server.trigger("POST", "/register", (code, response) = yield self.mock_resource.trigger("POST", "/register",
'{"user_id":"%s"}' % user_id) '{"user_id":"%s"}' % user_id)
self.assertEquals(200, code) self.assertEquals(200, code)
defer.returnValue(response) defer.returnValue(response)
@ -111,7 +111,7 @@ class RestTestCase(unittest.TestCase):
if tok: if tok:
path = path + "?access_token=%s" % tok path = path + "?access_token=%s" % tok
(code, response) = yield self.mock_server.trigger("PUT", path, content) (code, response) = yield self.mock_resource.trigger("PUT", path, content)
self.assertEquals(expect_code, code, msg=str(response)) self.assertEquals(expect_code, code, msg=str(response))
def assert_dict(self, required, actual): def assert_dict(self, required, actual):

3
tests/utils.py
View File

@ -29,7 +29,8 @@ import json
import urlparse import urlparse
class MockHttpServer(HttpServer): # This is a mock /resource/ not an entire server
class MockHttpResource(HttpServer):
def __init__(self, prefix=""): def __init__(self, prefix=""):
self.callbacks = [] # 3-tuple of method/pattern/function self.callbacks = [] # 3-tuple of method/pattern/function