Neaten more of the storage layer tests with assertObjectHasAttributes; more standardisation on test layout

3 files changed, 22 insertions, 20 deletions

diff --git a/tests/storage/test_directory.py b/tests/storage/test_directory.py
index 9a80bf6c04..7e8e7e1e83 100644
--- a/tests/storage/test_directory.py
+++ b/tests/storage/test_directory.py
@@ -47,9 +47,10 @@ class DirectoryStoreTestCase(unittest.TestCase):
             servers=["test"],
         )
 
-        aliases = yield self.store.get_aliases_for_room(self.room.to_string())
-
-        self.assertEquals(["#my-room:test"], aliases)
+        self.assertEquals(
+            ["#my-room:test"],
+            (yield self.store.get_aliases_for_room(self.room.to_string()))
+        )
 
     @defer.inlineCallbacks
     def test_alias_to_room(self):
@@ -59,9 +60,9 @@ class DirectoryStoreTestCase(unittest.TestCase):
             servers=["test"],
         )
 
-        mapping = yield self.store.get_association_from_room_alias(
-            self.alias
-        )
 
-        self.assertEquals(self.room.to_string(), mapping.room_id)
-        self.assertEquals(["test"], mapping.servers)
+        self.assertObjectHasAttributes(
+            {"room_id": self.room.to_string(),
+             "servers": ["test"]},
+            (yield self.store.get_association_from_room_alias(self.alias))
+        )
diff --git a/tests/storage/test_profile.py b/tests/storage/test_profile.py
index 21df2babdc..5d36723c28 100644
--- a/tests/storage/test_profile.py
+++ b/tests/storage/test_profile.py
@@ -48,9 +48,10 @@ class ProfileStoreTestCase(unittest.TestCase):
             self.u_frank.localpart, "Frank"
         )
 
-        name = yield self.store.get_profile_displayname(self.u_frank.localpart)
-
-        self.assertEquals("Frank", name)
+        self.assertEquals(
+            "Frank",
+            (yield self.store.get_profile_displayname(self.u_frank.localpart))
+        )
 
     @defer.inlineCallbacks
     def test_avatar_url(self):
@@ -62,6 +63,7 @@ class ProfileStoreTestCase(unittest.TestCase):
                 self.u_frank.localpart, "http://my.site/here"
         )
 
-        name = yield self.store.get_profile_avatar_url(self.u_frank.localpart)
-
-        self.assertEquals("http://my.site/here", name)
+        self.assertEquals(
+            "http://my.site/here",
+            (yield self.store.get_profile_avatar_url(self.u_frank.localpart))
+        )
diff --git a/tests/storage/test_room.py b/tests/storage/test_room.py
index 9979be2f65..369a73d917 100644
--- a/tests/storage/test_room.py
+++ b/tests/storage/test_room.py
@@ -51,13 +51,11 @@ class RoomStoreTestCase(unittest.TestCase):
 
     @defer.inlineCallbacks
     def test_get_room(self):
-        room = yield self.store.get_room(self.room.to_string())
-
         self.assertObjectHasAttributes(
             {"room_id": self.room.to_string(),
              "creator": self.u_creator.to_string(),
              "is_public": True},
-            room
+            (yield self.store.get_room(self.room.to_string()))
         )
 
     @defer.inlineCallbacks
@@ -66,9 +64,10 @@ class RoomStoreTestCase(unittest.TestCase):
             visibility=False
         )
 
-        room = yield self.store.get_room(self.room.to_string())
-
-        self.assertFalse(room.is_public)
+        self.assertObjectHasAttributes(
+            {"is_public": False},
+            (yield self.store.get_room(self.room.to_string()))
+        )
 
     @defer.inlineCallbacks
     def test_get_rooms(self):