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

Migrate DirectoryControllerTest to JUnit 5

This commit is contained in:
Chris Eager 2021-07-23 14:06:51 -05:00 committed by Chris Eager
parent f971c76a99
commit ff627793d6
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DirectoryControllerTest.java
View File

@ -5,13 +5,24 @@
package org.whispersystems.textsecuregcm.tests.controllers; package org.whispersystems.textsecuregcm.tests.controllers;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import io.dropwizard.auth.PolymorphicAuthValueFactoryProvider; import io.dropwizard.auth.PolymorphicAuthValueFactoryProvider;
import io.dropwizard.testing.junit.ResourceTestRule; import io.dropwizard.testing.junit5.DropwizardExtensionsSupport;
import io.dropwizard.testing.junit5.ResourceExtension;
import java.util.Collections;
import javax.ws.rs.client.Entity;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
import org.glassfish.jersey.test.grizzly.GrizzlyWebTestContainerFactory; import org.glassfish.jersey.test.grizzly.GrizzlyWebTestContainerFactory;
import org.junit.Before; import org.junit.jupiter.api.Test;
import org.junit.Rule; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.extension.ExtendWith;
import org.whispersystems.textsecuregcm.auth.DisabledPermittedAccount; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAccount;
import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialGenerator; import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialGenerator;
import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentials; import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentials;
@ -19,37 +30,26 @@ import org.whispersystems.textsecuregcm.controllers.DirectoryController;
import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.storage.Account;
import org.whispersystems.textsecuregcm.tests.util.AuthHelper; import org.whispersystems.textsecuregcm.tests.util.AuthHelper;
import javax.ws.rs.client.Entity; @ExtendWith(DropwizardExtensionsSupport.class)
import javax.ws.rs.core.MediaType; class DirectoryControllerTest {
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
import java.util.Collections;
import static org.assertj.core.api.Assertions.assertThat; private static final ExternalServiceCredentialGenerator directoryCredentialsGenerator = mock(ExternalServiceCredentialGenerator.class);
import static org.mockito.ArgumentMatchers.eq; private static final ExternalServiceCredentials validCredentials = new ExternalServiceCredentials("username", "password");
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public class DirectoryControllerTest { private static final ResourceExtension resources = ResourceExtension.builder()
private final ExternalServiceCredentialGenerator directoryCredentialsGenerator = mock(ExternalServiceCredentialGenerator.class);
private final ExternalServiceCredentials validCredentials = new ExternalServiceCredentials("username", "password");
@Rule
public final ResourceTestRule resources = ResourceTestRule.builder()
.addProvider(AuthHelper.getAuthFilter()) .addProvider(AuthHelper.getAuthFilter())
.addProvider(new PolymorphicAuthValueFactoryProvider.Binder<>(ImmutableSet.of(Account.class, DisabledPermittedAccount.class))) .addProvider(new PolymorphicAuthValueFactoryProvider.Binder<>(ImmutableSet.of(Account.class, DisabledPermittedAccount.class)))
.setTestContainerFactory(new GrizzlyWebTestContainerFactory()) .setTestContainerFactory(new GrizzlyWebTestContainerFactory())
.addResource(new DirectoryController(directoryCredentialsGenerator)) .addResource(new DirectoryController(directoryCredentialsGenerator))
.build(); .build();
@Before @BeforeEach
public void setup() { void setup() {
when(directoryCredentialsGenerator.generateFor(eq(AuthHelper.VALID_NUMBER))).thenReturn(validCredentials); when(directoryCredentialsGenerator.generateFor(eq(AuthHelper.VALID_NUMBER))).thenReturn(validCredentials);
} }
@Test @Test
public void testFeedbackOk() { void testFeedbackOk() {
Response response = Response response =
resources.getJerseyTest() resources.getJerseyTest()
.target("/v1/directory/feedback-v3/ok") .target("/v1/directory/feedback-v3/ok")
@ -60,7 +60,7 @@ public class DirectoryControllerTest {
} }
@Test @Test
public void testGetAuthToken() { void testGetAuthToken() {
ExternalServiceCredentials token = ExternalServiceCredentials token =
resources.getJerseyTest() resources.getJerseyTest()
.target("/v1/directory/auth") .target("/v1/directory/auth")
@ -72,7 +72,7 @@ public class DirectoryControllerTest {
} }
@Test @Test
public void testDisabledGetAuthToken() { void testDisabledGetAuthToken() {
Response response = Response response =
resources.getJerseyTest() resources.getJerseyTest()
.target("/v1/directory/auth") .target("/v1/directory/auth")
@ -84,7 +84,7 @@ public class DirectoryControllerTest {
@Test @Test
public void testContactIntersection() { void testContactIntersection() {
Response response = Response response =
resources.getJerseyTest() resources.getJerseyTest()
.target("/v1/directory/tokens/") .target("/v1/directory/tokens/")