Merge pull request #820 from alphagov/pp_6708_move_to_junit5

PP-6708 Upgrade to JUnit5
alphagov · Jul 2, 2020 · eb80388 · eb80388
2 parents 5a0c507 + aeed3ba
commit eb80388
Show file tree

Hide file tree

Showing 26 changed files with 189 additions and 203 deletions.
diff --git a/pom.xml b/pom.xml
@@ -172,6 +172,12 @@
             <version>1.1.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit5.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>
@@ -197,7 +203,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
+            <artifactId>mockito-junit-jupiter</artifactId>
             <version>3.3.3</version>
             <scope>test</scope>
         </dependency>

diff --git a/src/test/java/uk/gov/pay/ledger/event/model/EventDigestTest.java b/src/test/java/uk/gov/pay/ledger/event/model/EventDigestTest.java
@@ -1,6 +1,6 @@
 package uk.gov.pay.ledger.event.model;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.ZonedDateTime;
 import java.util.List;

diff --git a/src/test/java/uk/gov/pay/ledger/event/model/TransactionEntityFactoryTest.java b/src/test/java/uk/gov/pay/ledger/event/model/TransactionEntityFactoryTest.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import uk.gov.pay.commons.model.Source;
 import uk.gov.pay.ledger.transaction.entity.TransactionEntity;
 
