OfferTransactionService [Sai Boppudi] Junit4-Junit5 migration

src/test/java/com/nisum/offertransactionservice/client/ClientServiceTest.java

@@ -5,15 +5,14 @@ import com.nisum.offertransactionservice.config.OfferTransactionConfig;
 import com.nisum.offertransactionservice.dto.Item;
 import com.nisum.offertransactionservice.dto.PERequest;
 import com.nisum.offertransactionservice.dto.PEResponse;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
@@ -21,7 +20,6 @@ import reactor.core.publisher.Mono;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -32,7 +30,7 @@ public class ClientServiceTest {
     WebTestClient webTestClient;
 
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
     }
@@ -74,7 +72,7 @@ public class ClientServiceTest {
         when(requestHeadersMock.retrieve()).thenReturn(responseMock);
         when(responseMock.bodyToMono(String.class)).thenReturn(Mono.just(uuid));
         Mono<String> stringMono = clientService.getStringMono(uuid);
-        Assert.assertNotNull(stringMono);
+        Assertions.assertNotNull(stringMono);
     }
 
 

src/test/java/com/nisum/offertransactionservice/controller/AbstractTestBase.java

 package com.nisum.offertransactionservice.controller;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,12 +12,12 @@ public abstract class AbstractTestBase {
     protected final static int HTTP_ENDPOINT_PORT = 9090;
     protected static WireMockServer mWireMockServer = new WireMockServer(HTTP_ENDPOINT_PORT);
 
-    @BeforeClass
+    @BeforeAll
     public static  void setup() {
         mWireMockServer.start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         /* Stop the WireMock server. */
         mWireMockServer.stop();

src/test/java/com/nisum/offertransactionservice/controller/OfferControllerTest.java

 package com.nisum.offertransactionservice.controller;
 
 import com.nisum.offertransactionservice.dto.*;
-import com.nisum.offertransactionservice.model.*;
+import com.nisum.offertransactionservice.model.OfferLookup;
 import com.nisum.offertransactionservice.service.EndOfSaleService;
 import com.nisum.offertransactionservice.service.EndOfTransactionService;
 import com.nisum.offertransactionservice.service.OfferCallingPEService;
-import org.junit.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.*;
-import org.mockito.junit.MockitoJUnitRunner;
-
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -20,7 +18,7 @@ import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class OfferControllerTest {
 
     @InjectMocks
@@ -35,7 +33,7 @@ public class OfferControllerTest {
     @Mock
     private EndOfSaleService endOfSaleService;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
     }
@@ -46,21 +44,21 @@ public class OfferControllerTest {
         //Mockito.when(offerTransactionController.getOfferTransactionResponse(offerTransactionRequest)).thenReturn(retOfferTransRes());
         Mockito.when(offerCallingPEService.getDiscountedItemList(offerTransactionRequest)).thenReturn(retOfferTransRes());
         OfferTransactionResponse offerTransactionResponse = offerTransactionController.getOfferTransactionResponse(offerTransactionRequest);
-        Assert.assertNotNull(offerTransactionResponse);
+        Assertions.assertNotNull(offerTransactionResponse);
     }
 
     @Test
     public void endOfSaleTest() throws IOException {
         Mockito.when(endOfSaleService.putEndofSaleResInDb(getEndOfSaleReq())).thenReturn(UUID.randomUUID().toString());
         EndOfSaleResponse response = offerTransactionController.endOfSale(getEndOfSaleReq());
-        Assert.assertNotNull(response);
+        Assertions.assertNotNull(response);
     }
 
     @Test
     public void endOfTransactionTest() {
         Mockito.when(endOfTransactionService.endOfTransaction(ArgumentMatchers.anyString())).thenReturn("End Of Transaction note from Store Producer");
         String res = offerTransactionController.endOfTransaction(UUID.randomUUID().toString());
-        Assert.assertEquals( "End Of Transaction note from Store Producer",res);
+        Assertions.assertEquals( "End Of Transaction note from Store Producer",res);
     }
 
     private EndOfSaleReq getEndOfSaleReq() {

src/test/java/com/nisum/offertransactionservice/controller/OfferTransactionControllerIntegrationTest.java

@@ -3,10 +3,10 @@ package com.nisum.offertransactionservice.controller;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import com.nisum.offertransactionservice.dto.*;
 import com.nisum.offertransactionservice.model.OfferLookup;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
@@ -15,7 +15,6 @@ import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.ActiveProfiles;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -29,14 +28,14 @@ import static com.github.tomakehurst.wiremock.client.WireMock.*;
 @AutoConfigureWireMock
 public class OfferTransactionControllerIntegrationTest extends AbstractTestBase{
 
-    @Rule
+    @RegisterExtension
     public WireMockRule wireMockRule = new WireMockRule(7072);
 
     @Autowired
     private TestRestTemplate testRestTemplate;
 
 
-    @Before
+    @BeforeEach
     public void setUp() {
         mockForOfferTransactionCall();
         mockForEndOfSale();
@@ -80,7 +79,7 @@ public class OfferTransactionControllerIntegrationTest extends AbstractTestBase{
         );
         OfferTransactionResponse offerTransactionResponse = responseEntity.getBody();
         System.out.println(offerTransactionResponse);
-        Assert.assertNotNull(offerTransactionResponse.getTransactionId());
+        Assertions.assertNotNull(offerTransactionResponse.getTransactionId());
 
     }
 
@@ -93,7 +92,7 @@ public class OfferTransactionControllerIntegrationTest extends AbstractTestBase{
                 new ParameterizedTypeReference<EndOfSaleResponse>(){}
         );
         EndOfSaleResponse endOfSaleResponse = responseEntity.getBody();
-        Assert.assertNotNull(endOfSaleResponse.getUuId());
+        Assertions.assertNotNull(endOfSaleResponse.getUuId());
 
     }
 
@@ -107,7 +106,7 @@ public class OfferTransactionControllerIntegrationTest extends AbstractTestBase{
                 new ParameterizedTypeReference<String>(){}
         );
         String endOfTransactionRes = responseEntity.getBody();
-        Assert.assertNotNull(endOfTransactionRes);
+        Assertions.assertNotNull(endOfTransactionRes);
 
     }
 

src/test/java/com/nisum/offertransactionservice/controller/OfferTransactionControllerTest.java

@@ -10,6 +10,8 @@ import com.nisum.offertransactionservice.model.OfferLookup;
 import com.nisum.offertransactionservice.model.OfferMeta;
 import com.nisum.offertransactionservice.service.OfferCallingPEService;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
@@ -23,7 +25,7 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.*;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
 
 @SpringBootTest
@@ -49,7 +51,7 @@ class OfferTransactionControllerTest {
 
     private String TRANSACTION_ID_FOR_END_OF_SALE = "tx01";
 
-    private String UU_ID_FOR_END_OF_TRANSACTION = "id01";
+    private final String UU_ID_FOR_END_OF_TRANSACTION = "id01";
 
     private String DISCOUNT_DESC = "10 percent";
 
@@ -76,10 +78,11 @@ class OfferTransactionControllerTest {
         }
 
     @Description("Component test for endOfTransaction method")
-    @Test
-    void endOfTransaction() {
+    @ParameterizedTest
+    @ValueSource(strings = {UU_ID_FOR_END_OF_TRANSACTION})
+    void endOfTransaction(String uuId) {
         when(clientService.getStringMono(Mockito.anyString())).thenReturn(getMonoOfString());
-        assertEquals(true,Objects.nonNull(offerTransactionController.endOfTransaction(UU_ID_FOR_END_OF_TRANSACTION)));
+        assertEquals(true,Objects.nonNull(offerTransactionController.endOfTransaction(uuId)));
     }
 
     private List<OfferLookup> getOffers() {

src/test/java/com/nisum/offertransactionservice/service/EndOfSaleTest.java

@@ -4,28 +4,17 @@ import com.nisum.offertransactionservice.dao.EndOfSaleRepo;
 import com.nisum.offertransactionservice.dto.EndOfSaleReq;
 import com.nisum.offertransactionservice.dto.Item;
 import com.nisum.offertransactionservice.dto.OfferTransactionResponse;
-import com.nisum.offertransactionservice.model.*;
-import org.junit.Before;
-import org.junit.jupiter.api.Assertions;
+import com.nisum.offertransactionservice.model.OfferLookup;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.runner.RunWith;
 import org.mockito.*;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.junit4.SpringRunner;
-
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 

src/test/java/com/nisum/offertransactionservice/service/EndOfTransactionTest.java

@@ -2,22 +2,19 @@ package com.nisum.offertransactionservice.service;
 
 import com.nisum.offertransactionservice.client.ClientService;
 import com.nisum.offertransactionservice.genericexception.GlobalApiGenericException;
-
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.NullSource;
 import org.junit.jupiter.params.provider.ValueSource;
-
 import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import reactor.core.publisher.Mono;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.when;
 
 public class EndOfTransactionTest {

src/test/java/com/nisum/offertransactionservice/service/OfferServiceTest.java

@@ -17,6 +17,7 @@ import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -24,6 +25,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.doReturn;