From a37680685f3aef881e463a3fe2ab1811d99c2e2e Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Tue, 17 Mar 2026 10:37:40 -0400
Subject: [PATCH] Fix flakey getAndPossiblyMerge test.

---
 .../database/RecipientTableTest_getAndPossiblyMerge.kt    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt
index d08fb3ca17..3988afd846 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt
@@ -1190,16 +1190,16 @@ class RecipientTableTest_getAndPossiblyMerge {
     }
 
     fun expect(id: RecipientId, e164: String?, pni: PNI?, aci: ACI?) {
-      val recipient = Recipient.resolved(id)
+      val record = SignalDatabase.recipients.getRecord(id)
       val expected = RecipientTuple(
         e164 = e164,
         pni = pni,
         aci = aci
       )
       val actual = RecipientTuple(
-        e164 = recipient.e164.orElse(null),
-        pni = recipient.pni.orElse(null),
-        aci = recipient.aci.orElse(null)
+        e164 = record.e164,
+        pni = record.pni,
+        aci = record.aci
       )
 
       assertEquals("Recipient $id did not match expected result!", expected, actual)