Springboot 2.0 upgrade

[so.git] / bpmn / MSOCommonBPMN / src / test / java / org / onap / so / client / ResponseExceptionMapperImplTest.java

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/ResponseExceptionMapperImplTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/ResponseExceptionMapperImplTest.java
index c8e1266..2df4b0b 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/ResponseExceptionMapperImplTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/ResponseExceptionMapperImplTest.java
@@ -20,8 +20,6 @@
 
 package org.onap.so.client;
 
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -41,59 +39,67 @@ import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.onap.so.BaseTest;
+
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
 
 @RunWith(JUnitParamsRunner.class)
 public class ResponseExceptionMapperImplTest{
 
-    private static final ResponseExceptionMapperImpl mapper = new ResponseExceptionMapperImpl();
+       private static final ResponseExceptionMapperImpl mapper = new ResponseExceptionMapperImpl();
 
-    public static Object[][] statusesAndCorrespondingExceptions() {
-        return new Object[][]{
-                {Status.BAD_REQUEST, BadRequestException.class},
-                {Status.UNAUTHORIZED, NotAuthorizedException.class},
-                {Status.FORBIDDEN, ForbiddenException.class},
-                {Status.NOT_FOUND, NotFoundException.class},
-                {Status.METHOD_NOT_ALLOWED, NotAllowedException.class},
-                {Status.NOT_ACCEPTABLE, NotAcceptableException.class},
-                {Status.PRECONDITION_FAILED, PreconditionFailedException.class},
-                {Status.UNSUPPORTED_MEDIA_TYPE, NotSupportedException.class},
-                {Status.INTERNAL_SERVER_ERROR, InternalServerErrorException.class},
-                {Status.SERVICE_UNAVAILABLE, WebApplicationException.class},
-                {Status.BAD_GATEWAY, WebApplicationException.class},
-        };
-    }
+       public static Object[][] statusesAndCorrespondingExceptions() {
+               return new Object[][]{
+                       {Status.BAD_REQUEST, BadRequestException.class},
+                       {Status.UNAUTHORIZED, NotAuthorizedException.class},
+                       {Status.FORBIDDEN, ForbiddenException.class},
+                       {Status.NOT_FOUND, NotFoundException.class},
+                       {Status.METHOD_NOT_ALLOWED, NotAllowedException.class},
+                       {Status.NOT_ACCEPTABLE, NotAcceptableException.class},
+                       {Status.PRECONDITION_FAILED, PreconditionFailedException.class},
+                       {Status.UNSUPPORTED_MEDIA_TYPE, NotSupportedException.class},
+                       {Status.INTERNAL_SERVER_ERROR, InternalServerErrorException.class},
+                       {Status.SERVICE_UNAVAILABLE, WebApplicationException.class},
+                       {Status.BAD_GATEWAY, WebApplicationException.class},
+               };
+       }
 
-    @Test
-    @Parameters(method = "statusesAndCorrespondingExceptions")
-    public void shouldThrowExceptionWhenStatusIsNotOk(Status status, Class<Exception> expectedException) {
-        // given
-       Response response = createMockResponse(status);
-        // when, then
-        assertThatThrownBy(() -> mapper.map(response)).isInstanceOf(expectedException);
-    }
+       @Rule
+       public ExpectedException expectedExceptionTest = ExpectedException.none();
 
-    @Test
-    public void shouldNotThrowExceptionWhenStatusIsOk() {
-        // given
-       Response response = createMockResponse(Status.OK);
-        // when, then
-        assertThatCode(() -> mapper.map(response)).doesNotThrowAnyException();
-    }
+       @Test
+       @Parameters(method = "statusesAndCorrespondingExceptions")
+       public void shouldThrowExceptionWhenStatusIsNotOk(Status status, Class<Exception> expectedException) {
+               // given
+               Response response = createMockResponse(status);
+               // when, then
+               expectedExceptionTest.expect(expectedException);
+               mapper.map(response);
+       }  
 
+       @Test
+       public void shouldNotThrowExceptionWhenStatusIsOk() {
+               // given
+               Response response = createMockResponse(Status.OK);
+               // when, then
+               expectedExceptionTest.none();
+               mapper.map(response);      
+       }
+       
     @Test
     public void shouldThrowExceptionWithCustomMessageWhenResponseHasEntity() throws UnsupportedEncodingException {
         // given
        Response response = createMockResponse(Status.BAD_REQUEST);
         when(response.hasEntity()).thenReturn(true);
         when(response.getEntity()).thenReturn(new ByteArrayInputStream("test message".getBytes(StandardCharsets.UTF_8)));
-        // when, then
-        assertThatThrownBy(() -> mapper.map(response)).isInstanceOf(BadRequestException.class)
-                .hasMessage("test message");
+        
+        expectedExceptionTest.expect(BadRequestException.class);
+        expectedExceptionTest.expectMessage("test message");
+        mapper.map(response);      
     }
 
     @Test
@@ -102,14 +108,15 @@ public class ResponseExceptionMapperImplTest{
        Response response = createMockResponse(Status.BAD_REQUEST);
         when(response.hasEntity()).thenReturn(false);
         // when, then
-        assertThatThrownBy(() -> mapper.map(response)).isInstanceOf(BadRequestException.class)
-                .hasMessage("empty message");
-    }
-
-    private static Response createMockResponse(Status status) {
-       Response responseContext = mock(Response.class);
-        when(responseContext.getStatusInfo()).thenReturn(status);
-        when(responseContext.getStatus()).thenReturn(status.getStatusCode());
-        return responseContext;
+        expectedExceptionTest.expect(BadRequestException.class);
+        expectedExceptionTest.expectMessage("");
+        mapper.map(response);      
     }
+       
+       private static Response createMockResponse(Status status) {
+               Response responseContext = mock(Response.class);
+               when(responseContext.getStatusInfo()).thenReturn(status);
+               when(responseContext.getStatus()).thenReturn(status.getStatusCode());
+               return responseContext;
+       }
 }
\ No newline at end of file