From 831023e41df9a555fdeb378a44dfe398e74421f5 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Fri, 23 Jul 2021 14:07:27 -0500
Subject: [PATCH] Migrate PaymentsControllerTest to JUnit 5

---
 .../controllers/PaymentsControllerTest.java   | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/PaymentsControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/PaymentsControllerTest.java
index f64196ffd..570ec7a9c 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/PaymentsControllerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/PaymentsControllerTest.java
@@ -5,11 +5,23 @@
 
 package org.whispersystems.textsecuregcm.tests.controllers;
 
+import static org.assertj.core.api.AssertionsForClassTypes.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 io.dropwizard.auth.PolymorphicAuthValueFactoryProvider;
+import io.dropwizard.testing.junit5.DropwizardExtensionsSupport;
+import io.dropwizard.testing.junit5.ResourceExtension;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.ws.rs.core.Response;
 import org.glassfish.jersey.test.grizzly.GrizzlyWebTestContainerFactory;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.whispersystems.textsecuregcm.auth.DisabledPermittedAccount;
 import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialGenerator;
 import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentials;
@@ -20,42 +32,30 @@ import org.whispersystems.textsecuregcm.entities.CurrencyConversionEntityList;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.tests.util.AuthHelper;
 
-import javax.ws.rs.core.Response;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import io.dropwizard.auth.PolymorphicAuthValueFactoryProvider;
-import io.dropwizard.testing.junit.ResourceTestRule;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class PaymentsControllerTest {
+@ExtendWith(DropwizardExtensionsSupport.class)
+class PaymentsControllerTest {
 
   private static final ExternalServiceCredentialGenerator paymentsCredentialGenerator = mock(ExternalServiceCredentialGenerator.class);
   private static final CurrencyConversionManager currencyManager                      = mock(CurrencyConversionManager.class);
 
   private final ExternalServiceCredentials validCredentials = new ExternalServiceCredentials("username", "password");
 
-  @ClassRule
-  public static final ResourceTestRule resources = ResourceTestRule.builder()
-                                                                   .addProvider(AuthHelper.getAuthFilter())
-                                                                   .addProvider(new PolymorphicAuthValueFactoryProvider.Binder<>(ImmutableSet.of(Account.class, DisabledPermittedAccount.class)))
-                                                                   .setTestContainerFactory(new GrizzlyWebTestContainerFactory())
-                                                                   .addResource(new PaymentsController(currencyManager, paymentsCredentialGenerator))
-                                                                   .build();
+  private static final ResourceExtension resources = ResourceExtension.builder()
+                                                                      .addProvider(AuthHelper.getAuthFilter())
+                                                                      .addProvider(new PolymorphicAuthValueFactoryProvider.Binder<>(ImmutableSet.of(Account.class, DisabledPermittedAccount.class)))
+                                                                      .setTestContainerFactory(new GrizzlyWebTestContainerFactory())
+                                                                      .addResource(new PaymentsController(currencyManager, paymentsCredentialGenerator))
+                                                                      .build();
 
 
-  @Before
-  public void setup() {
+  @BeforeEach
+  void setup() {
     when(paymentsCredentialGenerator.generateFor(eq(AuthHelper.VALID_UUID.toString()))).thenReturn(validCredentials);
     when(currencyManager.getCurrencyConversions()).thenReturn(Optional.of(new CurrencyConversionEntityList(List.of(new CurrencyConversionEntity("FOO", Map.of("USD", 2.35, "EUR", 1.89)), new CurrencyConversionEntity("BAR", Map.of("USD", 1.50, "EUR", 0.98))), System.currentTimeMillis())));
   }
 
   @Test
-  public void testGetAuthToken() {
+  void testGetAuthToken() {
     ExternalServiceCredentials token =
         resources.getJerseyTest()
             .target("/v1/payments/auth")
@@ -68,7 +68,7 @@ public class PaymentsControllerTest {
   }
 
   @Test
-  public void testInvalidAuthGetAuthToken() {
+  void testInvalidAuthGetAuthToken() {
     Response response =
         resources.getJerseyTest()
             .target("/v1/payments/auth")
@@ -80,7 +80,7 @@ public class PaymentsControllerTest {
   }
 
   @Test
-  public void testDisabledGetAuthToken() {
+  void testDisabledGetAuthToken() {
     Response response =
         resources.getJerseyTest()
             .target("/v1/payments/auth")
@@ -91,7 +91,7 @@ public class PaymentsControllerTest {
   }
 
   @Test
-  public void testGetCurrencyConversions() {
+  void testGetCurrencyConversions() {
     CurrencyConversionEntityList conversions =
         resources.getJerseyTest()
                  .target("/v1/payments/conversions")