MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a late-breaking merge conflict

This commit is contained in:
Jon Chambers 2023-05-02 16:12:26 -04:00
parent be176f98ad
commit 3ee5ac4514
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerTest.java
View File

@ -5,8 +5,6 @@
package org.whispersystems.textsecuregcm.storage; package org.whispersystems.textsecuregcm.storage;
import org.whispersystems.textsecuregcm.util.SystemMapper;
import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertSame;
@ -663,7 +661,7 @@ class AccountsManagerTest {
} }
@Test @Test
void testChangePhoneNumberSameNumberWithPNIData() throws InterruptedException, MismatchedDevicesException { void testChangePhoneNumberSameNumberWithPNIData() {
final String number = "+14152222222"; final String number = "+14152222222";
Account account = AccountsHelper.generateTestAccount(number, UUID.randomUUID(), UUID.randomUUID(), new ArrayList<>(), new byte[16]); Account account = AccountsHelper.generateTestAccount(number, UUID.randomUUID(), UUID.randomUUID(), new ArrayList<>(), new byte[16]);
@ -674,7 +672,6 @@ class AccountsManagerTest {
verify(accounts, never()).update(any()); verify(accounts, never()).update(any());
verifyNoInteractions(deletedAccountsManager); verifyNoInteractions(deletedAccountsManager);
verifyNoInteractions(directoryQueue);
verifyNoInteractions(keys); verifyNoInteractions(keys);
} }
@ -716,7 +713,7 @@ class AccountsManagerTest {
} }
@Test @Test
void testPNIUpdate() throws InterruptedException, MismatchedDevicesException { void testPNIUpdate() throws MismatchedDevicesException {
final String number = "+14152222222"; final String number = "+14152222222";
List<Device> devices = List.of(DevicesHelper.createDevice(1L, 0L, 101), DevicesHelper.createDevice(2L, 0L, 102)); List<Device> devices = List.of(DevicesHelper.createDevice(1L, 0L, 101), DevicesHelper.createDevice(2L, 0L, 102));
@ -750,7 +747,6 @@ class AccountsManagerTest {
verify(accounts).update(any()); verify(accounts).update(any());
verifyNoInteractions(deletedAccountsManager); verifyNoInteractions(deletedAccountsManager);
verifyNoInteractions(directoryQueue);
verifyNoInteractions(keys); verifyNoInteractions(keys);
} }