Replaced all tabs with spaces in java and pom.xml

[so.git] / bpmn / so-bpmn-tasks / src / test / java / org / onap / so / client / namingservice / NamingClientTest.java

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingClientTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingClientTest.java
index 4bae5b4..8a387a8 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingClientTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/namingservice/NamingClientTest.java
@@ -25,11 +25,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.delete;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static org.junit.Assert.assertTrue;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.http.HttpStatus;
 import org.junit.Rule;
 import org.junit.Test;
@@ -41,78 +39,78 @@ import org.onap.namingservice.model.NameGenRequest;
 import org.onap.so.BaseIntegrationTest;
 import org.onap.so.client.exception.BadResponseException;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 
-public class NamingClientTest extends BaseIntegrationTest{
-       @Autowired
-       NamingClient client;
-       @Autowired
-       NamingRequestObjectBuilder requestBuilder;
-       @Rule
-       public ExpectedException thrown = ExpectedException.none();
-       
-       @Test
-       public void assignNameGenRequest() throws BadResponseException, IOException{
-               wireMockServer.stubFor(post(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
-                               .willReturn(aResponse().withHeader("Content-Type", "application/json")
-                               .withBodyFile("NamingClient/AssignResponse.json")
-                               .withStatus(HttpStatus.SC_ACCEPTED)));
-               
-               NameGenRequest request = assignSetup();
-               String response = client.postNameGenRequest(request);
-               assertTrue(response.equals("$vnf-name"));
-       }
-       @Test
-       public void assignNameGenRequestError() throws BadResponseException, IOException{
-               wireMockServer.stubFor(post(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
-                               .willReturn(aResponse().withHeader("Content-Type", "application/json")
-                               .withBodyFile("NamingClient/ErrorResponse.json")
-                               .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
-               
-               thrown.expect(BadResponseException.class);
-               thrown.expectMessage("Error from Naming Service: External Key is required and must be unique");
-               NameGenRequest request = assignSetup();
-               client.postNameGenRequest(request);
-       }
-       @Test
-       public void unassignNameGenRequest() throws BadResponseException, IOException{
-               wireMockServer.stubFor(delete(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
-                               .willReturn(aResponse().withHeader("Content-Type", "application/json")
-                               .withBodyFile("NamingClient/UnassignResponse.json")
-                               .withStatus(HttpStatus.SC_ACCEPTED)));
-               
-               String response = client.deleteNameGenRequest(unassignSetup());
-               assertTrue(response.equals(""));
-       }
-       @Test
-       public void unassignNameGenRequestError() throws BadResponseException, IOException{
-               wireMockServer.stubFor(delete(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
-                               .willReturn(aResponse().withHeader("Content-Type", "application/json")
-                               .withBodyFile("NamingClient/ErrorResponse.json")
-                               .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
-               
-               thrown.expect(BadResponseException.class);
-               thrown.expectMessage("Error from Naming Service: External Key is required and must be unique");
-               client.deleteNameGenRequest(unassignSetup());
-       }
-       
-       public NameGenRequest assignSetup() throws JsonProcessingException{
-               NameGenRequest request = new NameGenRequest();
-               List<Element> elements = new ArrayList<>();
-               Element testElement = new Element();
-               testElement = requestBuilder.elementMapper("SomeUniqueValue", "SDNC_Policy.Config_MS_1806SRIOV_VNATJson.4.xml", "VNF", "nfNamingCode", "vnf_name");
-               elements.add(testElement);
-               request = requestBuilder.nameGenRequestMapper(elements);
-               return request;
-       }
-       public NameGenDeleteRequest unassignSetup() throws JsonProcessingException{
-               NameGenDeleteRequest request = new NameGenDeleteRequest();
-               List<Deleteelement> deleteElements = new ArrayList<>();
-               Deleteelement testElement = new Deleteelement();
-               testElement = requestBuilder.deleteElementMapper("instanceGroupId");
-               deleteElements.add(testElement);
-               request = requestBuilder.nameGenDeleteRequestMapper(deleteElements);
-               return request;
-       }
+public class NamingClientTest extends BaseIntegrationTest {
+    @Autowired
+    NamingClient client;
+    @Autowired
+    NamingRequestObjectBuilder requestBuilder;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void assignNameGenRequest() throws BadResponseException, IOException {
+        wireMockServer.stubFor(post(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
+                .willReturn(aResponse().withHeader("Content-Type", "application/json")
+                        .withBodyFile("NamingClient/AssignResponse.json").withStatus(HttpStatus.SC_ACCEPTED)));
+
+        NameGenRequest request = assignSetup();
+        String response = client.postNameGenRequest(request);
+        assertTrue(response.equals("$vnf-name"));
+    }
+
+    @Test
+    public void assignNameGenRequestError() throws BadResponseException, IOException {
+        wireMockServer.stubFor(post(urlPathEqualTo("/web/service/v1/genNetworkElementName")).willReturn(aResponse()
+                .withHeader("Content-Type", "application/json").withBodyFile("NamingClient/ErrorResponse.json")
+                .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
+
+        thrown.expect(BadResponseException.class);
+        thrown.expectMessage("Error from Naming Service: External Key is required and must be unique");
+        NameGenRequest request = assignSetup();
+        client.postNameGenRequest(request);
+    }
+
+    @Test
+    public void unassignNameGenRequest() throws BadResponseException, IOException {
+        wireMockServer.stubFor(delete(urlPathEqualTo("/web/service/v1/genNetworkElementName"))
+                .willReturn(aResponse().withHeader("Content-Type", "application/json")
+                        .withBodyFile("NamingClient/UnassignResponse.json").withStatus(HttpStatus.SC_ACCEPTED)));
+
+        String response = client.deleteNameGenRequest(unassignSetup());
+        assertTrue(response.equals(""));
+    }
+
+    @Test
+    public void unassignNameGenRequestError() throws BadResponseException, IOException {
+        wireMockServer.stubFor(delete(urlPathEqualTo("/web/service/v1/genNetworkElementName")).willReturn(aResponse()
+                .withHeader("Content-Type", "application/json").withBodyFile("NamingClient/ErrorResponse.json")
+                .withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
+
+        thrown.expect(BadResponseException.class);
+        thrown.expectMessage("Error from Naming Service: External Key is required and must be unique");
+        client.deleteNameGenRequest(unassignSetup());
+    }
+
+    public NameGenRequest assignSetup() throws JsonProcessingException {
+        NameGenRequest request = new NameGenRequest();
+        List<Element> elements = new ArrayList<>();
+        Element testElement = new Element();
+        testElement = requestBuilder.elementMapper("SomeUniqueValue", "SDNC_Policy.Config_MS_1806SRIOV_VNATJson.4.xml",
+                "VNF", "nfNamingCode", "vnf_name");
+        elements.add(testElement);
+        request = requestBuilder.nameGenRequestMapper(elements);
+        return request;
+    }
+
+    public NameGenDeleteRequest unassignSetup() throws JsonProcessingException {
+        NameGenDeleteRequest request = new NameGenDeleteRequest();
+        List<Deleteelement> deleteElements = new ArrayList<>();
+        Deleteelement testElement = new Deleteelement();
+        testElement = requestBuilder.deleteElementMapper("instanceGroupId");
+        deleteElements.add(testElement);
+        request = requestBuilder.nameGenDeleteRequestMapper(deleteElements);
+        return request;
+    }
 }