Tweaks to Chat test cases

signalapp · Sep 4, 2024 · 995dbdb · 995dbdb
1 parent f6eb5ed
commit 995dbdb
Show file tree

Hide file tree

Showing 70 changed files with 84 additions and 76 deletions.
diff --git a/src/main/kotlin/Permutations.kt b/src/main/kotlin/Permutations.kt
@@ -150,6 +150,8 @@ class PermutationScope : Iterator<List<Message<*, *>>> {
 
   fun someDecrementingTimestamp(lower: Long = 1659383695000, upper: Long = 1911844456000): Long = some(Generators.decrementingTimestamps(lower, upper))
 
+  fun someExpirationTimerMs(): Long = some(Generators.expirationTimersMs())
+
   fun someE164(): Long = some(Generators.e164s())
 
   fun someUuid(): UUID = some(Generators.uuids())
@@ -275,6 +277,12 @@ object Generators {
   fun picoMobs(): Generator<String> = Generators.list(SeededRandom.string(18, 25, "123456789"), SeededRandom.string(18, 25, "123456789"))
   fun colors(): Generator<Int> = Generators.list(seededRandomColor(), seededRandomColor(), seededRandomColor())
 
+  /**
+   * Expiration timers are 64-bit values that should be second-aligned
+   * (divisible by 1000), and whose value-as-seconds should fit into 32-bits.
+   */
+  fun expirationTimersMs(): Generator<Long> = Generators.list(0L, SeededRandom.long(0, Int.MAX_VALUE.toLong()) * 1000, SeededRandom.long(0, Int.MAX_VALUE.toLong()) * 1000)
+
   fun <T> list(vararg items: T): Generator<T> = ListGenerator(items.toList())
   fun <T> list(items: List<T>): Generator<T> = ListGenerator(items)
   fun <T> single(item: T): Generator<T> = Generators.list(item)

diff --git a/src/main/kotlin/tests/ChatItemExpirationTimerUpdateTestCase.kt b/src/main/kotlin/tests/ChatItemExpirationTimerUpdateTestCase.kt
@@ -26,7 +26,7 @@ object ChatItemExpirationTimerUpdateTestCase : TestCase("chat_item_expiration_ti
         directionless = ChatItem.DirectionlessMessageDetails(),
         updateMessage = ChatUpdateMessage(
           expirationTimerChange = ExpirationTimerChatUpdate(
-            expiresInMs = somePositiveLong()
+            expiresInMs = someExpirationTimerMs()
           )
         )
       )

diff --git a/src/main/kotlin/tests/ChatTestCase.kt b/src/main/kotlin/tests/ChatTestCase.kt
@@ -34,11 +34,11 @@ object ChatTestCase : TestCase("chat") {
     frames += Frame(
       chat = Chat(
         id = 3,
-        recipientId = StandardFrames.chatAlice.chat!!.id,
+        recipientId = StandardFrames.recipientAlice.recipient!!.id,
         archived = someBoolean(),
         pinnedOrder = some(Generators.list(listOf(0, 1))),
-        expirationTimerMs = somePositiveLong(),
-        muteUntilMs = somePositiveLong(),
+        expirationTimerMs = someExpirationTimerMs(),
+        muteUntilMs = someTimestamp(),
         markedUnread = someBoolean(),
         dontNotifyForMentionsIfMuted = someBoolean(),
         style = somePermutation {

diff --git a/src/main/kotlin/tests/RecipientCallLinkTestCase.kt b/src/main/kotlin/tests/RecipientCallLinkTestCase.kt
@@ -23,7 +23,7 @@ object RecipientCallLinkTestCase : TestCase("recipient_call_link") {
           adminKey = someNullableBytes(32)?.toByteString(),
           name = someString(),
           restrictions = someEnum(CallLink.Restrictions::class.java, excluding = CallLink.Restrictions.UNKNOWN),
-          expirationMs = somePositiveLong()
+          expirationMs = someExpirationTimerMs()
         )
       )
     )

diff --git a/test-cases/chat_00.binproto b/test-cases/chat_00.binproto
diff --git a/test-cases/chat_00.txtproto b/test-cases/chat_00.txtproto
@@ -111,7 +111,7 @@ Frame {
     dontNotifyForMentionsIfMuted = true
     id = 3
     markedUnread = true
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       autoBubbleColor = AutomaticBubbleColor {}
       dimWallpaperInDarkMode = true

diff --git a/test-cases/chat_01.binproto b/test-cases/chat_01.binproto
diff --git a/test-cases/chat_01.txtproto b/test-cases/chat_01.txtproto
@@ -107,11 +107,11 @@ Frame {
 
 Frame {
   chat = Chat {
-    expirationTimerMs = 5826213532931346611
+    expirationTimerMs = 296226146000
     id = 3
-    muteUntilMs = 3788253560711682182
+    muteUntilMs = 1723689901182
     pinnedOrder = 1
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.SOLID_ULTRAMARINE
       wallpaperPhoto = FilePointer {

diff --git a/test-cases/chat_02.binproto b/test-cases/chat_02.binproto
diff --git a/test-cases/chat_02.txtproto b/test-cases/chat_02.txtproto
@@ -109,11 +109,11 @@ Frame {
   chat = Chat {
     archived = true
     dontNotifyForMentionsIfMuted = true
-    expirationTimerMs = 937018508425176998
+    expirationTimerMs = 145232483000
     id = 3
     markedUnread = true
-    muteUntilMs = 6481873439951717697
-    recipientId = 2
+    muteUntilMs = 1864331637697
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.SOLID_CRIMSON
       dimWallpaperInDarkMode = true

diff --git a/test-cases/chat_03.binproto b/test-cases/chat_03.binproto
diff --git a/test-cases/chat_03.txtproto b/test-cases/chat_03.txtproto
@@ -109,7 +109,7 @@ Frame {
   chat = Chat {
     id = 3
     pinnedOrder = 1
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.SOLID_VERMILION
       wallpaperPhoto = FilePointer {

diff --git a/test-cases/chat_04.binproto b/test-cases/chat_04.binproto
diff --git a/test-cases/chat_04.txtproto b/test-cases/chat_04.txtproto
@@ -109,11 +109,11 @@ Frame {
   chat = Chat {
     archived = true
     dontNotifyForMentionsIfMuted = true
-    expirationTimerMs = 5826213532931346611
+    expirationTimerMs = 296226146000
     id = 3
     markedUnread = true
-    muteUntilMs = 3788253560711682182
-    recipientId = 2
+    muteUntilMs = 1723689901182
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.SOLID_BURLAP
       dimWallpaperInDarkMode = true

diff --git a/test-cases/chat_05.binproto b/test-cases/chat_05.binproto
diff --git a/test-cases/chat_05.txtproto b/test-cases/chat_05.txtproto
@@ -107,11 +107,11 @@ Frame {
 
 Frame {
   chat = Chat {
-    expirationTimerMs = 937018508425176998
+    expirationTimerMs = 145232483000
     id = 3
-    muteUntilMs = 6481873439951717697
+    muteUntilMs = 1864331637697
     pinnedOrder = 1
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.SOLID_FOREST
       wallpaperPhoto = FilePointer {

diff --git a/test-cases/chat_06.binproto b/test-cases/chat_06.binproto
diff --git a/test-cases/chat_06.txtproto b/test-cases/chat_06.txtproto
@@ -111,7 +111,7 @@ Frame {
     dontNotifyForMentionsIfMuted = true
     id = 3
     markedUnread = true
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.SOLID_WINTERGREEN
       dimWallpaperInDarkMode = true

diff --git a/test-cases/chat_07.binproto b/test-cases/chat_07.binproto
diff --git a/test-cases/chat_07.txtproto b/test-cases/chat_07.txtproto
@@ -107,11 +107,11 @@ Frame {
 
 Frame {
   chat = Chat {
-    expirationTimerMs = 5826213532931346611
+    expirationTimerMs = 296226146000
     id = 3
-    muteUntilMs = 3788253560711682182
+    muteUntilMs = 1723689901182
     pinnedOrder = 1
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.SOLID_TEAL
       wallpaperPhoto = FilePointer {

diff --git a/test-cases/chat_08.binproto b/test-cases/chat_08.binproto
diff --git a/test-cases/chat_08.txtproto b/test-cases/chat_08.txtproto
@@ -109,11 +109,11 @@ Frame {
   chat = Chat {
     archived = true
     dontNotifyForMentionsIfMuted = true
-    expirationTimerMs = 937018508425176998
+    expirationTimerMs = 145232483000
     id = 3
     markedUnread = true
-    muteUntilMs = 6481873439951717697
-    recipientId = 2
+    muteUntilMs = 1864331637697
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.SOLID_BLUE
       dimWallpaperInDarkMode = true

diff --git a/test-cases/chat_09.binproto b/test-cases/chat_09.binproto
diff --git a/test-cases/chat_09.txtproto b/test-cases/chat_09.txtproto
@@ -109,7 +109,7 @@ Frame {
   chat = Chat {
     id = 3
     pinnedOrder = 1
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.SOLID_INDIGO
       wallpaperPreset = WallpaperPreset.SOLID_COPPER

diff --git a/test-cases/chat_10.binproto b/test-cases/chat_10.binproto
diff --git a/test-cases/chat_10.txtproto b/test-cases/chat_10.txtproto
@@ -109,11 +109,11 @@ Frame {
   chat = Chat {
     archived = true
     dontNotifyForMentionsIfMuted = true
-    expirationTimerMs = 5826213532931346611
+    expirationTimerMs = 296226146000
     id = 3
     markedUnread = true
-    muteUntilMs = 3788253560711682182
-    recipientId = 2
+    muteUntilMs = 1723689901182
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.SOLID_VIOLET
       dimWallpaperInDarkMode = true

diff --git a/test-cases/chat_11.binproto b/test-cases/chat_11.binproto
diff --git a/test-cases/chat_11.txtproto b/test-cases/chat_11.txtproto
@@ -107,11 +107,11 @@ Frame {
 
 Frame {
   chat = Chat {
-    expirationTimerMs = 937018508425176998
+    expirationTimerMs = 145232483000
     id = 3
-    muteUntilMs = 6481873439951717697
+    muteUntilMs = 1864331637697
     pinnedOrder = 1
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.SOLID_PLUM
       wallpaperPreset = WallpaperPreset.SOLID_CELADON

diff --git a/test-cases/chat_12.binproto b/test-cases/chat_12.binproto
diff --git a/test-cases/chat_12.txtproto b/test-cases/chat_12.txtproto
@@ -111,7 +111,7 @@ Frame {
     dontNotifyForMentionsIfMuted = true
     id = 3
     markedUnread = true
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.SOLID_TAUPE
       dimWallpaperInDarkMode = true

diff --git a/test-cases/chat_13.binproto b/test-cases/chat_13.binproto
diff --git a/test-cases/chat_13.txtproto b/test-cases/chat_13.txtproto
@@ -107,11 +107,11 @@ Frame {
 
 Frame {
   chat = Chat {
-    expirationTimerMs = 5826213532931346611
+    expirationTimerMs = 296226146000
     id = 3
-    muteUntilMs = 3788253560711682182
+    muteUntilMs = 1723689901182
     pinnedOrder = 1
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.SOLID_STEEL
       wallpaperPreset = WallpaperPreset.SOLID_PACIFIC

diff --git a/test-cases/chat_14.binproto b/test-cases/chat_14.binproto
diff --git a/test-cases/chat_14.txtproto b/test-cases/chat_14.txtproto
@@ -109,11 +109,11 @@ Frame {
   chat = Chat {
     archived = true
     dontNotifyForMentionsIfMuted = true
-    expirationTimerMs = 937018508425176998
+    expirationTimerMs = 145232483000
     id = 3
     markedUnread = true
-    muteUntilMs = 6481873439951717697
-    recipientId = 2
+    muteUntilMs = 1864331637697
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.GRADIENT_EMBER
       dimWallpaperInDarkMode = true

diff --git a/test-cases/chat_15.binproto b/test-cases/chat_15.binproto
diff --git a/test-cases/chat_15.txtproto b/test-cases/chat_15.txtproto
@@ -109,7 +109,7 @@ Frame {
   chat = Chat {
     id = 3
     pinnedOrder = 1
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.GRADIENT_MIDNIGHT
       wallpaperPreset = WallpaperPreset.SOLID_NAVY

diff --git a/test-cases/chat_16.binproto b/test-cases/chat_16.binproto
diff --git a/test-cases/chat_16.txtproto b/test-cases/chat_16.txtproto
@@ -109,11 +109,11 @@ Frame {
   chat = Chat {
     archived = true
     dontNotifyForMentionsIfMuted = true
-    expirationTimerMs = 5826213532931346611
+    expirationTimerMs = 296226146000
     id = 3
     markedUnread = true
-    muteUntilMs = 3788253560711682182
-    recipientId = 2
+    muteUntilMs = 1723689901182
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.GRADIENT_INFRARED
       dimWallpaperInDarkMode = true

diff --git a/test-cases/chat_17.binproto b/test-cases/chat_17.binproto
diff --git a/test-cases/chat_17.txtproto b/test-cases/chat_17.txtproto
@@ -107,11 +107,11 @@ Frame {
 
 Frame {
   chat = Chat {
-    expirationTimerMs = 937018508425176998
+    expirationTimerMs = 145232483000
     id = 3
-    muteUntilMs = 6481873439951717697
+    muteUntilMs = 1864331637697
     pinnedOrder = 1
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.GRADIENT_LAGOON
       wallpaperPreset = WallpaperPreset.SOLID_PINK

diff --git a/test-cases/chat_18.binproto b/test-cases/chat_18.binproto
diff --git a/test-cases/chat_18.txtproto b/test-cases/chat_18.txtproto
@@ -111,7 +111,7 @@ Frame {
     dontNotifyForMentionsIfMuted = true
     id = 3
     markedUnread = true
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.GRADIENT_FLUORESCENT
       dimWallpaperInDarkMode = true

diff --git a/test-cases/chat_19.binproto b/test-cases/chat_19.binproto
diff --git a/test-cases/chat_19.txtproto b/test-cases/chat_19.txtproto
@@ -107,11 +107,11 @@ Frame {
 
 Frame {
   chat = Chat {
-    expirationTimerMs = 5826213532931346611
+    expirationTimerMs = 296226146000
     id = 3
-    muteUntilMs = 3788253560711682182
+    muteUntilMs = 1723689901182
     pinnedOrder = 1
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.GRADIENT_BASIL
       wallpaperPreset = WallpaperPreset.SOLID_SILVER

diff --git a/test-cases/chat_20.binproto b/test-cases/chat_20.binproto
diff --git a/test-cases/chat_20.txtproto b/test-cases/chat_20.txtproto
@@ -109,11 +109,11 @@ Frame {
   chat = Chat {
     archived = true
     dontNotifyForMentionsIfMuted = true
-    expirationTimerMs = 937018508425176998
+    expirationTimerMs = 145232483000
     id = 3
     markedUnread = true
-    muteUntilMs = 6481873439951717697
-    recipientId = 2
+    muteUntilMs = 1864331637697
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.GRADIENT_SUBLIME
       dimWallpaperInDarkMode = true

diff --git a/test-cases/chat_21.binproto b/test-cases/chat_21.binproto
diff --git a/test-cases/chat_21.txtproto b/test-cases/chat_21.txtproto
@@ -109,7 +109,7 @@ Frame {
   chat = Chat {
     id = 3
     pinnedOrder = 1
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.GRADIENT_SEA
       wallpaperPreset = WallpaperPreset.GRADIENT_NOIR

diff --git a/test-cases/chat_22.binproto b/test-cases/chat_22.binproto
diff --git a/test-cases/chat_22.txtproto b/test-cases/chat_22.txtproto
@@ -109,11 +109,11 @@ Frame {
   chat = Chat {
     archived = true
     dontNotifyForMentionsIfMuted = true
-    expirationTimerMs = 5826213532931346611
+    expirationTimerMs = 296226146000
     id = 3
     markedUnread = true
-    muteUntilMs = 3788253560711682182
-    recipientId = 2
+    muteUntilMs = 1723689901182
+    recipientId = 4
     style = ChatStyle {
       bubbleColorPreset = BubbleColorPreset.GRADIENT_TANGERINE
       dimWallpaperInDarkMode = true

diff --git a/test-cases/chat_23.binproto b/test-cases/chat_23.binproto
diff --git a/test-cases/chat_23.txtproto b/test-cases/chat_23.txtproto
@@ -107,11 +107,11 @@ Frame {
 
 Frame {
   chat = Chat {
-    expirationTimerMs = 937018508425176998
+    expirationTimerMs = 145232483000
     id = 3
-    muteUntilMs = 6481873439951717697
+    muteUntilMs = 1864331637697
     pinnedOrder = 1
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       customColorId = 1
       wallpaperPreset = WallpaperPreset.GRADIENT_AQUA

diff --git a/test-cases/chat_24.binproto b/test-cases/chat_24.binproto
diff --git a/test-cases/chat_24.txtproto b/test-cases/chat_24.txtproto
@@ -111,7 +111,7 @@ Frame {
     dontNotifyForMentionsIfMuted = true
     id = 3
     markedUnread = true
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       customColorId = 2
       dimWallpaperInDarkMode = true

diff --git a/test-cases/chat_25.binproto b/test-cases/chat_25.binproto
diff --git a/test-cases/chat_25.txtproto b/test-cases/chat_25.txtproto
@@ -107,11 +107,11 @@ Frame {
 
 Frame {
   chat = Chat {
-    expirationTimerMs = 5826213532931346611
+    expirationTimerMs = 296226146000
     id = 3
-    muteUntilMs = 3788253560711682182
+    muteUntilMs = 1723689901182
     pinnedOrder = 1
-    recipientId = 2
+    recipientId = 4
     style = ChatStyle {
       customColorId = 3
       wallpaperPreset = WallpaperPreset.GRADIENT_MONSTERA

diff --git a/test-cases/chat_26.binproto b/test-cases/chat_26.binproto