Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 09:48:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update inadvertent/legacy JUnit 4 imports to JUnit 5

Browse Source
This commit is contained in:
Jon Chambers
2026-01-13 10:39:30 -05:00
committed by Jon Chambers
parent af02cb93c0
commit 8c3a38979a
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/test/java/org/whispersystems/textsecuregcm/auth/grpc/ProhibitAuthenticationInterceptorTest.java
View File

@@ -15,9 +15,9 @@ import org.whispersystems.textsecuregcm.grpc.EchoServiceImpl;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
class ProhibitAuthenticationInterceptorTest {
private Server server;
@@ -53,7 +53,7 @@ class ProhibitAuthenticationInterceptorTest {
final StatusRuntimeException e = assertThrows(StatusRuntimeException.class,
() -> client.echo(EchoRequest.getDefaultInstance()));
assertEquals(e.getStatus().getCode(), Status.Code.UNAUTHENTICATED);
assertEquals(Status.Code.UNAUTHENTICATED, e.getStatus().getCode());
}
@Test

9
service/src/test/java/org/whispersystems/textsecuregcm/auth/grpc/RequireAuthenticationInterceptorTest.java
View File

@@ -1,7 +1,7 @@
package org.whispersystems.textsecuregcm.auth.grpc;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
@@ -18,7 +18,6 @@ import java.time.Instant;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import org.junit.Assert;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -72,7 +71,7 @@ class RequireAuthenticationInterceptorTest {
final GetAuthenticatedDeviceResponse authenticatedDevice = client.getAuthenticatedDevice(
GetAuthenticatedDeviceRequest.getDefaultInstance());
assertEquals(authenticatedDevice.getDeviceId(), deviceId);
assertEquals(deviceId, authenticatedDevice.getDeviceId());
assertEquals(UUIDUtil.fromByteString(authenticatedDevice.getAccountIdentifier()), aci);
}
@@ -86,7 +85,7 @@ class RequireAuthenticationInterceptorTest {
final StatusRuntimeException e = assertThrows(StatusRuntimeException.class,
() -> client.getRequestAttributes(GetRequestAttributesRequest.getDefaultInstance()));
Assert.assertEquals(e.getStatus().getCode(), Status.Code.UNAUTHENTICATED);
assertEquals(Status.Code.UNAUTHENTICATED, e.getStatus().getCode());
}
@Test
@@ -97,6 +96,6 @@ class RequireAuthenticationInterceptorTest {
final StatusRuntimeException e = assertThrows(StatusRuntimeException.class,
() -> client.getRequestAttributes(GetRequestAttributesRequest.getDefaultInstance()));
Assert.assertEquals(e.getStatus().getCode(), Status.Code.UNAUTHENTICATED);
assertEquals(Status.Code.UNAUTHENTICATED, e.getStatus().getCode());
}
}

8
service/src/test/java/org/whispersystems/textsecuregcm/grpc/RequestAttributesInterceptorTest.java
View File

@@ -4,9 +4,6 @@
*/
package org.whispersystems.textsecuregcm.grpc;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import io.grpc.ManagedChannel;
import io.grpc.Metadata;
import io.grpc.Server;
@@ -30,9 +27,12 @@ import org.signal.chat.rpc.GetRequestAttributesRequest;
import org.signal.chat.rpc.GetRequestAttributesResponse;
import org.signal.chat.rpc.RequestAttributesGrpc;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class RequestAttributesInterceptorTest {
private static String USER_AGENT = "Signal-Android/4.53.7 (Android 8.1; libsignal)";
private static final String USER_AGENT = "Signal-Android/4.53.7 (Android 8.1; libsignal)";
private Server server;
private AtomicBoolean removeUserAgent;

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

@@ -4,9 +4,6 @@
*/
package org.whispersystems.textsecuregcm.storage;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Collections;
@@ -17,6 +14,9 @@ import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.whispersystems.textsecuregcm.entities.KEMSignedPreKey;
import org.whispersystems.textsecuregcm.tests.util.KeysHelper;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
class KEMPreKeyPageTest {
private static final ECKeyPair IDENTITY_KEY_PAIR = ECKeyPair.generate();
@@ -27,7 +27,7 @@ class KEMPreKeyPageTest {
final int actualMagic = page.getInt();
assertEquals(KEMPreKeyPage.HEADER_MAGIC, actualMagic);
final int version = page.getInt();
assertEquals(version, 1);
assertEquals(1, version);
assertEquals(KEMPreKeyPage.SERIALIZED_PREKEY_LENGTH, page.remaining());
}

2
service/src/test/java/org/whispersystems/textsecuregcm/workers/RemoveOrphanedPreKeyPagesCommandTest.java
View File

@@ -26,7 +26,7 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import net.sourceforge.argparse4j.inf.Namespace;
import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.junitpioneer.jupiter.cartesian.CartesianTest;