diff --git a/pom.xml b/pom.xml index ebba3cd2a..c266445b9 100644 --- a/pom.xml +++ b/pom.xml @@ -172,6 +172,12 @@ 1.1.1 test + + org.junit.jupiter + junit-jupiter-params + ${junit5.version} + test + org.testcontainers postgresql @@ -197,7 +203,7 @@ org.mockito - mockito-core + mockito-junit-jupiter 3.3.3 test 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 index b061d6946..9256cfeef 100644 --- 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 index a10240ea7..c51c42197 100644 --- 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 index 03360cf0d..356b388eb 100644 --- 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 index c3626e79b..ad848a6c9 100644 --- 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 index 053ac0be3..81ea67542 100644 --- 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 index 6a6b60846..fc630682c 100644 --- 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 index 11c7d8d64..8999a3b65 100644 --- 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 index b65e3ed50..e78720347 100644 --- 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 index 8036dee68..c3b24dfd2 100644 --- 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\"," + diff --git a/src/test/java/uk/gov/pay/ledger/queue/sqs/SqsQueueServiceTest.java b/src/test/java/uk/gov/pay/ledger/queue/sqs/SqsQueueServiceTest.java index da8a000fe..704ffb9e6 100644 --- a/src/test/java/uk/gov/pay/ledger/queue/sqs/SqsQueueServiceTest.java +++ b/src/test/java/uk/gov/pay/ledger/queue/sqs/SqsQueueServiceTest.java @@ -5,11 +5,11 @@ import com.amazonaws.services.sqs.model.Message; import com.amazonaws.services.sqs.model.ReceiveMessageRequest; import com.amazonaws.services.sqs.model.ReceiveMessageResult; -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.SqsConfig; import uk.gov.pay.ledger.queue.QueueException; @@ -19,12 +19,13 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class SqsQueueServiceTest { @Mock @@ -35,7 +36,7 @@ public class SqsQueueServiceTest { private SqsQueueService sqsQueueService; - @Before + @BeforeEach public void setUp() { SqsConfig sqsConfig = mock(SqsConfig.class); when(sqsConfig.getMessageMaximumBatchSize()).thenReturn(10); @@ -78,9 +79,9 @@ public void receiveMessagesShouldReturnEmptyListWhenNoMessagesAvailable() throws assertTrue(queueMessages.isEmpty()); } - @Test(expected = QueueException.class) - public void receiveMessagesShouldThrowQueueExceptionIfMessagesCannotBeReceived() throws QueueException { + @Test + public void receiveMessagesShouldThrowQueueExceptionIfMessagesCannotBeReceived() { when(sqsClient.receiveMessage(any(ReceiveMessageRequest.class))).thenThrow(AmazonSQSException.class); - sqsQueueService.receiveMessages("some-queue-url", "some-attribute-name"); + assertThrows(QueueException.class, () -> sqsQueueService.receiveMessages("some-queue-url", "some-attribute-name")); } } \ No newline at end of file diff --git a/src/test/java/uk/gov/pay/ledger/report/dao/builder/TransactionStatisticQueryTest.java b/src/test/java/uk/gov/pay/ledger/report/dao/builder/TransactionStatisticQueryTest.java index f0c71b052..eea0287ac 100644 --- a/src/test/java/uk/gov/pay/ledger/report/dao/builder/TransactionStatisticQueryTest.java +++ b/src/test/java/uk/gov/pay/ledger/report/dao/builder/TransactionStatisticQueryTest.java @@ -1,8 +1,8 @@ package uk.gov.pay.ledger.report.dao.builder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import org.junit.Before; -import org.junit.Test; import java.util.Map; import static org.hamcrest.MatcherAssert.assertThat; @@ -13,7 +13,7 @@ public class TransactionStatisticQueryTest { private TransactionStatisticQuery transactionStatisticQuery = new TransactionStatisticQuery(); - @Before + @BeforeEach public void setup() { transactionStatisticQuery.getQueryMap().clear(); transactionStatisticQuery.getFilterTemplates().clear(); diff --git a/src/test/java/uk/gov/pay/ledger/report/resource/ReportResourceTest.java b/src/test/java/uk/gov/pay/ledger/report/resource/ReportResourceTest.java index dbec0b5fa..83550ec82 100644 --- a/src/test/java/uk/gov/pay/ledger/report/resource/ReportResourceTest.java +++ b/src/test/java/uk/gov/pay/ledger/report/resource/ReportResourceTest.java @@ -1,14 +1,15 @@ package uk.gov.pay.ledger.report.resource; -import io.dropwizard.testing.junit.ResourceTestRule; +import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; +import io.dropwizard.testing.junit5.ResourceExtension; import org.hamcrest.CoreMatchers; import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import uk.gov.pay.ledger.exception.BadRequestExceptionMapper; import uk.gov.pay.ledger.exception.JerseyViolationExceptionMapper; -import uk.gov.pay.ledger.report.entity.TransactionsStatisticsResult; import uk.gov.pay.ledger.report.entity.TransactionSummaryResult; +import uk.gov.pay.ledger.report.entity.TransactionsStatisticsResult; import uk.gov.pay.ledger.report.params.TransactionSummaryParams; import uk.gov.pay.ledger.report.service.ReportService; @@ -21,12 +22,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +@ExtendWith(DropwizardExtensionsSupport.class) public class ReportResourceTest { private static final ReportService mockReportService = mock(ReportService.class); - @ClassRule - public static ResourceTestRule resources = ResourceTestRule.builder() + public static ResourceExtension resources = ResourceExtension.builder() .addResource(new ReportResource(mockReportService)) .addProvider(BadRequestExceptionMapper.class) .addProvider(JerseyViolationExceptionMapper.class) diff --git a/src/test/java/uk/gov/pay/ledger/report/service/ReportServiceTest.java b/src/test/java/uk/gov/pay/ledger/report/service/ReportServiceTest.java index 565bc726c..8b9a70ff4 100644 --- a/src/test/java/uk/gov/pay/ledger/report/service/ReportServiceTest.java +++ b/src/test/java/uk/gov/pay/ledger/report/service/ReportServiceTest.java @@ -1,17 +1,17 @@ package uk.gov.pay.ledger.report.service; -import org.junit.Test; -import org.junit.runner.RunWith; +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 uk.gov.pay.ledger.report.dao.ReportDao; import uk.gov.pay.ledger.report.dao.builder.TransactionStatisticQuery; import uk.gov.pay.ledger.report.entity.PaymentCountByStateResult; -import uk.gov.pay.ledger.report.entity.TransactionsStatisticsResult; import uk.gov.pay.ledger.report.entity.TransactionSummaryResult; +import uk.gov.pay.ledger.report.entity.TransactionsStatisticsResult; import uk.gov.pay.ledger.report.params.TransactionSummaryParams; import uk.gov.pay.ledger.transaction.model.TransactionType; @@ -31,7 +31,7 @@ import static uk.gov.pay.ledger.transaction.state.TransactionState.ERROR; import static uk.gov.pay.ledger.transaction.state.TransactionState.SUCCESS; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ReportServiceTest { @Mock diff --git a/src/test/java/uk/gov/pay/ledger/report/validator/TransactionSummaryValidatorTest.java b/src/test/java/uk/gov/pay/ledger/report/validator/TransactionSummaryValidatorTest.java index 71ba98e75..de756e299 100644 --- a/src/test/java/uk/gov/pay/ledger/report/validator/TransactionSummaryValidatorTest.java +++ b/src/test/java/uk/gov/pay/ledger/report/validator/TransactionSummaryValidatorTest.java @@ -1,24 +1,24 @@ package uk.gov.pay.ledger.report.validator; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; import uk.gov.pay.ledger.exception.ValidationException; import uk.gov.pay.ledger.report.params.TransactionSummaryParams; -public class TransactionSummaryValidatorTest { +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; - @Rule - public ExpectedException thrown = ExpectedException.none(); +public class TransactionSummaryValidatorTest { private TransactionSummaryParams transactionSummaryParams; @Test public void shouldThrowException_whenFromDateIsMissingAndValidationIsFalse() { transactionSummaryParams = new TransactionSummaryParams(); - thrown.expect(ValidationException.class); - thrown.expectMessage("Field [from_date] can not be null"); - TransactionSummaryValidator.validateTransactionSummaryParams(transactionSummaryParams, false); + + ValidationException validationException = assertThrows(ValidationException.class, + () -> TransactionSummaryValidator.validateTransactionSummaryParams(transactionSummaryParams, false)); + assertThat(validationException.getMessage(), is("Field [from_date] can not be null")); } @Test diff --git a/src/test/java/uk/gov/pay/ledger/transaction/model/CsvTransactionFactoryTest.java b/src/test/java/uk/gov/pay/ledger/transaction/model/CsvTransactionFactoryTest.java index 890865e8f..c4cc79a92 100644 --- a/src/test/java/uk/gov/pay/ledger/transaction/model/CsvTransactionFactoryTest.java +++ b/src/test/java/uk/gov/pay/ledger/transaction/model/CsvTransactionFactoryTest.java @@ -3,14 +3,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.gson.GsonBuilder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import uk.gov.pay.ledger.transaction.entity.TransactionEntity; import uk.gov.pay.ledger.transaction.state.TransactionState; import uk.gov.pay.ledger.util.fixture.TransactionFixture; import java.time.ZonedDateTime; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -25,7 +24,7 @@ public class CsvTransactionFactoryTest { private CsvTransactionFactory csvTransactionFactory; private TransactionFixture transactionFixture; - @Before + @BeforeEach public void setUp() { ObjectMapper objectMapper = new ObjectMapper(); csvTransactionFactory = new CsvTransactionFactory(objectMapper); diff --git a/src/test/java/uk/gov/pay/ledger/transaction/model/TransactionFactoryTest.java b/src/test/java/uk/gov/pay/ledger/transaction/model/TransactionFactoryTest.java index f0dea85fc..3aae35775 100644 --- a/src/test/java/uk/gov/pay/ledger/transaction/model/TransactionFactoryTest.java +++ b/src/test/java/uk/gov/pay/ledger/transaction/model/TransactionFactoryTest.java @@ -2,8 +2,8 @@ import com.google.gson.JsonObject; import io.dropwizard.jackson.Jackson; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; import uk.gov.pay.ledger.transaction.entity.TransactionEntity; import uk.gov.pay.ledger.transaction.state.TransactionState; @@ -12,10 +12,10 @@ import java.util.Optional; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.Matchers.emptyString; public class TransactionFactoryTest { @@ -47,7 +47,7 @@ public class TransactionFactoryTest { private String cardExpiryDate = "10/27"; private String walletType = "APPLE_PAY"; - @Before + @BeforeEach public void setUp() { JsonObject metadata = new JsonObject(); metadata.addProperty("ledger_code", 123); diff --git a/src/test/java/uk/gov/pay/ledger/transaction/resource/TransactionResourceTest.java b/src/test/java/uk/gov/pay/ledger/transaction/resource/TransactionResourceTest.java index dc9b86fcb..c889d4fa5 100644 --- a/src/test/java/uk/gov/pay/ledger/transaction/resource/TransactionResourceTest.java +++ b/src/test/java/uk/gov/pay/ledger/transaction/resource/TransactionResourceTest.java @@ -1,11 +1,11 @@ package uk.gov.pay.ledger.transaction.resource; -import io.dropwizard.testing.junit.ResourceTestRule; +import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; +import io.dropwizard.testing.junit5.ResourceExtension; import org.hamcrest.Matchers; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.pay.ledger.app.LedgerConfig; import uk.gov.pay.ledger.exception.BadRequestExceptionMapper; import uk.gov.pay.ledger.transaction.search.model.TransactionView; @@ -31,14 +31,15 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(DropwizardExtensionsSupport.class) +@ExtendWith(MockitoExtension.class) public class TransactionResourceTest { private static final TransactionService mockTransactionService = mock(TransactionService.class); private static final CsvService mockCsvService = mock(CsvService.class); private static final LedgerConfig mockConfig = mock(LedgerConfig.class); - @ClassRule - public static final ResourceTestRule resources = ResourceTestRule.builder() + + public static final ResourceExtension resources = ResourceExtension.builder() .addResource(new TransactionResource(mockTransactionService, mockCsvService, mockConfig)) .addProvider(BadRequestExceptionMapper.class) .build(); diff --git a/src/test/java/uk/gov/pay/ledger/transaction/search/common/TransactionSearchParamsTest.java b/src/test/java/uk/gov/pay/ledger/transaction/search/common/TransactionSearchParamsTest.java index 0dcfa75e4..675f44ad8 100644 --- a/src/test/java/uk/gov/pay/ledger/transaction/search/common/TransactionSearchParamsTest.java +++ b/src/test/java/uk/gov/pay/ledger/transaction/search/common/TransactionSearchParamsTest.java @@ -1,7 +1,7 @@ package uk.gov.pay.ledger.transaction.search.common; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import uk.gov.pay.ledger.transaction.model.TransactionType; import uk.gov.pay.ledger.util.CommaDelimitedSetParameter; @@ -16,7 +16,7 @@ public class TransactionSearchParamsTest { private TransactionSearchParams transactionSearchParams; - @Before + @BeforeEach public void setUp() { transactionSearchParams = new TransactionSearchParams(); } diff --git a/src/test/java/uk/gov/pay/ledger/transaction/search/common/TransactionSearchParamsValidatorTest.java b/src/test/java/uk/gov/pay/ledger/transaction/search/common/TransactionSearchParamsValidatorTest.java index fdaa5e23f..25b83966e 100644 --- a/src/test/java/uk/gov/pay/ledger/transaction/search/common/TransactionSearchParamsValidatorTest.java +++ b/src/test/java/uk/gov/pay/ledger/transaction/search/common/TransactionSearchParamsValidatorTest.java @@ -1,25 +1,22 @@ package uk.gov.pay.ledger.transaction.search.common; -import junitparams.JUnitParamsRunner; -import junitparams.Parameters; -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.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import uk.gov.pay.ledger.exception.UnparsableDateException; import uk.gov.pay.ledger.exception.ValidationException; import uk.gov.pay.ledger.util.CommaDelimitedSetParameter; -@RunWith(JUnitParamsRunner.class) -public class TransactionSearchParamsValidatorTest { +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; - @Rule - public ExpectedException thrown = ExpectedException.none(); +public class TransactionSearchParamsValidatorTest { TransactionSearchParams searchParams; - @Before + @BeforeEach public void setup() { searchParams = new TransactionSearchParams(); } @@ -27,17 +24,17 @@ public void setup() { @Test public void shouldThrowException_whenInvalidFromDate() { searchParams.setFromDate("wrong-date"); - thrown.expect(UnparsableDateException.class); - thrown.expectMessage("Input from_date (wrong-date) is wrong format"); - TransactionSearchParamsValidator.validateSearchParams(searchParams, null); + UnparsableDateException unparsableDateException = assertThrows(UnparsableDateException.class, + () -> TransactionSearchParamsValidator.validateSearchParams(searchParams, null)); + assertThat(unparsableDateException.getMessage(), is("Input from_date (wrong-date) is wrong format")); } @Test public void shouldThrowException_whenInvalidToDate() { searchParams.setToDate("wrong-date"); - thrown.expect(UnparsableDateException.class); - thrown.expectMessage("Input to_date (wrong-date) is wrong format"); - TransactionSearchParamsValidator.validateSearchParams(searchParams, null); + UnparsableDateException unparsableDateException = assertThrows(UnparsableDateException.class, + () -> TransactionSearchParamsValidator.validateSearchParams(searchParams, null)); + assertThat(unparsableDateException.getMessage(), is("Input to_date (wrong-date) is wrong format")); } @Test @@ -56,9 +53,9 @@ public void shouldNotThrowException_whenGatewayAccountIdAvailableAndWithParentTr @Test public void shouldNotThrowException_whenGatewayAccountIdsAvailableAndWithParentTransactionIsTrue() { searchParams.setWithParentTransaction(true); - thrown.expect(ValidationException.class); - thrown.expectMessage("gateway_account_id is mandatory to search with parent transaction"); - TransactionSearchParamsValidator.validateSearchParams(searchParams, new CommaDelimitedSetParameter("")); + ValidationException validationException = assertThrows(ValidationException.class, + () -> TransactionSearchParamsValidator.validateSearchParams(searchParams, new CommaDelimitedSetParameter(""))); + assertThat(validationException.getMessage(), is("gateway_account_id is mandatory to search with parent transaction")); } @Test @@ -75,25 +72,28 @@ public void validateSearchParamsForCsvShouldNotThrowExceptionForValidParams() { searchParams, new CommaDelimitedSetParameter("1,2")); } - @Test(expected = ValidationException.class) + @Test public void validateSearchParamsForCsvShouldThrowExceptionIfGatewayAccountIsNotAvailable() { - TransactionSearchParamsValidator.validateSearchParamsForCsv( - searchParams, new CommaDelimitedSetParameter("")); + assertThrows(ValidationException.class, () -> TransactionSearchParamsValidator.validateSearchParamsForCsv( + searchParams, null)); + } - TransactionSearchParamsValidator.validateSearchParamsForCsv( - searchParams, null); + @Test + public void validateSearchParamsForCsvShouldThrowExceptionIfGatewayAccountIdsIsEmptyString() { + assertThrows(ValidationException.class, () -> TransactionSearchParamsValidator.validateSearchParamsForCsv( + searchParams, new CommaDelimitedSetParameter(""))); } - @Parameters({ + @ParameterizedTest + @CsvSource({ "wrong-date, 2019-05-01T10:15:30Z", "2019-05-01T10:15:30Z, wrong-date" }) - @Test(expected = UnparsableDateException.class) public void validateSearchParamsForCsvShouldThrowExceptionForInvalidDates(String fromDate, String toDate) { searchParams.setFromDate(fromDate); searchParams.setToDate(toDate); - TransactionSearchParamsValidator.validateSearchParamsForCsv( - searchParams, new CommaDelimitedSetParameter("1")); + assertThrows(UnparsableDateException.class, () -> TransactionSearchParamsValidator.validateSearchParamsForCsv( + searchParams, new CommaDelimitedSetParameter("1"))); } } \ No newline at end of file diff --git a/src/test/java/uk/gov/pay/ledger/transaction/service/AccountIdSupplierManagerTest.java b/src/test/java/uk/gov/pay/ledger/transaction/service/AccountIdSupplierManagerTest.java index 1bd8fdc34..a50198686 100644 --- a/src/test/java/uk/gov/pay/ledger/transaction/service/AccountIdSupplierManagerTest.java +++ b/src/test/java/uk/gov/pay/ledger/transaction/service/AccountIdSupplierManagerTest.java @@ -1,11 +1,9 @@ package uk.gov.pay.ledger.transaction.service; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; +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.exception.ValidationException; import uk.gov.pay.ledger.transaction.search.model.TransactionView; @@ -14,16 +12,16 @@ import java.util.function.Function; import java.util.function.Supplier; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class AccountIdSupplierManagerTest { - @Rule - public ExpectedException thrown = ExpectedException.none(); - @Mock private Function, Optional> supplier; @@ -32,10 +30,10 @@ public class AccountIdSupplierManagerTest { @Test public void givenAccountIdNotProvidedWhenRequiredThrowsAnError() { - thrown.expect(ValidationException.class); - thrown.expectMessage("Field [account_id] cannot be empty"); + ValidationException validationException = assertThrows(ValidationException.class, + () -> setUpAndGet(null, null)); - setUpAndGet(null, null); + assertThat(validationException.getMessage(), is("Field [account_id] cannot be empty")); verify(supplier, never()).apply(any()); verify(privilegedSupplier, never()).get(); diff --git a/src/test/java/uk/gov/pay/ledger/transaction/service/TransactionMetadataServiceTest.java b/src/test/java/uk/gov/pay/ledger/transaction/service/TransactionMetadataServiceTest.java index ee8b46359..76079e6e1 100644 --- a/src/test/java/uk/gov/pay/ledger/transaction/service/TransactionMetadataServiceTest.java +++ b/src/test/java/uk/gov/pay/ledger/transaction/service/TransactionMetadataServiceTest.java @@ -1,9 +1,9 @@ package uk.gov.pay.ledger.transaction.service; -import org.junit.Test; -import org.junit.runner.RunWith; +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.commons.model.Source; import uk.gov.pay.ledger.event.model.Event; import uk.gov.pay.ledger.event.model.ResourceType; @@ -24,7 +24,7 @@ import static uk.gov.pay.ledger.util.fixture.QueuePaymentEventFixture.aQueuePaymentEventFixture; import static uk.gov.pay.ledger.util.fixture.TransactionFixture.aTransactionFixture; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class TransactionMetadataServiceTest { @Mock diff --git a/src/test/java/uk/gov/pay/ledger/transaction/service/TransactionServiceTest.java b/src/test/java/uk/gov/pay/ledger/transaction/service/TransactionServiceTest.java index b0c2f0a9d..735b3d5a5 100644 --- a/src/test/java/uk/gov/pay/ledger/transaction/service/TransactionServiceTest.java +++ b/src/test/java/uk/gov/pay/ledger/transaction/service/TransactionServiceTest.java @@ -2,13 +2,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.dropwizard.jackson.Jackson; -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.event.dao.EventDao; import uk.gov.pay.ledger.event.model.Event; import uk.gov.pay.ledger.event.model.ResourceType; @@ -21,13 +19,13 @@ import uk.gov.pay.ledger.transaction.model.TransactionEventResponse; import uk.gov.pay.ledger.transaction.model.TransactionFactory; import uk.gov.pay.ledger.transaction.model.TransactionSearchResponse; -import uk.gov.pay.ledger.util.CommaDelimitedSetParameter; import uk.gov.pay.ledger.transaction.search.common.TransactionSearchParams; -import uk.gov.pay.ledger.util.pagination.PaginationBuilder; import uk.gov.pay.ledger.transaction.search.model.TransactionView; import uk.gov.pay.ledger.transaction.state.TransactionState; +import uk.gov.pay.ledger.util.CommaDelimitedSetParameter; import uk.gov.pay.ledger.util.fixture.EventFixture; import uk.gov.pay.ledger.util.fixture.TransactionFixture; +import uk.gov.pay.ledger.util.pagination.PaginationBuilder; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.UriBuilder; @@ -42,17 +40,17 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.pay.ledger.util.fixture.TransactionFixture.aTransactionFixture; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class TransactionServiceTest { - @Rule - public ExpectedException thrown = ExpectedException.none(); @Mock private TransactionDao mockTransactionDao; @Mock @@ -64,7 +62,7 @@ public class TransactionServiceTest { private TransactionSearchParams searchParams; private ObjectMapper objectMapper = new ObjectMapper(); - @Before + @BeforeEach public void setUp() { ObjectMapper objectMapper = Jackson.newObjectMapper(); TransactionEntityFactory transactionEntityFactory = new TransactionEntityFactory(objectMapper); @@ -75,8 +73,8 @@ public void setUp() { searchParams = new TransactionSearchParams(); searchParams.setAccountIds(List.of(gatewayAccountId)); - when(mockUriInfo.getBaseUriBuilder()).thenReturn(UriBuilder.fromUri("http://app.com")); - when(mockUriInfo.getPath()).thenReturn("/v1/transaction"); + lenient().when(mockUriInfo.getBaseUriBuilder()).thenReturn(UriBuilder.fromUri("http://app.com")); + lenient().when(mockUriInfo.getPath()).thenReturn("/v1/transaction"); } @Test @@ -166,12 +164,12 @@ public void searchTransactionsWithoutParent_shouldThrowNotFoundException_forInva List transactionViewList = TransactionFixture.aTransactionList(gatewayAccountId, 10); when(mockTransactionDao.searchTransactions(any(TransactionSearchParams.class))).thenReturn(transactionViewList); when(mockTransactionDao.getTotalForSearch(any(TransactionSearchParams.class))).thenReturn(10L); - thrown.expect(WebApplicationException.class); - thrown.expectMessage("the requested page not found"); searchParams.setPageNumber(2L); - transactionService.searchTransactions(searchParams, mockUriInfo); + WebApplicationException webApplicationException = assertThrows(WebApplicationException.class, + () -> transactionService.searchTransactions(searchParams, mockUriInfo)); + assertThat(webApplicationException.getMessage(), is("the requested page not found")); verify(mockTransactionDao).searchTransactions(searchParams); verify(mockTransactionDao).getTotalForSearch(searchParams); @@ -268,10 +266,10 @@ public void findTransactionEvents_shouldThrowWebApplicationExceptionRequestExcep when(mockTransactionDao.findTransactionByExternalOrParentIdAndGatewayAccountId(anyString(), anyString())) .thenReturn(new ArrayList<>()); - thrown.expect(WebApplicationException.class); - thrown.expectMessage("Transaction with id [external-id] not found"); + WebApplicationException webApplicationException = assertThrows(WebApplicationException.class, + () -> transactionService.findTransactionEvents("external-id", gatewayAccountId, false, 1)); - transactionService.findTransactionEvents("external-id", gatewayAccountId, false, 1); + assertThat(webApplicationException.getMessage(), is("Transaction with id [external-id] not found")); } @Test diff --git a/src/test/java/uk/gov/pay/ledger/transactionmetadata/dao/TransactionMetadataDaoIT.java b/src/test/java/uk/gov/pay/ledger/transactionmetadata/dao/TransactionMetadataDaoIT.java index a5292f76d..463fc4931 100644 --- a/src/test/java/uk/gov/pay/ledger/transactionmetadata/dao/TransactionMetadataDaoIT.java +++ b/src/test/java/uk/gov/pay/ledger/transactionmetadata/dao/TransactionMetadataDaoIT.java @@ -2,7 +2,6 @@ import com.google.common.collect.ImmutableMap; import org.hamcrest.MatcherAssert; -import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -127,7 +126,7 @@ public void shouldReturnCorrectMetadataKeysForTransactionSearch() { MatcherAssert.assertThat(transactionEntityList.size(), is(2)); - Assert.assertThat(transactionEntityList, hasItem("test-key-1")); - Assert.assertThat(transactionEntityList, hasItem("test-key-2")); + assertThat(transactionEntityList, hasItem("test-key-1")); + assertThat(transactionEntityList, hasItem("test-key-2")); } } \ No newline at end of file diff --git a/src/test/java/uk/gov/pay/ledger/util/JsonParserTest.java b/src/test/java/uk/gov/pay/ledger/util/JsonParserTest.java index ead2906f1..c1cd34edb 100644 --- a/src/test/java/uk/gov/pay/ledger/util/JsonParserTest.java +++ b/src/test/java/uk/gov/pay/ledger/util/JsonParserTest.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.gson.GsonBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.time.ZonedDateTime; diff --git a/src/test/java/uk/gov/pay/ledger/util/pagination/PaginationBuilderTest.java b/src/test/java/uk/gov/pay/ledger/util/pagination/PaginationBuilderTest.java index 107a25418..dfaf67cf4 100644 --- a/src/test/java/uk/gov/pay/ledger/util/pagination/PaginationBuilderTest.java +++ b/src/test/java/uk/gov/pay/ledger/util/pagination/PaginationBuilderTest.java @@ -1,11 +1,11 @@ package uk.gov.pay.ledger.util.pagination; -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.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.pay.ledger.payout.search.PayoutSearchParams; import uk.gov.pay.ledger.transaction.search.common.TransactionSearchParams; @@ -18,7 +18,7 @@ import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class PaginationBuilderTest { @Mock @@ -28,7 +28,7 @@ public class PaginationBuilderTest { PayoutSearchParams payoutSearchParams; private final String gatewayAccountExternalId = "a-gateway-account-external-id"; - @Before + @BeforeEach public void setUp() throws URISyntaxException { URI uri = new URI("http://example.org"); Mockito.when(mockedUriInfo.getBaseUriBuilder()).thenReturn(UriBuilder.fromUri(uri), UriBuilder.fromUri(uri));