Philipp Hörist pushed to branch storage at gajim / gajim
Commits:
849139e5 by Philipp Hörist at 2023-06-24T22:13:21+02:00
Remove duplicated test
- - - - -
1 changed file:
- test/database/test_markers.py
Changes:
=====================================
test/database/test_markers.py
=====================================
@@ -140,71 +140,6 @@ def test_markers_join_groupchat(self):
row = self._archive.get_row_with_entitykey('marker', marker_ek1)
self.assertEqual(row.fk_occupant_ek, fk_occupant_ek)
- def test_markers_join_groupchat(self):
- occupant_data = DbUpsertOccupantRowData(
- account_jid=self._account,
- remote_jid=self._remote_jid,
- id=self._occupant_id,
- timestamp=0,
- nickname='nickname1',
- )
- fk_occupant_ek = self._archive.upsert_row(occupant_data)
-
- marker_data1 = DbUpsertMarkerRowData(
- account_jid=self._account,
- remote_jid=self._remote_jid,
- fk_occupant_ek=fk_occupant_ek,
- marked_message_id='messageid1',
- received_ts=1,
- displayed_ts=None,
- acknowledged_ts=None,
- )
-
- marker_data2 = DbUpsertMarkerRowData(
- account_jid=self._account,
- remote_jid=self._remote_jid,
- fk_occupant_ek=fk_occupant_ek,
- marked_message_id='messageid1',
- received_ts=None,
- displayed_ts=2,
- acknowledged_ts=None,
- )
-
- marker_ek1 = self._archive.upsert_row(marker_data1)
- marker_ek2 = self._archive.upsert_row(marker_data2)
-
- self.assertEqual(marker_ek1, marker_ek2)
-
- message_data = DbInsertMessageRowData(
- account_jid=self._account,
- remote_jid=self._remote_jid,
- m_type=MessageType.CHAT,
- direction=ChatDirection.INCOMING,
- timestamp=0,
- resource='res',
- message='Some Message',
- message_id='messageid1',
- stanza_id='1a',
- origin_id=None,
- fk_occupant_ek=fk_occupant_ek,
- user_delay_ts=None,
- fk_securitylabel_ek=None,
- fk_encryption_ek=None,
- )
-
- message_ek = self._archive.insert_row(message_data)
-
- conversation_row = self._archive.get_message_with_entitykey(message_ek)
-
- self.assertTrue(conversation_row.has_markers)
- self.assertIsNotNone(conversation_row.marker)
- assert conversation_row.marker is not None
- self.assertEqual(conversation_row.marker.received_ts, 1)
- self.assertEqual(conversation_row.marker.displayed_ts, 2)
-
- row = self._archive.get_row_with_entitykey('marker', marker_ek1)
- self.assertEqual(row.fk_occupant_ek, fk_occupant_ek)
-
def test_markers_update(self):
marker_data1 = DbUpsertMarkerRowData(
account_jid=self._account,
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/849139e5d0caea58d4cca495990156ed86974213
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/849139e5d0caea58d4cca495990156ed86974213
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
