|
@@ -12,7 +12,6 @@
|
|
|
# See the License for the specific language governing permissions and
|
|
|
# limitations under the License.
|
|
|
|
|
|
-from parameterized import parameterized
|
|
|
|
|
|
from synapse.api.constants import ReceiptTypes
|
|
|
from synapse.types import UserID, create_requester
|
|
@@ -92,7 +91,6 @@ class ReceiptTestCase(HomeserverTestCase):
|
|
|
[
|
|
|
ReceiptTypes.READ,
|
|
|
ReceiptTypes.READ_PRIVATE,
|
|
|
- ReceiptTypes.UNSTABLE_READ_PRIVATE,
|
|
|
],
|
|
|
)
|
|
|
)
|
|
@@ -104,7 +102,6 @@ class ReceiptTestCase(HomeserverTestCase):
|
|
|
[
|
|
|
ReceiptTypes.READ,
|
|
|
ReceiptTypes.READ_PRIVATE,
|
|
|
- ReceiptTypes.UNSTABLE_READ_PRIVATE,
|
|
|
],
|
|
|
)
|
|
|
)
|
|
@@ -117,16 +114,12 @@ class ReceiptTestCase(HomeserverTestCase):
|
|
|
[
|
|
|
ReceiptTypes.READ,
|
|
|
ReceiptTypes.READ_PRIVATE,
|
|
|
- ReceiptTypes.UNSTABLE_READ_PRIVATE,
|
|
|
],
|
|
|
)
|
|
|
)
|
|
|
self.assertEqual(res, None)
|
|
|
|
|
|
- @parameterized.expand(
|
|
|
- [ReceiptTypes.READ_PRIVATE, ReceiptTypes.UNSTABLE_READ_PRIVATE]
|
|
|
- )
|
|
|
- def test_get_receipts_for_user(self, receipt_type: str) -> None:
|
|
|
+ def test_get_receipts_for_user(self) -> None:
|
|
|
# Send some events into the first room
|
|
|
event1_1_id = self.create_and_send_event(
|
|
|
self.room_id1, UserID.from_string(OTHER_USER_ID)
|
|
@@ -144,14 +137,14 @@ class ReceiptTestCase(HomeserverTestCase):
|
|
|
# Send private read receipt for the second event
|
|
|
self.get_success(
|
|
|
self.store.insert_receipt(
|
|
|
- self.room_id1, receipt_type, OUR_USER_ID, [event1_2_id], {}
|
|
|
+ self.room_id1, ReceiptTypes.READ_PRIVATE, OUR_USER_ID, [event1_2_id], {}
|
|
|
)
|
|
|
)
|
|
|
|
|
|
# Test we get the latest event when we want both private and public receipts
|
|
|
res = self.get_success(
|
|
|
self.store.get_receipts_for_user(
|
|
|
- OUR_USER_ID, [ReceiptTypes.READ, receipt_type]
|
|
|
+ OUR_USER_ID, [ReceiptTypes.READ, ReceiptTypes.READ_PRIVATE]
|
|
|
)
|
|
|
)
|
|
|
self.assertEqual(res, {self.room_id1: event1_2_id})
|
|
@@ -164,7 +157,7 @@ class ReceiptTestCase(HomeserverTestCase):
|
|
|
|
|
|
# Test we get the latest event when we want only the public receipt
|
|
|
res = self.get_success(
|
|
|
- self.store.get_receipts_for_user(OUR_USER_ID, [receipt_type])
|
|
|
+ self.store.get_receipts_for_user(OUR_USER_ID, [ReceiptTypes.READ_PRIVATE])
|
|
|
)
|
|
|
self.assertEqual(res, {self.room_id1: event1_2_id})
|
|
|
|
|
@@ -187,20 +180,17 @@ class ReceiptTestCase(HomeserverTestCase):
|
|
|
# Test new room is reflected in what the method returns
|
|
|
self.get_success(
|
|
|
self.store.insert_receipt(
|
|
|
- self.room_id2, receipt_type, OUR_USER_ID, [event2_1_id], {}
|
|
|
+ self.room_id2, ReceiptTypes.READ_PRIVATE, OUR_USER_ID, [event2_1_id], {}
|
|
|
)
|
|
|
)
|
|
|
res = self.get_success(
|
|
|
self.store.get_receipts_for_user(
|
|
|
- OUR_USER_ID, [ReceiptTypes.READ, receipt_type]
|
|
|
+ OUR_USER_ID, [ReceiptTypes.READ, ReceiptTypes.READ_PRIVATE]
|
|
|
)
|
|
|
)
|
|
|
self.assertEqual(res, {self.room_id1: event1_2_id, self.room_id2: event2_1_id})
|
|
|
|
|
|
- @parameterized.expand(
|
|
|
- [ReceiptTypes.READ_PRIVATE, ReceiptTypes.UNSTABLE_READ_PRIVATE]
|
|
|
- )
|
|
|
- def test_get_last_receipt_event_id_for_user(self, receipt_type: str) -> None:
|
|
|
+ def test_get_last_receipt_event_id_for_user(self) -> None:
|
|
|
# Send some events into the first room
|
|
|
event1_1_id = self.create_and_send_event(
|
|
|
self.room_id1, UserID.from_string(OTHER_USER_ID)
|
|
@@ -218,7 +208,7 @@ class ReceiptTestCase(HomeserverTestCase):
|
|
|
# Send private read receipt for the second event
|
|
|
self.get_success(
|
|
|
self.store.insert_receipt(
|
|
|
- self.room_id1, receipt_type, OUR_USER_ID, [event1_2_id], {}
|
|
|
+ self.room_id1, ReceiptTypes.READ_PRIVATE, OUR_USER_ID, [event1_2_id], {}
|
|
|
)
|
|
|
)
|
|
|
|
|
@@ -227,7 +217,7 @@ class ReceiptTestCase(HomeserverTestCase):
|
|
|
self.store.get_last_receipt_event_id_for_user(
|
|
|
OUR_USER_ID,
|
|
|
self.room_id1,
|
|
|
- [ReceiptTypes.READ, receipt_type],
|
|
|
+ [ReceiptTypes.READ, ReceiptTypes.READ_PRIVATE],
|
|
|
)
|
|
|
)
|
|
|
self.assertEqual(res, event1_2_id)
|
|
@@ -243,7 +233,7 @@ class ReceiptTestCase(HomeserverTestCase):
|
|
|
# Test we get the latest event when we want only the private receipt
|
|
|
res = self.get_success(
|
|
|
self.store.get_last_receipt_event_id_for_user(
|
|
|
- OUR_USER_ID, self.room_id1, [receipt_type]
|
|
|
+ OUR_USER_ID, self.room_id1, [ReceiptTypes.READ_PRIVATE]
|
|
|
)
|
|
|
)
|
|
|
self.assertEqual(res, event1_2_id)
|
|
@@ -269,14 +259,14 @@ class ReceiptTestCase(HomeserverTestCase):
|
|
|
# Test new room is reflected in what the method returns
|
|
|
self.get_success(
|
|
|
self.store.insert_receipt(
|
|
|
- self.room_id2, receipt_type, OUR_USER_ID, [event2_1_id], {}
|
|
|
+ self.room_id2, ReceiptTypes.READ_PRIVATE, OUR_USER_ID, [event2_1_id], {}
|
|
|
)
|
|
|
)
|
|
|
res = self.get_success(
|
|
|
self.store.get_last_receipt_event_id_for_user(
|
|
|
OUR_USER_ID,
|
|
|
self.room_id2,
|
|
|
- [ReceiptTypes.READ, receipt_type],
|
|
|
+ [ReceiptTypes.READ, ReceiptTypes.READ_PRIVATE],
|
|
|
)
|
|
|
)
|
|
|
self.assertEqual(res, event2_1_id)
|