LASB-2748: Migrated test to use JUnit 5.

ministryofjustice · Dec 6, 2023 · cff819b · cff819b
1 parent 8451814
commit cff819b
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 32 deletions.
diff --git a/src/test/java/com/laa/nolasa/laanolasa/builder/InfoxSearchResultBuilderTest.java b/src/test/java/com/laa/nolasa/laanolasa/builder/InfoxSearchResultBuilderTest.java
@@ -1,21 +1,20 @@
 package com.laa.nolasa.laanolasa.builder;
 
 import com.laa.nolasa.laanolasa.common.InfoxStatus;
-import com.laa.nolasa.laanolasa.common.ReconciliationResult;
 import com.laa.nolasa.laanolasa.dto.InfoXSearchResult;
 import com.laa.nolasa.laanolasa.dto.InfoXSearchStatus;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import uk.gov.justice._2013._11.magistrates.*;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class InfoxSearchResultBuilderTest {
 
 
     private InfoxSearchResultBuilder infoxSearchResultBuilder;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         infoxSearchResultBuilder = new InfoxSearchResultBuilder();
     }

diff --git a/src/test/java/com/laa/nolasa/laanolasa/builder/LibraSearchRequestBuilderTest.java b/src/test/java/com/laa/nolasa/laanolasa/builder/LibraSearchRequestBuilderTest.java
@@ -4,21 +4,21 @@
 import com.laa.nolasa.laanolasa.entity.MagistrateCourts;
 import com.laa.nolasa.laanolasa.entity.Nol;
 import com.laa.nolasa.laanolasa.entity.RepOrders;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import uk.gov.justice._2013._11.magistrates.LibraSearchRequest;
 
 import javax.xml.datatype.DatatypeConfigurationException;
 import java.time.LocalDateTime;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class LibraSearchRequestBuilderTest {
 
 
     private LibraSearchRequestBuilder libraSearchRequestBuilder;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         libraSearchRequestBuilder = new LibraSearchRequestBuilder();
     }

diff --git a/src/test/java/com/laa/nolasa/laanolasa/scheduler/OncePerDaySchedulerTest.java b/src/test/java/com/laa/nolasa/laanolasa/scheduler/OncePerDaySchedulerTest.java
@@ -9,23 +9,23 @@
 import com.laa.nolasa.laanolasa.service.InfoXServiceClient;
 import com.laa.nolasa.laanolasa.service.ReconciliationService;
 import com.laa.nolasa.laanolasa.util.MetricHandler;
-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 java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.LongStream;
 
+import static com.laa.nolasa.laanolasa.common.NolStatus.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
-import static com.laa.nolasa.laanolasa.common.NolStatus.*;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class OncePerDaySchedulerTest {
 
     @Mock
@@ -39,8 +39,8 @@ public class OncePerDaySchedulerTest {
 
     private OncePerDayScheduler oncePerDayScheduler;
 
-    @Before
-    public void setUp()  {
+    @BeforeEach
+    public void setUp() {
 
         ReconciliationService reconciliationService = new ReconciliationService(nolRepository, infoXServiceClient, metricHandler);
         oncePerDayScheduler = new OncePerDayScheduler(reconciliationService);

diff --git a/src/test/java/com/laa/nolasa/laanolasa/service/InfoXServiceClientTest.java b/src/test/java/com/laa/nolasa/laanolasa/service/InfoXServiceClientTest.java
@@ -6,23 +6,23 @@
 import com.laa.nolasa.laanolasa.dto.InfoXSearchStatus;
 import com.laa.nolasa.laanolasa.entity.Nol;
 import com.laa.nolasa.laanolasa.util.MetricHandler;
-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.justice._2013._11.magistrates.LIBRAServicePortType;
 import uk.gov.justice._2013._11.magistrates.LibraSearchRequest;
 import uk.gov.justice._2013._11.magistrates.LibraSearchResponse;
 
 import javax.xml.datatype.DatatypeConfigurationException;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.junit.Assert.*;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class InfoXServiceClientTest {
 
     @Mock
@@ -39,7 +39,7 @@ public class InfoXServiceClientTest {
 
     private InfoXServiceClient infoXServiceClient;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         infoXServiceClient = new InfoXServiceClient(libraSearchRequestBuilder, infoxSearchResultBuilder, infoxProxy, metricHandler);
     }

diff --git a/src/test/java/com/laa/nolasa/laanolasa/service/ReconciliationServiceTest.java b/src/test/java/com/laa/nolasa/laanolasa/service/ReconciliationServiceTest.java
@@ -8,11 +8,11 @@
 import com.laa.nolasa.laanolasa.entity.RepOrders;
 import com.laa.nolasa.laanolasa.repository.NolRepository;
 import com.laa.nolasa.laanolasa.util.MetricHandler;
-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 org.springframework.test.util.ReflectionTestUtils;
 
 import java.util.ArrayList;
@@ -21,12 +21,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.LongStream;
 
-import static org.junit.Assert.assertEquals;
+import static com.laa.nolasa.laanolasa.common.NolStatus.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
-import static com.laa.nolasa.laanolasa.common.NolStatus.*;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ReconciliationServiceTest {
 
     @Mock
@@ -40,7 +40,7 @@ public class ReconciliationServiceTest {
 
     private ReconciliationService reconciliationService;
 
-    @Before
+    @BeforeEach
     public void setUp()  {
         reconciliationService = new ReconciliationService(nolRepository, infoXServiceClient, metricHandler);
     }