@@ -22,14 +20,11 @@
 
 public class TransactionEntityFactoryTest {
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     private TransactionEntityFactory transactionEntityFactory;
 
     private static ObjectMapper objectMapper = new ObjectMapper();
 
-    @Before
+    @BeforeEach
     public void setUp() {
         transactionEntityFactory = new TransactionEntityFactory(new ObjectMapper());
     }

diff --git a/src/test/java/uk/gov/pay/ledger/event/resource/EventResourceTest.java b/src/test/java/uk/gov/pay/ledger/event/resource/EventResourceTest.java
@@ -1,25 +1,25 @@
 package uk.gov.pay.ledger.event.resource;
 
-import io.dropwizard.testing.junit.ResourceTestRule;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import io.dropwizard.testing.junit5.DropwizardExtensionsSupport;
+import io.dropwizard.testing.junit5.ResourceExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 import uk.gov.pay.ledger.event.dao.EventDao;
 import uk.gov.pay.ledger.event.model.Event;
-import uk.gov.pay.ledger.event.resource.EventResource;
 import uk.gov.pay.ledger.util.fixture.EventFixture;
 
 import javax.ws.rs.core.Response;
 import java.util.Optional;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@ExtendWith(DropwizardExtensionsSupport.class)
 public class EventResourceTest {
     private static final EventDao dao = mock(EventDao.class);
     private static final Long eventId = 1L;
@@ -28,12 +28,11 @@ public class EventResourceTest {
             .withId(eventId)
             .toEntity();
 
-    @ClassRule
-    public static final ResourceTestRule resources = ResourceTestRule.builder()
+    public static final ResourceExtension resources = ResourceExtension.builder()
             .addResource(new EventResource(dao))
             .build();
 
-    @Before
+    @BeforeEach
     public void setup() {
         when(dao.getById(eventId)).thenReturn(Optional.of(event));
     }

diff --git a/src/test/java/uk/gov/pay/ledger/event/service/EventServiceTest.java b/src/test/java/uk/gov/pay/ledger/event/service/EventServiceTest.java
@@ -2,11 +2,11 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.dropwizard.jackson.Jackson;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import uk.gov.pay.ledger.event.dao.EventDao;
 import uk.gov.pay.ledger.event.model.Event;
 import uk.gov.pay.ledger.event.model.EventDigest;
@@ -18,13 +18,14 @@
 import java.util.List;
 import java.util.Optional;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class EventServiceTest {
     @Mock
     EventDao mockEventDao;
@@ -38,7 +39,7 @@ public class EventServiceTest {
     private ZonedDateTime latestEventTime;
     private final String resourceExternalId = "resource_external_id";
 
-    @Before
+    @BeforeEach
     public void setUp() {
         eventService = new EventService(mockEventDao);
 
@@ -55,7 +56,7 @@ public void setUp() {
                 .withResourceExternalId(resourceExternalId)
                 .withEventDate(ZonedDateTime.now().minusHours(2L))
                 .toEntity();
-        when(mockEventDao.getEventsByResourceExternalId(resourceExternalId)).thenReturn(List.of(event1, event2));
+        lenient().when(mockEventDao.getEventsByResourceExternalId(resourceExternalId)).thenReturn(List.of(event1, event2));
     }
 
     @Test

diff --git a/src/test/java/uk/gov/pay/ledger/payout/model/PayoutEntityFactoryTest.java b/src/test/java/uk/gov/pay/ledger/payout/model/PayoutEntityFactoryTest.java
@@ -4,10 +4,8 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import uk.gov.pay.ledger.event.model.Event;
 import uk.gov.pay.ledger.event.model.EventDigest;
 import uk.gov.pay.ledger.payout.entity.PayoutEntity;
@@ -22,15 +20,13 @@
 import static uk.gov.pay.ledger.util.fixture.QueuePaymentEventFixture.aQueuePaymentEventFixture;
 
 public class PayoutEntityFactoryTest {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
 
     private PayoutEntityFactory payoutEntityFactory;
 
     private GsonBuilder gsonBuilder = new GsonBuilder();
     private ObjectMapper objectMapper;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         objectMapper = new ObjectMapper();
         payoutEntityFactory = new PayoutEntityFactory(objectMapper);

diff --git a/src/test/java/uk/gov/pay/ledger/payout/service/PayoutServiceTest.java b/src/test/java/uk/gov/pay/ledger/payout/service/PayoutServiceTest.java
@@ -1,12 +1,10 @@
 package uk.gov.pay.ledger.payout.service;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import uk.gov.pay.ledger.payout.dao.PayoutDao;
 import uk.gov.pay.ledger.payout.entity.PayoutEntity;
 import uk.gov.pay.ledger.payout.model.PayoutEntityFactory;
@@ -21,14 +19,14 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 import static uk.gov.pay.ledger.util.fixture.PayoutFixture.aPayoutList;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class PayoutServiceTest {
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
     @Mock
     private PayoutDao mockPayoutDao;
     @Mock
@@ -39,11 +37,11 @@ public class PayoutServiceTest {
     private String gatewayAccountId = "12345";
     private PayoutSearchParams searchParams;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         payoutService = new PayoutService(mockPayoutDao, payoutEntityFactory);
-        when(mockUriInfo.getBaseUriBuilder()).thenReturn(UriBuilder.fromUri("http://example.com"));
-        when(mockUriInfo.getPath()).thenReturn("/v1/payout");
+        lenient().when(mockUriInfo.getBaseUriBuilder()).thenReturn(UriBuilder.fromUri("http://example.com"));
+        lenient().when(mockUriInfo.getPath()).thenReturn("/v1/payout");
     }
 
     @Test
@@ -77,10 +75,9 @@ public void shouldThrowException_whenInvalidPageNumberIsRequested() {
         when(mockPayoutDao.searchPayouts(searchParams)).thenReturn(List.of());
         when(mockPayoutDao.getTotalForSearch(searchParams)).thenReturn(10L);
 
-        thrown.expect(WebApplicationException.class);
-        thrown.expectMessage("The requested page was not found");
-
-        PayoutSearchResponse response = payoutService.searchPayouts(searchParams, mockUriInfo);
+        WebApplicationException webApplicationException = assertThrows(WebApplicationException.class,
+                () -> payoutService.searchPayouts(searchParams, mockUriInfo));
+        assertThat(webApplicationException.getMessage(), is("The requested page was not found"));
     }
 
     @Test

diff --git a/src/test/java/uk/gov/pay/ledger/queue/EventDigestHandlerTest.java b/src/test/java/uk/gov/pay/ledger/queue/EventDigestHandlerTest.java
@@ -1,18 +1,17 @@
 package uk.gov.pay.ledger.queue;
 
-import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.classic.spi.LoggingEvent;
 import ch.qos.logback.core.Appender;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.BeforeClass;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.slf4j.LoggerFactory;
 import uk.gov.pay.ledger.event.model.Event;
 import uk.gov.pay.ledger.event.model.EventDigest;
@@ -27,7 +26,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -38,7 +36,7 @@
 import static uk.gov.pay.ledger.event.model.ResourceType.REFUND;
 import static uk.gov.pay.ledger.util.fixture.EventFixture.anEventFixture;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class EventDigestHandlerTest {
 
     @Mock
@@ -58,7 +56,7 @@ public class EventDigestHandlerTest {
     private EventDigestHandler eventDigestHandler;
     private EventDigest eventDigest;
 
-    @Before
+    @BeforeClass
     public void setUp() {
         eventDigest = EventDigest.fromEventList(List.of(anEventFixture().toEntity()));
         when(eventService.getEventDigestForResource(any()))

diff --git a/src/test/java/uk/gov/pay/ledger/queue/EventMessageHandlerTest.java b/src/test/java/uk/gov/pay/ledger/queue/EventMessageHandlerTest.java
@@ -1,17 +1,14 @@
 package uk.gov.pay.ledger.queue;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import uk.gov.pay.ledger.event.model.Event;
-import uk.gov.pay.ledger.event.model.EventDigest;
 import uk.gov.pay.ledger.event.model.response.CreateEventResponse;
 import uk.gov.pay.ledger.event.service.EventService;
-import uk.gov.pay.ledger.transaction.service.TransactionMetadataService;
-import uk.gov.pay.ledger.transaction.service.TransactionService;
 
 import java.util.List;
 
@@ -20,7 +17,7 @@
 import static org.mockito.Mockito.when;
 import static uk.gov.pay.ledger.util.fixture.QueuePaymentEventFixture.aQueuePaymentEventFixture;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class EventMessageHandlerTest {
 
     @Mock
@@ -43,7 +40,7 @@ public class EventMessageHandlerTest {
     @InjectMocks
     private EventMessageHandler eventMessageHandler;
 
-    @Before
+    @BeforeEach
     public void setUp() throws QueueException {
         when(eventQueue.retrieveEvents()).thenReturn(List.of(eventMessage));
         when(eventService.createIfDoesNotExist(any())).thenReturn(createEventResponse);

diff --git a/src/test/java/uk/gov/pay/ledger/queue/EventQueueTest.java b/src/test/java/uk/gov/pay/ledger/queue/EventQueueTest.java
@@ -2,11 +2,11 @@
 
 import com.amazonaws.services.sqs.model.SendMessageResult;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import uk.gov.pay.ledger.app.LedgerConfig;
 import uk.gov.pay.ledger.app.config.QueueMessageReceiverConfig;
 import uk.gov.pay.ledger.app.config.SqsConfig;
@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class EventQueueTest {
 
     @Mock
@@ -34,7 +34,7 @@ public class EventQueueTest {
 
     private EventQueue eventQueue;
 
-    @Before
+    @BeforeEach
     public void setUp() throws QueueException {
         String validJsonMessage = "{" +
                 "\"id\": \"my-id\"," +