1 files changed, 143 insertions, 145 deletions
diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoCommonUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoCommonUtilsTest.java
index dbce712cb0..5cf7c86522 100644
--- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoCommonUtilsTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoCommonUtilsTest.java
@@ -27,10 +27,8 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
-
 import java.io.File;
 import java.io.IOException;
-
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -42,7 +40,6 @@ import org.onap.so.openstack.exceptions.MsoIOException;
 import org.onap.so.openstack.exceptions.MsoOpenstackException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -59,149 +56,150 @@ import com.woorea.openstack.quantum.model.NeutronError;
  * This class implements test methods of the MsoCommonUtils
  */
 public class MsoCommonUtilsTest extends BaseTest {
-	@Autowired
-	@Qualifier("CommonUtils")
-	private MsoCommonUtils commonUtils;
-	
-	@Mock
-	private OpenStackRequest openstackRequest;
-		
-	@Test
+    @Autowired
+    @Qualifier("CommonUtils")
+    private MsoCommonUtils commonUtils;
+
+    @Mock
+    private OpenStackRequest openstackRequest;
+
+    @Test
     public final void testExecuteAndRecordOpenstackRequest() {
-		Mockito.when(openstackRequest.endpoint()).thenReturn("localhost");
-		Mockito.when(openstackRequest.path()).thenReturn("/test");
-		//TODO:Must try a real connection
-		assertNull(commonUtils.executeAndRecordOpenstackRequest (openstackRequest));
-	}
-	
-	@Test
-	public void testexecuteAndRecordOpenstackRequestResponseException() {
-		expectedException.expect(OpenStackResponseException.class);
-		
-		doThrow(OpenStackResponseException.class).when(openstackRequest).execute();
-		
-		commonUtils.executeAndRecordOpenstackRequest(openstackRequest);
-	}
-	
-	@Test
-	public void testexecuteAndRecordOpenstackRequestConnectException() {
-		expectedException.expect(OpenStackConnectException.class);
-		
-		doThrow(OpenStackConnectException.class).when(openstackRequest).execute();
-		
-		commonUtils.executeAndRecordOpenstackRequest(openstackRequest);
-	}
-
-	@Test
+        Mockito.when(openstackRequest.endpoint()).thenReturn("localhost");
+        Mockito.when(openstackRequest.path()).thenReturn("/test");
+        // TODO:Must try a real connection
+        assertNull(commonUtils.executeAndRecordOpenstackRequest(openstackRequest));
+    }
+
+    @Test
+    public void testexecuteAndRecordOpenstackRequestResponseException() {
+        expectedException.expect(OpenStackResponseException.class);
+
+        doThrow(OpenStackResponseException.class).when(openstackRequest).execute();
+
+        commonUtils.executeAndRecordOpenstackRequest(openstackRequest);
+    }
+
+    @Test
+    public void testexecuteAndRecordOpenstackRequestConnectException() {
+        expectedException.expect(OpenStackConnectException.class);
+
+        doThrow(OpenStackConnectException.class).when(openstackRequest).execute();
+
+        commonUtils.executeAndRecordOpenstackRequest(openstackRequest);
+    }
+
+    @Test
     public final void testKeystoneErrorToMsoException() throws JsonParseException, JsonMappingException, IOException {
-		OpenStackBaseException openStackConnectException = new OpenStackConnectException("connect");
-
-		OpenStackBaseException openStackResponseException = new OpenStackResponseException("response",1);
-
-		MsoException me = commonUtils.keystoneErrorToMsoException(openStackConnectException,"ContextError");
-
-		assertTrue(me instanceof MsoIOException);
-		assertTrue("connect".equals(me.getMessage()));
-
-
-		MsoException me2 = commonUtils.keystoneErrorToMsoException(openStackResponseException,"ContextError");
-		assertTrue(me2 instanceof MsoOpenstackException);
-		assertTrue("ContextError".equals(me2.getContext()));
-		assertTrue(MsoExceptionCategory.OPENSTACK.equals(me2.getCategory()));
-		
-		
-		OpenStackResponse openStackResponse = Mockito.mock(OpenStackResponse.class);
-		Error error = mapper.readValue(new File(RESOURCE_PATH + "Error.json"), Error.class);
-		
-		doReturn(error).when(openStackResponse).getErrorEntity(eq(Error.class));
-		
-		openStackResponseException = new OpenStackResponseException("response", 501, openStackResponse);
-		
-		MsoException me3 = commonUtils.keystoneErrorToMsoException(openStackResponseException,"ContextError");
-		
-		assertTrue(me3 instanceof MsoOpenstackException);
-		assertEquals("1 title: message", me3.toString());
-	}
-
-	@Test
-	public final void testHeatExceptionToMsoException() throws JsonParseException, JsonMappingException, IOException {
-		OpenStackBaseException openStackConnectException = new OpenStackConnectException("connect");
-
-		OpenStackBaseException openStackResponseException = new OpenStackResponseException("response",1);
-
-		MsoException me = commonUtils.heatExceptionToMsoException(openStackConnectException,"ContextError");
-
-		assertTrue(me instanceof MsoIOException);
-		assertTrue("connect".equals(me.getMessage()));
-
-
-		MsoException me2 = commonUtils.heatExceptionToMsoException(openStackResponseException,"ContextError");
-		assertTrue(me2 instanceof MsoOpenstackException);
-		assertTrue("ContextError".equals(me2.getContext()));
-		assertTrue(MsoExceptionCategory.OPENSTACK.equals(me2.getCategory()));
-		
-		
-		OpenStackResponse openStackResponse = Mockito.mock(OpenStackResponse.class);
-		Explanation explanation = mapper.readValue(new File(RESOURCE_PATH + "Explanation.json"), Explanation.class);
-		
-		doReturn(explanation).when(openStackResponse).getErrorEntity(eq(Explanation.class));
-		
-		openStackResponseException = new OpenStackResponseException("response", 501, openStackResponse);
-		
-		MsoException me3 = commonUtils.heatExceptionToMsoException(openStackResponseException,"ContextError");
-		
-		assertTrue(me3 instanceof MsoOpenstackException);
-		assertEquals("1 title: explanation, error.type=null, error.message=null", me3.toString());
-	}
-
-	@Test
-	public final void testNeutronExceptionToMsoException() throws JsonParseException, JsonMappingException, IOException {
-		OpenStackBaseException openStackConnectException = new OpenStackConnectException("connect");
-
-		OpenStackBaseException openStackResponseException = new OpenStackResponseException("response",1);
-
-		MsoException me = commonUtils.neutronExceptionToMsoException(openStackConnectException,"ContextError");
-
-		assertTrue(me instanceof MsoIOException);
-		assertTrue("connect".equals(me.getMessage()));
-
-		MsoException me2 = commonUtils.neutronExceptionToMsoException(openStackResponseException,"ContextError");
-		assertTrue(me2 instanceof MsoOpenstackException);
-		assertTrue("ContextError".equals(me2.getContext()));
-		assertTrue(MsoExceptionCategory.OPENSTACK.equals(me2.getCategory()));
-		
-		
-		OpenStackResponse openStackResponse = Mockito.mock(OpenStackResponse.class);
-		NeutronError explanation = mapper.readValue(new File(RESOURCE_PATH + "NeutronError.json"), NeutronError.class);
-		
-		doReturn(explanation).when(openStackResponse).getErrorEntity(eq(NeutronError.class));
-		
-		openStackResponseException = new OpenStackResponseException("response", 501, openStackResponse);
-		
-		MsoException me3 = commonUtils.neutronExceptionToMsoException(openStackResponseException,"ContextError");
-		
-		assertTrue(me3 instanceof MsoOpenstackException);
-		assertEquals("501 type: message", me3.toString());
-	}
-
-	@Test
-	public final void testRuntimeExceptionToMsoException() {
-	    RuntimeException re = new RuntimeException("runtime");
-	    MsoException me = commonUtils.runtimeExceptionToMsoException(re, "ContextError");
-
-	    assertTrue(me instanceof MsoAdapterException);
-	    assertTrue("ContextError".equals(me.getContext()));
+        OpenStackBaseException openStackConnectException = new OpenStackConnectException("connect");
+
+        OpenStackBaseException openStackResponseException = new OpenStackResponseException("response", 1);
+
+        MsoException me = commonUtils.keystoneErrorToMsoException(openStackConnectException, "ContextError");
+
+        assertTrue(me instanceof MsoIOException);
+        assertTrue("connect".equals(me.getMessage()));
+
+
+        MsoException me2 = commonUtils.keystoneErrorToMsoException(openStackResponseException, "ContextError");
+        assertTrue(me2 instanceof MsoOpenstackException);
+        assertTrue("ContextError".equals(me2.getContext()));
+        assertTrue(MsoExceptionCategory.OPENSTACK.equals(me2.getCategory()));
+
+
+        OpenStackResponse openStackResponse = Mockito.mock(OpenStackResponse.class);
+        Error error = mapper.readValue(new File(RESOURCE_PATH + "Error.json"), Error.class);
+
+        doReturn(error).when(openStackResponse).getErrorEntity(eq(Error.class));
+
+        openStackResponseException = new OpenStackResponseException("response", 501, openStackResponse);
+
+        MsoException me3 = commonUtils.keystoneErrorToMsoException(openStackResponseException, "ContextError");
+
+        assertTrue(me3 instanceof MsoOpenstackException);
+        assertEquals("1 title: message", me3.toString());
+    }
+
+    @Test
+    public final void testHeatExceptionToMsoException() throws JsonParseException, JsonMappingException, IOException {
+        OpenStackBaseException openStackConnectException = new OpenStackConnectException("connect");
+
+        OpenStackBaseException openStackResponseException = new OpenStackResponseException("response", 1);
+
+        MsoException me = commonUtils.heatExceptionToMsoException(openStackConnectException, "ContextError");
+
+        assertTrue(me instanceof MsoIOException);
+        assertTrue("connect".equals(me.getMessage()));
+
+
+        MsoException me2 = commonUtils.heatExceptionToMsoException(openStackResponseException, "ContextError");
+        assertTrue(me2 instanceof MsoOpenstackException);
+        assertTrue("ContextError".equals(me2.getContext()));
+        assertTrue(MsoExceptionCategory.OPENSTACK.equals(me2.getCategory()));
+
+
+        OpenStackResponse openStackResponse = Mockito.mock(OpenStackResponse.class);
+        Explanation explanation = mapper.readValue(new File(RESOURCE_PATH + "Explanation.json"), Explanation.class);
+
+        doReturn(explanation).when(openStackResponse).getErrorEntity(eq(Explanation.class));
+
+        openStackResponseException = new OpenStackResponseException("response", 501, openStackResponse);
+
+        MsoException me3 = commonUtils.heatExceptionToMsoException(openStackResponseException, "ContextError");
+
+        assertTrue(me3 instanceof MsoOpenstackException);
+        assertEquals("1 title: explanation, error.type=null, error.message=null", me3.toString());
+    }
+
+    @Test
+    public final void testNeutronExceptionToMsoException()
+            throws JsonParseException, JsonMappingException, IOException {
+        OpenStackBaseException openStackConnectException = new OpenStackConnectException("connect");
+
+        OpenStackBaseException openStackResponseException = new OpenStackResponseException("response", 1);
+
+        MsoException me = commonUtils.neutronExceptionToMsoException(openStackConnectException, "ContextError");
+
+        assertTrue(me instanceof MsoIOException);
+        assertTrue("connect".equals(me.getMessage()));
+
+        MsoException me2 = commonUtils.neutronExceptionToMsoException(openStackResponseException, "ContextError");
+        assertTrue(me2 instanceof MsoOpenstackException);
+        assertTrue("ContextError".equals(me2.getContext()));
+        assertTrue(MsoExceptionCategory.OPENSTACK.equals(me2.getCategory()));
+
+
+        OpenStackResponse openStackResponse = Mockito.mock(OpenStackResponse.class);
+        NeutronError explanation = mapper.readValue(new File(RESOURCE_PATH + "NeutronError.json"), NeutronError.class);
+
+        doReturn(explanation).when(openStackResponse).getErrorEntity(eq(NeutronError.class));
+
+        openStackResponseException = new OpenStackResponseException("response", 501, openStackResponse);
+
+        MsoException me3 = commonUtils.neutronExceptionToMsoException(openStackResponseException, "ContextError");
+
+        assertTrue(me3 instanceof MsoOpenstackException);
+        assertEquals("501 type: message", me3.toString());
+    }
+
+    @Test
+    public final void testRuntimeExceptionToMsoException() {
+        RuntimeException re = new RuntimeException("runtime");
+        MsoException me = commonUtils.runtimeExceptionToMsoException(re, "ContextError");
+
+        assertTrue(me instanceof MsoAdapterException);
+        assertTrue("ContextError".equals(me.getContext()));
         assertTrue(MsoExceptionCategory.INTERNAL.equals(me.getCategory()));
-	}
-	
-	@Test
-	public void testIoExceptionToMsoException() {
-		IOException exception = new IOException("IOExceptionTestMessage");
-		
-		MsoException msoException = commonUtils.ioExceptionToMsoException(exception, "ContextError");
-		
-		assertTrue(msoException instanceof MsoAdapterException);
-		assertEquals("ContextError", msoException.getContext());
-		assertTrue(MsoExceptionCategory.INTERNAL.equals(msoException.getCategory()));
-	}
+    }
+
+    @Test
+    public void testIoExceptionToMsoException() {
+        IOException exception = new IOException("IOExceptionTestMessage");
+
+        MsoException msoException = commonUtils.ioExceptionToMsoException(exception, "ContextError");
+
+        assertTrue(msoException instanceof MsoAdapterException);
+        assertEquals("ContextError", msoException.getContext());
+        assertTrue(MsoExceptionCategory.INTERNAL.equals(msoException.getCategory()));
+    }
 }