Merge "fix major sonar bug"

[so.git] / common / src / test / java / org / onap / so / client / aai / AAISingleTransactionClientTest.java

diff --git a/common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java b/common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java
index 8c42686..d875f38 100644 (file)
--- a/common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java
+++ b/common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java
@@ -23,7 +23,7 @@ package org.onap.so.client.aai;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -35,8 +35,13 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Optional;
 
+import org.json.JSONException;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.aai.domain.yang.Pserver;
 import org.onap.aai.domain.yang.v9.Complex;
 import org.onap.so.client.aai.entities.singletransaction.SingleTransactionRequest;
@@ -44,6 +49,7 @@ import org.onap.so.client.aai.entities.singletransaction.SingleTransactionRespon
 import org.onap.so.client.aai.entities.uri.AAIResourceUri;
 import org.onap.so.client.aai.entities.uri.AAIUriFactory;
 import org.onap.so.client.defaultproperties.DefaultAAIPropertiesImpl;
+import org.onap.so.client.graphinventory.GraphInventoryPatchConverter;
 import org.skyscreamer.jsonassert.JSONAssert;
 
 import com.fasterxml.jackson.core.JsonParseException;
@@ -51,6 +57,7 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
+@RunWith(MockitoJUnitRunner.class)
 public class AAISingleTransactionClientTest {
 
        private final static String AAI_JSON_FILE_LOCATION = "src/test/resources/__files/aai/singletransaction/";
@@ -59,6 +66,10 @@ public class AAISingleTransactionClientTest {
        
        ObjectMapper mapper;
        
+       public AAIClient client = new AAIClient();
+       
+       public AAIResourcesClient aaiClient = new AAIResourcesClient();
+       
        @Before
        public void before() throws JsonParseException, JsonMappingException, IOException {
                mapper = new AAICommonObjectMapperProvider().getMapper();
@@ -66,8 +77,7 @@ public class AAISingleTransactionClientTest {
        }
        
        @Test
-       public void testRequest() throws IOException {
-               AAIResourcesClient client = createClient();
+       public void testRequest() throws JSONException,IOException {
                Pserver pserver = new Pserver();
                pserver.setHostname("pserver-hostname");
                pserver.setFqdn("pserver-bulk-process-single-transactions-multiple-actions-1-fqdn");
@@ -76,7 +86,7 @@ public class AAISingleTransactionClientTest {
                Complex complex = new Complex();
                complex.setCity("my-city");
                AAISingleTransactionClient singleTransaction = 
-               client.beginSingleTransaction()
+               aaiClient.beginSingleTransaction()
                        .create(uriA, pserver)
                        .update(uriA, pserver2)
                        .create(uriB, complex);
@@ -91,8 +101,7 @@ public class AAISingleTransactionClientTest {
        
        @Test
        public void testFailure() throws IOException {
-               AAIResourcesClient client = createClient();
-               AAISingleTransactionClient singleTransaction = client.beginSingleTransaction();
+               AAISingleTransactionClient singleTransaction = aaiClient.beginSingleTransaction();
                SingleTransactionResponse expected = mapper.readValue(this.getJson("sample-response-failure.json"), SingleTransactionResponse.class);
                Optional<String> errorMessage = singleTransaction.locateErrorMessages(expected);
                
@@ -103,8 +112,7 @@ public class AAISingleTransactionClientTest {
        
        @Test
        public void testSuccessResponse() throws IOException {
-               AAIResourcesClient client = createClient();
-               AAISingleTransactionClient singleTransaction = client.beginSingleTransaction();
+               AAISingleTransactionClient singleTransaction = aaiClient.beginSingleTransaction();
                SingleTransactionResponse expected = mapper.readValue(this.getJson("sample-response.json"), SingleTransactionResponse.class);
                Optional<String> errorMessage = singleTransaction.locateErrorMessages(expected);
                
@@ -115,8 +123,8 @@ public class AAISingleTransactionClientTest {
        
        @Test
        public void confirmPatchFormat() {
-               AAISingleTransactionClient singleTransaction = spy(new AAISingleTransactionClient(AAIVersion.LATEST));
-               AAIPatchConverter mock = mock(AAIPatchConverter.class);
+               AAISingleTransactionClient singleTransaction = spy(new AAISingleTransactionClient(aaiClient, client));
+               GraphInventoryPatchConverter mock = mock(GraphInventoryPatchConverter.class);
                doReturn(mock).when(singleTransaction).getPatchConverter();
                singleTransaction.update(uriA, "{}");
                verify(mock, times(1)).convertPatchFormat(any());
@@ -125,9 +133,4 @@ public class AAISingleTransactionClientTest {
                 return new String(Files.readAllBytes(Paths.get(AAI_JSON_FILE_LOCATION + filename)));
        }
        
-       private AAIResourcesClient createClient() {
-               AAIResourcesClient client = spy(new AAIResourcesClient());
-               doReturn(new DefaultAAIPropertiesImpl()).when(client).getRestProperties();
-               return client;
-       }
 }