From 4cd386e2243e26aacc271dfc0f92e4f5d760c465 Mon Sep 17 00:00:00 2001 From: Sasha Weiss Date: Tue, 10 Sep 2024 11:04:04 -0700 Subject: [PATCH] Add "expiration timer update" Backup integration tests --- Signal.xcodeproj/project.pbxproj | 32 +++++++++++++++++++ .../MessageBackupIntegrationTests.swift | 3 ++ 2 files changed, 35 insertions(+) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 7d87fc99e6..428173e7ad 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -1861,6 +1861,12 @@ D93830812A7065C7006CDCDE /* UsernameValidationManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C182BEF529ACFCB200E8E1E2 /* UsernameValidationManagerTests.swift */; }; D93830832A708E95006CDCDE /* UsernameChangeDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93830822A708E95006CDCDE /* UsernameChangeDelegate.swift */; }; D93830852A784210006CDCDE /* UsernameApiClientImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93830842A784210006CDCDE /* UsernameApiClientImpl.swift */; }; + D93975702C8B934700B1AFF9 /* chat_item_expiration_timer_update_00.binproto in Resources */ = {isa = PBXBuildFile; fileRef = D939756A2C8B934600B1AFF9 /* chat_item_expiration_timer_update_00.binproto */; }; + D93975712C8B934700B1AFF9 /* chat_item_expiration_timer_update_01.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = D939756B2C8B934600B1AFF9 /* chat_item_expiration_timer_update_01.txtproto */; }; + D93975722C8B934700B1AFF9 /* chat_item_expiration_timer_update_00.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = D939756C2C8B934600B1AFF9 /* chat_item_expiration_timer_update_00.txtproto */; }; + D93975732C8B934700B1AFF9 /* chat_item_expiration_timer_update_02.binproto in Resources */ = {isa = PBXBuildFile; fileRef = D939756D2C8B934600B1AFF9 /* chat_item_expiration_timer_update_02.binproto */; }; + D93975742C8B934700B1AFF9 /* chat_item_expiration_timer_update_01.binproto in Resources */ = {isa = PBXBuildFile; fileRef = D939756E2C8B934600B1AFF9 /* chat_item_expiration_timer_update_01.binproto */; }; + D93975752C8B934700B1AFF9 /* chat_item_expiration_timer_update_02.txtproto in Resources */ = {isa = PBXBuildFile; fileRef = D939756F2C8B934600B1AFF9 /* chat_item_expiration_timer_update_02.txtproto */; }; D93CE1242A5C84F600D916B7 /* OWSSyncRequestMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93CE1232A5C84F600D916B7 /* OWSSyncRequestMessage.swift */; }; D93EA11F2A057FD600579C6F /* LearnMyOwnPniManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93EA11E2A057FD600579C6F /* LearnMyOwnPniManager.swift */; }; D93EA1212A0596E400579C6F /* LearnMyOwnPniManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93EA1202A0596E400579C6F /* LearnMyOwnPniManagerTest.swift */; }; @@ -5059,6 +5065,12 @@ D93830822A708E95006CDCDE /* UsernameChangeDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UsernameChangeDelegate.swift; sourceTree = ""; }; D93830842A784210006CDCDE /* UsernameApiClientImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UsernameApiClientImpl.swift; sourceTree = ""; }; D938CD5F29283402006FB16A /* Paypal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Paypal.swift; sourceTree = ""; }; + D939756A2C8B934600B1AFF9 /* chat_item_expiration_timer_update_00.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; name = chat_item_expiration_timer_update_00.binproto; path = "Signal-Message-Backup-Tests/test-cases/chat_item_expiration_timer_update_00.binproto"; sourceTree = ""; }; + D939756B2C8B934600B1AFF9 /* chat_item_expiration_timer_update_01.txtproto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = chat_item_expiration_timer_update_01.txtproto; path = "Signal-Message-Backup-Tests/test-cases/chat_item_expiration_timer_update_01.txtproto"; sourceTree = ""; }; + D939756C2C8B934600B1AFF9 /* chat_item_expiration_timer_update_00.txtproto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = chat_item_expiration_timer_update_00.txtproto; path = "Signal-Message-Backup-Tests/test-cases/chat_item_expiration_timer_update_00.txtproto"; sourceTree = ""; }; + D939756D2C8B934600B1AFF9 /* chat_item_expiration_timer_update_02.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; name = chat_item_expiration_timer_update_02.binproto; path = "Signal-Message-Backup-Tests/test-cases/chat_item_expiration_timer_update_02.binproto"; sourceTree = ""; }; + D939756E2C8B934600B1AFF9 /* chat_item_expiration_timer_update_01.binproto */ = {isa = PBXFileReference; lastKnownFileType = file; name = chat_item_expiration_timer_update_01.binproto; path = "Signal-Message-Backup-Tests/test-cases/chat_item_expiration_timer_update_01.binproto"; sourceTree = ""; }; + D939756F2C8B934600B1AFF9 /* chat_item_expiration_timer_update_02.txtproto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = chat_item_expiration_timer_update_02.txtproto; path = "Signal-Message-Backup-Tests/test-cases/chat_item_expiration_timer_update_02.txtproto"; sourceTree = ""; }; D93CE1232A5C84F600D916B7 /* OWSSyncRequestMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OWSSyncRequestMessage.swift; sourceTree = ""; }; D93EA11E2A057FD600579C6F /* LearnMyOwnPniManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LearnMyOwnPniManager.swift; sourceTree = ""; }; D93EA1202A0596E400579C6F /* LearnMyOwnPniManagerTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LearnMyOwnPniManagerTest.swift; sourceTree = ""; }; @@ -10338,6 +10350,19 @@ path = Links; sourceTree = ""; }; + D93975692C8B933400B1AFF9 /* ExpirationTimerUpdate */ = { + isa = PBXGroup; + children = ( + D939756A2C8B934600B1AFF9 /* chat_item_expiration_timer_update_00.binproto */, + D939756C2C8B934600B1AFF9 /* chat_item_expiration_timer_update_00.txtproto */, + D939756E2C8B934600B1AFF9 /* chat_item_expiration_timer_update_01.binproto */, + D939756B2C8B934600B1AFF9 /* chat_item_expiration_timer_update_01.txtproto */, + D939756D2C8B934600B1AFF9 /* chat_item_expiration_timer_update_02.binproto */, + D939756F2C8B934600B1AFF9 /* chat_item_expiration_timer_update_02.txtproto */, + ); + name = ExpirationTimerUpdate; + sourceTree = ""; + }; D962346E2C0E99CE00DAF6CB /* DeleteForMe */ = { isa = PBXGroup; children = ( @@ -10835,6 +10860,7 @@ isa = PBXGroup; children = ( D9FB78442C89335900B5DA73 /* ContactMessage */, + D93975692C8B933400B1AFF9 /* ExpirationTimerUpdate */, ); name = ChatItem; sourceTree = ""; @@ -13276,6 +13302,12 @@ D9FB78672C89337000B5DA73 /* chat_item_contact_message_13.txtproto in Resources */, D9FB78692C89337000B5DA73 /* chat_item_contact_message_14.binproto in Resources */, D9FB787D2C89337000B5DA73 /* chat_item_contact_message_14.txtproto in Resources */, + D93975702C8B934700B1AFF9 /* chat_item_expiration_timer_update_00.binproto in Resources */, + D93975722C8B934700B1AFF9 /* chat_item_expiration_timer_update_00.txtproto in Resources */, + D93975742C8B934700B1AFF9 /* chat_item_expiration_timer_update_01.binproto in Resources */, + D93975712C8B934700B1AFF9 /* chat_item_expiration_timer_update_01.txtproto in Resources */, + D93975732C8B934700B1AFF9 /* chat_item_expiration_timer_update_02.binproto in Resources */, + D93975752C8B934700B1AFF9 /* chat_item_expiration_timer_update_02.txtproto in Resources */, F942628B289B1B5600460798 /* sample-sticker.encrypted in Resources */, F942628C289B1B5600460798 /* sample-sticker.webp in Resources */, F908AA7D28CE629700472E68 /* test-apng.png in Resources */, diff --git a/SignalServiceKit/tests/MessageBackup/MessageBackupIntegrationTests.swift b/SignalServiceKit/tests/MessageBackup/MessageBackupIntegrationTests.swift index b916d6de6e..067aa38052 100644 --- a/SignalServiceKit/tests/MessageBackup/MessageBackupIntegrationTests.swift +++ b/SignalServiceKit/tests/MessageBackup/MessageBackupIntegrationTests.swift @@ -43,6 +43,7 @@ class MessageBackupIntegrationTests: XCTestCase { case chat case chatItem case chatItemContactMessage + case chatItemExpirationTimerUpdate } /// Specifies which integration test cases to run. @@ -81,6 +82,8 @@ class MessageBackupIntegrationTests: XCTestCase { return binprotoName.contains("chat_item_") case .chatItemContactMessage: return binprotoName.contains("chat_item_contact_message") + case .chatItemExpirationTimerUpdate: + return binprotoName.contains("chat_item_expiration_timer_update") } } }()