Merge "Fix the Checkstyle issues"

13 files changed, 74 insertions, 441 deletions

diff --git a/pom.xml b/pom.xml
index fb86ae82..c4c1a81a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -795,6 +795,9 @@
               <goal>verify</goal>
             </goals>
             <configuration>
+            <includes>
+              <include>**/*ItCase.java</include>
+            </includes>
               <forkCount>1</forkCount>
               <reuseForks>false</reuseForks>
             </configuration>
diff --git a/src/test/java/org/onap/clamp/clds/AbstractIT.java b/src/test/java/org/onap/clamp/clds/AbstractItCase.java
index b705e38d..9be8a13b 100644
--- a/src/test/java/org/onap/clamp/clds/AbstractIT.java
+++ b/src/test/java/org/onap/clamp/clds/AbstractItCase.java
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ActiveProfiles;
 
 @ActiveProfiles("clamp-default")
-public abstract class AbstractIT {
+public abstract class AbstractItCase {
 
     @Autowired
     protected RefProp      refProp;
diff --git a/src/test/java/org/onap/clamp/clds/client/req/OperationalPolicyReqTest.java b/src/test/java/org/onap/clamp/clds/client/req/OperationalPolicyReqTest.java
index d4584436..734b6052 100644
--- a/src/test/java/org/onap/clamp/clds/client/req/OperationalPolicyReqTest.java
+++ b/src/test/java/org/onap/clamp/clds/client/req/OperationalPolicyReqTest.java
@@ -31,9 +31,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Test;
+import org.onap.policy.controlloop.policy.PolicyResult;
 import org.onap.policy.sdc.Resource;
 import org.onap.policy.sdc.ResourceType;
-import org.onap.policy.controlloop.policy.PolicyResult;
 
 public class OperationalPolicyReqTest {
 
@@ -49,7 +49,7 @@ public class OperationalPolicyReqTest {
         stringList.add("test2");
         stringList.add("test3");
         stringList.add("test4");
-        Resource resources[] = (Resource[]) method.invoke(null, stringList, ResourceType.VF);
+        Resource[] resources = (Resource[]) method.invoke(null, stringList, ResourceType.VF);
 
         assertTrue(resources.length == 4);
         assertTrue("test1".equals(resources[0].getResourceName()));
@@ -69,7 +69,7 @@ public class OperationalPolicyReqTest {
         stringList.add("SUCCESS");
         stringList.add("FAILURE_GUARD");
         stringList.add("FAILURE_TIMEOUT");
-        PolicyResult policyResult[] = (PolicyResult[]) method.invoke(null, stringList);
+        PolicyResult[] policyResult = (PolicyResult[]) method.invoke(null, stringList);
 
         assertTrue(policyResult.length == 4);
         assertTrue(policyResult[0].equals(PolicyResult.FAILURE));
diff --git a/src/test/java/org/onap/clamp/clds/client/req/SdcReqTest.java b/src/test/java/org/onap/clamp/clds/client/req/SdcReqTest.java
index a283f43d..497abe0f 100644
--- a/src/test/java/org/onap/clamp/clds/client/req/SdcReqTest.java
+++ b/src/test/java/org/onap/clamp/clds/client/req/SdcReqTest.java
@@ -41,7 +41,7 @@ import org.onap.clamp.clds.model.prop.ModelProperties;
 public class SdcReqTest {
 
     String baseUrl              = "AYBABTU";
-    String serviceInvariantUUID = "serviceInvariantUUID";
+    String serviceInvariantUuid = "serviceInvariantUUID";
 
     @Test
     public void getSdcReqUrlsListNoGlobalPropTest() {
@@ -52,7 +52,7 @@ public class SdcReqTest {
         List<CldsSdcResource> cldsSdcResources = new ArrayList<>();
         cldsSdcResources.add(cldsSdcResource);
         List<String> resourceVf = new ArrayList<>();
-        resourceVf.add(serviceInvariantUUID);
+        resourceVf.add(serviceInvariantUuid);
 
         Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
 
@@ -60,7 +60,7 @@ public class SdcReqTest {
         when(prop.getGlobal()).thenReturn(global);
         Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
 
-        when(global.getService()).thenReturn(serviceInvariantUUID);
+        when(global.getService()).thenReturn(serviceInvariantUuid);
         Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
 
         CldsSdcServiceDetail cldsSdcServiceDetail = mock(CldsSdcServiceDetail.class);
@@ -75,7 +75,7 @@ public class SdcReqTest {
         Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
 
         when(global.getResourceVf()).thenReturn(resourceVf);
-        when(cldsSdcResource.getResourceInvariantUUID()).thenReturn(serviceInvariantUUID);
+        when(cldsSdcResource.getResourceInvariantUUID()).thenReturn(serviceInvariantUuid);
         when(cldsSdcResource.getResourceInstanceName()).thenReturn("Resource instance name");
         List<String> expected = new ArrayList<>();
         expected.add("AYBABTU/null/resourceInstances/resourceinstancename/artifacts");
diff --git a/src/test/java/org/onap/clamp/clds/it/CldsDaoIT.java b/src/test/java/org/onap/clamp/clds/it/CldsDaoItCase.java
index bd419647..1427c329 100644
--- a/src/test/java/org/onap/clamp/clds/it/CldsDaoIT.java
+++ b/src/test/java/org/onap/clamp/clds/it/CldsDaoItCase.java
@@ -32,7 +32,7 @@ import javax.ws.rs.NotFoundException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.AbstractIT;
+import org.onap.clamp.clds.AbstractItCase;
 import org.onap.clamp.clds.dao.CldsDao;
 import org.onap.clamp.clds.model.CldsEvent;
 import org.onap.clamp.clds.model.CldsModel;
@@ -50,7 +50,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @TestPropertySource(locations = "classpath:application-no-camunda.properties")
-public class CldsDaoIT extends AbstractIT {
+public class CldsDaoItCase extends AbstractItCase {
 
     @Autowired
     public CldsDao cldsDao;
@@ -59,6 +59,12 @@ public class CldsDaoIT extends AbstractIT {
     private String imageText;
     private String bpmnPropText;
 
+    /**
+     * Setup the variable before the tests execution.
+     * 
+     * @throws IOException
+     *             In case of issues when opening the files
+     */
     @Before
     public void setupBefore() throws IOException {
         bpmnText = ResourceFileUtil.getResourceAsString("example/dao/bpmn-template.xml");
diff --git a/src/test/java/org/onap/clamp/clds/it/CldsServiceIT.java b/src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java
index f09c3577..a1882eaa 100644
--- a/src/test/java/org/onap/clamp/clds/it/CldsServiceIT.java
+++ b/src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java
@@ -36,7 +36,7 @@ import javax.ws.rs.core.SecurityContext;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.onap.clamp.clds.AbstractIT;
+import org.onap.clamp.clds.AbstractItCase;
 import org.onap.clamp.clds.model.CldsInfo;
 import org.onap.clamp.clds.service.CldsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,7 +51,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @TestPropertySource(locations = "classpath:application-no-camunda.properties")
-public class CldsServiceIT extends AbstractIT {
+public class CldsServiceItCase extends AbstractItCase {
 
     @Autowired
     CldsService cldsService;
@@ -59,10 +59,10 @@ public class CldsServiceIT extends AbstractIT {
     @Test
     public void testCldsInfoNotAuthorized() throws Exception {
         SecurityContext securityContext = Mockito.mock(SecurityContext.class);
-        Principal p = Mockito.mock(Principal.class);
-        Mockito.when(p.getName()).thenReturn("admin");
+        Principal principal = Mockito.mock(Principal.class);
+        Mockito.when(principal.getName()).thenReturn("admin");
 
-        Mockito.when(securityContext.getUserPrincipal()).thenReturn(p);
+        Mockito.when(securityContext.getUserPrincipal()).thenReturn(principal);
         cldsService.setSecurityContext(securityContext);
 
         CldsInfo cldsInfo = cldsService.getCldsInfo();
diff --git a/src/test/java/org/onap/clamp/clds/it/HttpsIT.java b/src/test/java/org/onap/clamp/clds/it/HttpsItCase.java
index 98319b41..9befc40b 100644
--- a/src/test/java/org/onap/clamp/clds/it/HttpsIT.java
+++ b/src/test/java/org/onap/clamp/clds/it/HttpsItCase.java
@@ -38,7 +38,7 @@ import javax.net.ssl.X509TrustManager;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.AbstractIT;
+import org.onap.clamp.clds.AbstractItCase;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -55,7 +55,7 @@ import org.springframework.web.client.RestTemplate;
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT)
 @TestPropertySource(locations = "classpath:https/https-test.properties")
-public class HttpsIT extends AbstractIT {
+public class HttpsItCase extends AbstractItCase {
 
     @Value("${server.port}")
     private String httpsPort;
@@ -63,6 +63,9 @@ public class HttpsIT extends AbstractIT {
     @Value("${server.http-to-https-redirection.port}")
     private String httpPort;
 
+    /**
+     * Setup the variable before tests execution.
+     */
     @BeforeClass
     public static void setUp() {
 
diff --git a/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqIT.java b/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java
index 0f874e98..c7084b64 100644
--- a/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqIT.java
+++ b/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java
@@ -35,7 +35,7 @@ import java.util.Map;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.AbstractIT;
+import org.onap.clamp.clds.AbstractItCase;
 import org.onap.clamp.clds.client.req.OperationalPolicyReq;
 import org.onap.clamp.clds.model.CldsEvent;
 import org.onap.clamp.clds.model.prop.ModelProperties;
@@ -51,7 +51,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @TestPropertySource(locations = "classpath:application-no-camunda.properties")
-public class OperationPolicyReqIT extends AbstractIT {
+public class OperationPolicyReqItCase extends AbstractItCase {
 
     @Test
     public void formatAttributesTest() throws IOException, BuilderException {
diff --git a/src/test/java/org/onap/clamp/clds/it/PolicyClientIT.java b/src/test/java/org/onap/clamp/clds/it/PolicyClientItCase.java
index 7b631768..0c358948 100644
--- a/src/test/java/org/onap/clamp/clds/it/PolicyClientIT.java
+++ b/src/test/java/org/onap/clamp/clds/it/PolicyClientItCase.java
@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.AbstractIT;
+import org.onap.clamp.clds.AbstractItCase;
 import org.onap.clamp.clds.client.req.OperationalPolicyReq;
 import org.onap.clamp.clds.client.req.TcaRequestFormatter;
 import org.onap.clamp.clds.model.CldsEvent;
@@ -43,7 +43,6 @@ import org.onap.clamp.clds.model.prop.PolicyChain;
 import org.onap.clamp.clds.model.prop.Tca;
 import org.onap.clamp.clds.util.ResourceFileUtil;
 import org.onap.policy.api.AttributeType;
-import org.skyscreamer.jsonassert.JSONAssert;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -55,7 +54,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @TestPropertySource(locations = "classpath:application-no-camunda.properties")
-public class PolicyClientIT extends AbstractIT {
+public class PolicyClientItCase extends AbstractItCase {
     String modelProp;
     String modelBpmnProp;
     String modelName;
@@ -81,7 +80,7 @@ public class PolicyClientIT extends AbstractIT {
 
                 Map<AttributeType, Map<String, String>> attributes = OperationalPolicyReq.formatAttributes(refProp,
                         prop, policy.getId(), policyChain);
-                String responseMessage = policyClient.sendBrmsPolicy(attributes, prop, operationalPolicyRequestUuid);
+                policyClient.sendBrmsPolicy(attributes, prop, operationalPolicyRequestUuid);
             }
         }
     }
@@ -92,9 +91,9 @@ public class PolicyClientIT extends AbstractIT {
         if (tca.isFound()) {
             String tcaPolicyRequestUuid = UUID.randomUUID().toString();
             String policyJson = TcaRequestFormatter.createPolicyJson(refProp, prop);
-            String responseMessage = "";
+
             try {
-                responseMessage = policyClient.sendMicroServiceInJson(policyJson, prop, tcaPolicyRequestUuid);
+                policyClient.sendMicroServiceInJson(policyJson, prop, tcaPolicyRequestUuid);
             } catch (Exception e) {
                 assertTrue(e.getMessage().contains("Exception while communicating with Policy"));
             }
@@ -109,7 +108,7 @@ public class PolicyClientIT extends AbstractIT {
             prop.setCurrentModelElementId(policy.getId());
             for (PolicyChain policyChain : policy.getPolicyChains()) {
                 prop.setPolicyUniqueId(policyChain.getPolicyId());
-                String responseMessage = policyClient.deleteBrms(prop);
+                policyClient.deleteBrms(prop);
             }
         }
     }
@@ -120,9 +119,9 @@ public class PolicyClientIT extends AbstractIT {
         Tca tca = prop.getType(Tca.class);
         if (tca.isFound()) {
             prop.setCurrentModelElementId(tca.getId());
-            String responseMessage = "";
+
             try {
-                responseMessage = policyClient.deleteMicrosService(prop);
+                policyClient.deleteMicrosService(prop);
             } catch (Exception e) {
                 assertTrue(e.getMessage().contains("Policy delete failed: PE500 "));
             }
diff --git a/src/test/java/org/onap/clamp/clds/it/PropJsonBuilderIT.java b/src/test/java/org/onap/clamp/clds/it/PropJsonBuilderIT.java
deleted file mode 100644
index cd626dd6..00000000
--- a/src/test/java/org/onap/clamp/clds/it/PropJsonBuilderIT.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-
-package org.onap.clamp.clds.it;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.clamp.clds.AbstractIT;
-import org.onap.clamp.clds.client.req.SdcReq;
-import org.onap.clamp.clds.model.CldsSdcServiceDetail;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * Test SDC API - stand alone (except for some config). Replicates
- * getSdcServices and getSdcServicesByUUID in the CldsService Adds test of
- * putting putting an artifact to VF. TODO Also needs update and perhaps delete
- * tests.
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application-no-camunda.properties")
-public class PropJsonBuilderIT extends AbstractIT {
-
-    private String       globalPropsPartial;
-    private ObjectMapper mapper;
-
-    /**
-     * Initial test setup.
-     */
-    @Before
-    public void setUp() throws IOException {
-        String url = refProp.getStringValue("sdc.serviceUrl");
-        String basicAuth = SdcReq.getSdcBasicAuth(refProp);
-        System.out.println("value of string and basicAuth:" + url + basicAuth);
-        // cldsservicedetail.set
-        globalPropsPartial = refProp.getStringValue("globalPropsPartialTest");
-        mapper = new ObjectMapper();
-    }
-
-    /**
-     * List services from SDC. List meta data for a particular service from SDC.
-     * Test uploading artifact to a VF in SDC.
-     */
-    @Test
-    public void testSdc() throws Exception {
-        // String createEmptySharedObject = createEmptySharedObject();
-        // System.out.println("value of emptySharedObject:" +
-        // createEmptySharedObject);
-        sampleJsonObject();
-        System.out.println(createTestEmptySharedObject());
-    }
-
-    private void sampleJsonObject() throws JsonProcessingException {
-
-        /**
-         * Create three JSON Objects objectNode1, objectNode2, objectNode3. Add
-         * all these three objects in the array
-         */
-        ObjectNode objectNode1 = mapper.createObjectNode();
-        objectNode1.put("bookName", "Java");
-        objectNode1.put("price", "100");
-
-        ObjectNode objectNode2 = mapper.createObjectNode();
-        objectNode2.put("bookName", "Spring");
-        objectNode2.put("price", "200");
-
-        ObjectNode objectNode3 = mapper.createObjectNode();
-        objectNode3.put("bookName", "Liferay");
-        objectNode3.put("price", "500");
-
-        /**
-         * Array contains JSON Objects.
-         */
-        ArrayNode arrayNode = mapper.createArrayNode();
-        arrayNode.add(objectNode1);
-        arrayNode.add(objectNode2);
-        arrayNode.add(objectNode3);
-
-        /**
-         * We can directly write the JSON in the console. But it wont be pretty
-         * JSON String
-         */
-        System.out.println(arrayNode.toString());
-
-        /**
-         * To make the JSON String pretty use the below code.
-         */
-        System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(arrayNode));
-    }
-
-    private String createEmptySharedObject() throws JsonProcessingException {
-
-        /**
-         * Empty Object initialization. "": { "vf": { "": "" }, "location": {
-         * "": "" }, "alarmCondition": { "": "" } }
-         */
-        ObjectNode emptyObjectNode = mapper.createObjectNode();
-        emptyObjectNode.put("", "");
-        ObjectNode vfObjectNode = mapper.createObjectNode();
-        vfObjectNode.putPOJO("vf", emptyObjectNode);
-        ObjectNode locationObjectNode = mapper.createObjectNode();
-        locationObjectNode.putPOJO("location", emptyObjectNode);
-        ObjectNode alarmConditionObjectNode = mapper.createObjectNode();
-        alarmConditionObjectNode.putPOJO("alarmCondition", emptyObjectNode);
-        ArrayNode samArrayNode = mapper.createArrayNode();
-        samArrayNode.add(vfObjectNode);
-        samArrayNode.add(locationObjectNode);
-        samArrayNode.add(alarmConditionObjectNode);
-        ObjectNode emptyServiceObjectNode = mapper.createObjectNode();
-        emptyServiceObjectNode.putPOJO("", samArrayNode);
-
-        /**
-         * Object initialization. "vf": { " ": " ", "DCAE_CLAMP_DEMO3 1":
-         * "DCAE_CLAMP_DEMO3" }
-         *
-         */
-        ObjectNode dcaeClampDemo3Node = mapper.createObjectNode();
-        dcaeClampDemo3Node.put("DCAE_CLAMP_DEMO3", "DCAE_CLAMP_DEMO3");
-        ArrayNode vfArrayNode = mapper.createArrayNode();
-        vfArrayNode.add(emptyObjectNode);
-        vfArrayNode.add(dcaeClampDemo3Node);
-        ObjectNode vfObjectNode2 = mapper.createObjectNode();
-        vfObjectNode2.putPOJO("vf", vfArrayNode);
-
-        /**
-         * Object initialization. "location": { "SNDGCA64": "San Diego SAN3",
-         * "ALPRGAED": "Alpharetta PDK1", "LSLEILAA": "Lisle DPA3" },
-         */
-        ObjectNode sandiegoLocationNode = mapper.createObjectNode();
-        sandiegoLocationNode.put("SNDGCA64", "San Diego SAN3");
-        ObjectNode alpharettaNode = mapper.createObjectNode();
-        alpharettaNode.put("ALPRGAED", "Alpharetta PDK1");
-        ArrayNode locationArrayNode = mapper.createArrayNode();
-        locationArrayNode.add(emptyObjectNode);
-        locationArrayNode.add(sandiegoLocationNode);
-        locationArrayNode.add(alpharettaNode);
-        ObjectNode locationObjectNode2 = mapper.createObjectNode();
-        locationObjectNode2.putPOJO("location", locationArrayNode);
-
-        /**
-         * Object initialization. "alarmCondition": {
-         * "A+Fallback+Operation+will+soon+be+started": "A Fallback Operation
-         * will soon be started", "BRM%2C+Auto+Export+Backup+Failed": "BRM, Auto
-         * Export Backup Failed",
-         */
-        ObjectNode alamrCondition1 = mapper.createObjectNode();
-        alamrCondition1.put("A+Fallback+Operation+will+soon+be+started", "A Fallback Operation will soon be started");
-        ObjectNode alarmConditon2 = mapper.createObjectNode();
-        alarmConditon2.put("BRM%2C+Scheduled+Backup+Failed", "BRM, Scheduled Backup Failed");
-        ArrayNode alarmArrayNode = mapper.createArrayNode();
-        alarmArrayNode.add(emptyObjectNode);
-        alarmArrayNode.add(alamrCondition1);
-        alarmArrayNode.add(alarmConditon2);
-        ObjectNode alarmConditionObjectNode2 = mapper.createObjectNode();
-        alarmConditionObjectNode2.putPOJO("alarmCondition", alarmArrayNode);
-
-        ArrayNode byServiceIdArrayNode = mapper.createArrayNode();
-        byServiceIdArrayNode.add(vfObjectNode2);
-        byServiceIdArrayNode.add(locationObjectNode2);
-        byServiceIdArrayNode.add(alarmConditionObjectNode2);
-
-        ObjectNode byServiceIdNode = mapper.createObjectNode();
-        byServiceIdNode.putPOJO("c989a551-69f7-4b30-b10a-2e85bb227c30", byServiceIdArrayNode);
-
-        ArrayNode byServiceBasicArrayNode = mapper.createArrayNode();
-        byServiceBasicArrayNode.add(emptyServiceObjectNode);
-        byServiceBasicArrayNode.add(byServiceIdNode);
-
-        ObjectNode byServiceBasicObjetNode = mapper.createObjectNode();
-
-        byServiceBasicObjetNode.putPOJO("byService", byServiceBasicArrayNode);
-
-        /**
-         * Object initialization. "byVf": { "": { "vfc": { "": "" },
-         * "03596c12-c7e3-44b7-8994-5cdfeda8afdd": { "vfc": { " ": " " } } } }
-         */
-        ObjectNode vfCObjectNode = mapper.createObjectNode();
-        vfCObjectNode.putPOJO("vfC", emptyObjectNode);
-        ObjectNode vfcIdObjectNode = mapper.createObjectNode();
-        vfcIdObjectNode.putPOJO("03596c12-c7e3-44b7-8994-5cdfeda8afdd", vfCObjectNode);
-        ArrayNode emptyvfcArrayNode = mapper.createArrayNode();
-        emptyvfcArrayNode.add(vfCObjectNode);
-        emptyvfcArrayNode.add(vfcIdObjectNode);
-        ObjectNode emptyvfcobjectNode = mapper.createObjectNode();
-        emptyvfcobjectNode.putPOJO("", emptyvfcArrayNode);
-
-        ObjectNode byVfCBasicNode = mapper.createObjectNode();
-        byVfCBasicNode.putPOJO("byVf", emptyvfcobjectNode);
-
-        ArrayNode finalSharedArrayObject = mapper.createArrayNode();
-
-        finalSharedArrayObject.add(byServiceBasicObjetNode);
-        finalSharedArrayObject.add(byVfCBasicNode);
-
-        ObjectNode finalSharedObjectNode = mapper.createObjectNode();
-        finalSharedObjectNode.putPOJO("shared", finalSharedArrayObject);
-
-        System.out.println("value :" + finalSharedObjectNode.toString());
-        String testFinal = finalSharedObjectNode.toString();
-        testFinal = testFinal.replaceFirst("\\{", ",");
-        return globalPropsPartial + testFinal;
-    }
-
-    private String createTestEmptySharedObject() throws IOException {
-
-        /**
-         * Object initialization. "": { "vf": { "": "" }, "location": { "": ""
-         * }, "alarmCondition": { "": "" } }
-         */
-        ObjectNode emptyObjectNode = mapper.createObjectNode();
-        emptyObjectNode.put("", "");
-        ObjectNode vfObjectNode = mapper.createObjectNode();
-        vfObjectNode.putPOJO("vf", emptyObjectNode);
-        vfObjectNode.putPOJO("location", emptyObjectNode);
-        vfObjectNode.putPOJO("alarmCondition", emptyObjectNode);
-        ObjectNode emptyServiceObjectNode = mapper.createObjectNode();
-        emptyServiceObjectNode.putPOJO("", vfObjectNode);
-
-        /**
-         * Object initialization. "vf": { " ": " ", "DCAE_CLAMP_DEMO3 1":
-         * "DCAE_CLAMP_DEMO3" }
-         *
-         */
-        ObjectNode vfObjectNode2 = mapper.createObjectNode();
-        ObjectNode dcaeClampDemo3Node = mapper.createObjectNode();
-        dcaeClampDemo3Node.put("", "");
-        dcaeClampDemo3Node.put("DCAE_CLAMP_DEMO3", "DCAE_CLAMP_DEMO3");
-        vfObjectNode2.putPOJO("vf", dcaeClampDemo3Node);
-
-        /**
-         * Object initialization. "location": { "SNDGCA64": "San Diego SAN3",
-         * "ALPRGAED": "Alpharetta PDK1", "LSLEILAA": "Lisle DPA3" },
-         */
-        // ObjectNode sandiegoLocationNode = mapper.createObjectNode();
-        // sandiegoLocationNode.put("SNDGCA64","San Diego SAN3");
-        // sandiegoLocationNode.put("ALPRGAED","Alpharetta PDK1");
-        String locationStringValue = refProp.getStringValue("ui.location.default");
-        ObjectNode locationJsonNode = (ObjectNode) mapper.readValue(locationStringValue, JsonNode.class);
-        vfObjectNode2.putPOJO("location", locationJsonNode);
-
-        /**
-         * Object initialization. "alarmCondition": {
-         * "A+Fallback+Operation+will+soon+be+started": "A Fallback Operation
-         * will soon be started", "BRM%2C+Auto+Export+Backup+Failed": "BRM, Auto
-         * Export Backup Failed",
-         */
-        // ObjectNode alamrCondition1 = mapper.createObjectNode();
-        // alamrCondition1.put("A+Fallback+Operation+will+soon+be+started","A
-        // Fallback Operation will soon be started");
-        // alamrCondition1.put("BRM%2C+Scheduled+Backup+Failed","BRM, Scheduled
-        // Backup Failed");
-        String alarmStringValue = refProp.getStringValue("ui.alarm.default");
-        ObjectNode alarmStringJsonNode = (ObjectNode) mapper.readValue(alarmStringValue, JsonNode.class);
-        vfObjectNode2.putPOJO("alarmCondition", alarmStringJsonNode);
-        emptyServiceObjectNode.putPOJO("c989a551-69f7-4b30-b10a-2e85bb227c30", vfObjectNode2);
-        ObjectNode byServiceBasicObjetNode = mapper.createObjectNode();
-        byServiceBasicObjetNode.putPOJO("byService", emptyServiceObjectNode);
-
-        /**
-         * Object initialization. "byVf": { "": { "vfc": { "": "" },
-         * "03596c12-c7e3-44b7-8994-5cdfeda8afdd": { "vfc": { " ": " " } } } }
-         */
-        ObjectNode vfCObjectNode = mapper.createObjectNode();
-        vfCObjectNode.putPOJO("vfC", emptyObjectNode);
-        ObjectNode subVfCObjectNode = mapper.createObjectNode();
-        subVfCObjectNode.putPOJO("vfc", emptyObjectNode);
-        vfCObjectNode.putPOJO("03596c12-c7e3-44b7-8994-5cdfeda8afdd", subVfCObjectNode);
-        ObjectNode emptyvfcobjectNode = mapper.createObjectNode();
-        emptyvfcobjectNode.putPOJO("", vfCObjectNode);
-        byServiceBasicObjetNode.putPOJO("byVf", emptyvfcobjectNode);
-
-        ObjectNode readTree = (ObjectNode) mapper.readValue(globalPropsPartial, JsonNode.class);
-        readTree.putPOJO("shared", byServiceBasicObjetNode);
-        System.out.println("valuie of objNode:" + readTree);
-        return readTree.toString();
-    }
-
-    private String createCldsSharedObject(CldsSdcServiceDetail CldsSdcServiceDetail) throws IOException {
-        /**
-         * Object initialization. "": { "vf": { "": "" }, "location": { "": ""
-         * }, "alarmCondition": { "": "" } }
-         */
-        ObjectNode emptyObjectNode = mapper.createObjectNode();
-        emptyObjectNode.put("", "");
-        ObjectNode vfObjectNode = mapper.createObjectNode();
-        vfObjectNode.putPOJO("vf", emptyObjectNode);
-        vfObjectNode.putPOJO("location", emptyObjectNode);
-        vfObjectNode.putPOJO("alarmCondition", emptyObjectNode);
-        ObjectNode emptyServiceObjectNode = mapper.createObjectNode();
-        emptyServiceObjectNode.putPOJO("", vfObjectNode);
-
-        /**
-         * Object initialization. "vf": { " ": " ", "DCAE_CLAMP_DEMO3 1":
-         * "DCAE_CLAMP_DEMO3" }
-         *
-         */
-        ObjectNode vfObjectNode2 = mapper.createObjectNode();
-        ObjectNode dcaeClampDemo3Node = mapper.createObjectNode();
-        dcaeClampDemo3Node.put("", "");
-        dcaeClampDemo3Node.put("DCAE_CLAMP_DEMO3", "DCAE_CLAMP_DEMO3");
-        vfObjectNode2.putPOJO("vf", dcaeClampDemo3Node);
-
-        /**
-         * Object initialization. "location": { "SNDGCA64": "San Diego SAN3",
-         * "ALPRGAED": "Alpharetta PDK1", "LSLEILAA": "Lisle DPA3" },
-         */
-        ObjectNode sandiegoLocationNode = mapper.createObjectNode();
-        sandiegoLocationNode.put("SNDGCA64", "San Diego SAN3");
-        sandiegoLocationNode.put("ALPRGAED", "Alpharetta PDK1");
-        vfObjectNode2.putPOJO("location", sandiegoLocationNode);
-
-        /**
-         * Object initialization. "alarmCondition": {
-         * "A+Fallback+Operation+will+soon+be+started": "A Fallback Operation
-         * will soon be started", "BRM%2C+Auto+Export+Backup+Failed": "BRM, Auto
-         * Export Backup Failed",
-         */
-        ObjectNode alamrCondition1 = mapper.createObjectNode();
-        alamrCondition1.put("A+Fallback+Operation+will+soon+be+started", "A Fallback Operation will soon be started");
-        alamrCondition1.put("BRM%2C+Scheduled+Backup+Failed", "BRM, Scheduled Backup Failed");
-        vfObjectNode2.putPOJO("alarmCondition", alamrCondition1);
-        emptyServiceObjectNode.putPOJO("c989a551-69f7-4b30-b10a-2e85bb227c30", vfObjectNode2);
-        ObjectNode byServiceBasicObjetNode = mapper.createObjectNode();
-        byServiceBasicObjetNode.putPOJO("byService", emptyServiceObjectNode);
-
-        /**
-         * Object initialization. "byVf": { "": { "vfc": { "": "" },
-         * "03596c12-c7e3-44b7-8994-5cdfeda8afdd": { "vfc": { " ": " " } } } }
-         */
-
-        ObjectNode vfCObjectNode = mapper.createObjectNode();
-        vfCObjectNode.putPOJO("vfC", emptyObjectNode);
-        ObjectNode subVfCObjectNode = mapper.createObjectNode();
-        subVfCObjectNode.putPOJO("vfc", emptyObjectNode);
-        vfCObjectNode.putPOJO("03596c12-c7e3-44b7-8994-5cdfeda8afdd", subVfCObjectNode);
-        ObjectNode emptyvfcobjectNode = mapper.createObjectNode();
-        emptyvfcobjectNode.putPOJO("", vfCObjectNode);
-        byServiceBasicObjetNode.putPOJO("byVf", emptyvfcobjectNode);
-
-        ObjectNode readTree = (ObjectNode) mapper.readValue(globalPropsPartial, JsonNode.class);
-
-        readTree.putPOJO("shared", byServiceBasicObjetNode);
-        System.out.println("valuie of objNode:" + readTree);
-        return readTree.toString();
-    }
-}
diff --git a/src/test/java/org/onap/clamp/clds/it/RefPropIT.java b/src/test/java/org/onap/clamp/clds/it/RefPropItCase.java
index 4617f5b4..478a7b38 100644
--- a/src/test/java/org/onap/clamp/clds/it/RefPropIT.java
+++ b/src/test/java/org/onap/clamp/clds/it/RefPropItCase.java
@@ -30,7 +30,7 @@ import java.io.IOException;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.AbstractIT;
+import org.onap.clamp.clds.AbstractItCase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -41,7 +41,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @TestPropertySource(locations = "classpath:application-no-camunda.properties")
-public class RefPropIT extends AbstractIT {
+public class RefPropItCase extends AbstractItCase {
 
     /**
      * Test getting prop value as a JSON Node / template.
diff --git a/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesIT.java b/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesItCase.java
index dce6c901..0deae6d3 100644
--- a/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesIT.java
+++ b/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesItCase.java
@@ -32,7 +32,7 @@ import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.onap.clamp.clds.AbstractIT;
+import org.onap.clamp.clds.AbstractItCase;
 import org.onap.clamp.clds.client.SdcCatalogServices;
 import org.onap.clamp.clds.model.CldsAlarmCondition;
 import org.onap.clamp.clds.model.CldsSdcResource;
@@ -50,7 +50,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @TestPropertySource(locations = "classpath:application-no-camunda.properties")
-public class SdcCatalogServicesIT extends AbstractIT {
+public class SdcCatalogServicesItCase extends AbstractItCase {
     @Autowired
     private SdcCatalogServices sdcCatalogWired = new SdcCatalogServices();
 
@@ -205,8 +205,8 @@ public class SdcCatalogServicesIT extends AbstractIT {
         SdcCatalogServices spy = Mockito.spy(sdcCatalogWired);
 
         Mockito.doReturn(IOUtils.toString(
-                SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcServicesListExample.json"), "UTF-8"))
-                .when(spy).getSdcServicesInformation(null);
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcServicesListExample.json"),
+                "UTF-8")).when(spy).getSdcServicesInformation(null);
         // Try the vcts4 version 1.0, this one should be replaced by 1.1 so it
         // should not exist, returning empty string
         String resUuidVcts4Null = spy.getServiceUuidFromServiceInvariantId("a33ed748-3477-4434-b3f3-b5560f5e7d9b");
@@ -232,82 +232,82 @@ public class SdcCatalogServicesIT extends AbstractIT {
         SdcCatalogServices spy = Mockito.spy(sdcCatalogWired);
 
         Mockito.doReturn(IOUtils.toString(
-                SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcServicesListExample.json"), "UTF-8"))
-                .when(spy).getSdcServicesInformation(null);
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcServicesListExample.json"),
+                "UTF-8")).when(spy).getSdcServicesInformation(null);
 
         // This invariant uuid is the one from vcts4 v1.1
         String serviceResourceDetailUrl = refProp.getStringValue("sdc.serviceUrl")
                 + "/29018914-966c-442d-9d08-251b9dc45b8f/metadata";
         Mockito.doReturn(IOUtils.toString(
-                SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcServiceDetailsExample.json"), "UTF-8"))
-                .when(spy).getCldsServicesOrResourcesBasedOnURL(serviceResourceDetailUrl, false);
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcServiceDetailsExample.json"),
+                "UTF-8")).when(spy).getCldsServicesOrResourcesBasedOnURL(serviceResourceDetailUrl, false);
 
         String resourceDetailUrl = refProp.getStringValue("sdc.catalog.url")
                 + "resources/585822c7-4027-4f84-ba50-e9248606f136/metadata";
         Mockito.doReturn(IOUtils.toString(
-                SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcResourceDetailsExample.json"), "UTF-8"))
-                .when(spy).getCldsServicesOrResourcesBasedOnURL(resourceDetailUrl, false);
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcResourceDetailsExample.json"),
+                "UTF-8")).when(spy).getCldsServicesOrResourcesBasedOnURL(resourceDetailUrl, false);
 
         String securityRulesDetailUrl = refProp.getStringValue("sdc.catalog.url")
                 + "resources/d57e57d2-e3c6-470d-8d16-e6ea05f536c5/metadata";
         Mockito.doReturn(IOUtils.toString(
-                SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcSecurityRules.json"), "UTF-8"))
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcSecurityRules.json"), "UTF-8"))
                 .when(spy).getCldsServicesOrResourcesBasedOnURL(securityRulesDetailUrl, false);
 
         String cinderVolumeDetailUrl = refProp.getStringValue("sdc.catalog.url")
                 + "resources/b4288e07-597a-44a2-aa98-ad36e551a39d/metadata";
-        Mockito.doReturn(IOUtils
-                .toString(SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcCinderVolume.json"), "UTF-8"))
+        Mockito.doReturn(IOUtils.toString(
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcCinderVolume.json"), "UTF-8"))
                 .when(spy).getCldsServicesOrResourcesBasedOnURL(cinderVolumeDetailUrl, false);
 
         String vfcGenericDetailUrl = refProp.getStringValue("sdc.catalog.url")
                 + "resources/2c8f1219-8000-4001-aa13-496a0396d40f/metadata";
         Mockito.doReturn(IOUtils.toString(
-                SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcVFCGenericWithAlarms.json"), "UTF-8"))
-                .when(spy).getCldsServicesOrResourcesBasedOnURL(vfcGenericDetailUrl, false);
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcVFCGenericWithAlarms.json"),
+                "UTF-8")).when(spy).getCldsServicesOrResourcesBasedOnURL(vfcGenericDetailUrl, false);
 
         String csvAlarmsDetailUrl = refProp.getStringValue("sdc.catalog.url")
                 + "resources/2c8f1219-8000-4001-aa13-496a0396d40f/resourceInstances/virc_fe_be/artifacts/5138e316-0237-49aa-817a-b3d8eaf77392";
-        Mockito.doReturn(IOUtils
-                .toString(SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcAlarmsList.csv"), "UTF-8"))
+        Mockito.doReturn(IOUtils.toString(
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcAlarmsList.csv"), "UTF-8"))
                 .when(spy).getCldsServicesOrResourcesBasedOnURL(csvAlarmsDetailUrl, false);
 
-        Mockito.doReturn(IOUtils
-                .toString(SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcAlarmsList.csv"), "UTF-8"))
+        Mockito.doReturn(IOUtils.toString(
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcAlarmsList.csv"), "UTF-8"))
                 .when(spy).getCldsServicesOrResourcesBasedOnURL(csvAlarmsDetailUrl, true);
 
         String csvAlarmsDetailUrl2 = refProp.getStringValue("sdc.catalog.url")
                 + "resources/d7646638-2572-4a94-b497-c028ac15f9ca/artifacts/5138e316-0237-49aa-817a-b3d8eaf77392";
-        Mockito.doReturn(IOUtils
-                .toString(SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcAlarmsList.csv"), "UTF-8"))
+        Mockito.doReturn(IOUtils.toString(
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcAlarmsList.csv"), "UTF-8"))
                 .when(spy).getCldsServicesOrResourcesBasedOnURL(csvAlarmsDetailUrl2, true);
 
         String allVfResourcesDetailUrl = refProp.getStringValue("sdc.catalog.url") + "resources?resourceType=VF";
-        Mockito.doReturn(IOUtils
-                .toString(SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcVFResources.json"), "UTF-8"))
+        Mockito.doReturn(IOUtils.toString(
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcVFResources.json"), "UTF-8"))
                 .when(spy).getCldsServicesOrResourcesBasedOnURL(allVfResourcesDetailUrl, false);
 
-        String cVfcResourcesDetailUrl = refProp.getStringValue("sdc.catalog.url")
+        String vfcResourcesDetailUrl = refProp.getStringValue("sdc.catalog.url")
                 + "resources/a0475018-1e7e-4ddd-8bee-33cbf958c2e6/metadata";
         Mockito.doReturn(IOUtils.toString(
-                SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcCVFCResourceExample.json"), "UTF-8"))
-                .when(spy).getCldsServicesOrResourcesBasedOnURL(cVfcResourcesDetailUrl, false);
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcCVFCResourceExample.json"),
+                "UTF-8")).when(spy).getCldsServicesOrResourcesBasedOnURL(vfcResourcesDetailUrl, false);
 
         String allVfcResourcesDetailUrl = refProp.getStringValue("sdc.catalog.url") + "resources?resourceType=VFC";
-        Mockito.doReturn(IOUtils
-                .toString(SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcVFCResources.json"), "UTF-8"))
+        Mockito.doReturn(IOUtils.toString(
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcVFCResources.json"), "UTF-8"))
                 .when(spy).getCldsServicesOrResourcesBasedOnURL(allVfcResourcesDetailUrl, false);
 
         String allVfAlarms = refProp.getStringValue("sdc.catalog.url")
                 + "resources/84855843-5247-4e97-a2bd-5395a510253b/artifacts/d57ac7ec-f3c3-4793-983a-c75ac3a43153";
         Mockito.doReturn(IOUtils.toString(
-                SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcMeasurementsList.csv"), "UTF-8"))
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcMeasurementsList.csv"), "UTF-8"))
                 .when(spy).getCldsServicesOrResourcesBasedOnURL(allVfAlarms, true);
 
         String vfcResourceExample = refProp.getStringValue("sdc.catalog.url")
                 + "resources/d7646638-2572-4a94-b497-c028ac15f9ca/metadata";
         Mockito.doReturn(IOUtils.toString(
-                SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcVFCResourceExample.json"), "UTF-8"))
+                SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcVFCResourceExample.json"), "UTF-8"))
                 .when(spy).getCldsServicesOrResourcesBasedOnURL(vfcResourceExample, false);
 
         CldsServiceData cldsServiceData = spy
diff --git a/src/test/java/org/onap/clamp/clds/it/TcaRequestFormatterIT.java b/src/test/java/org/onap/clamp/clds/it/TcaRequestFormatterItCase.java
index 89ff5792..a32743a6 100644
--- a/src/test/java/org/onap/clamp/clds/it/TcaRequestFormatterIT.java
+++ b/src/test/java/org/onap/clamp/clds/it/TcaRequestFormatterItCase.java
@@ -31,7 +31,7 @@ import java.io.IOException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.AbstractIT;
+import org.onap.clamp.clds.AbstractItCase;
 import org.onap.clamp.clds.client.req.TcaRequestFormatter;
 import org.onap.clamp.clds.model.CldsEvent;
 import org.onap.clamp.clds.model.prop.ModelProperties;
@@ -42,12 +42,12 @@ import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * Test Onap TcaPolicyReq features
+ * Test Onap TcaRequestFormatter features.
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @TestPropertySource(locations = "classpath:application-no-camunda.properties")
-public class TcaRequestFormatterIT extends AbstractIT {
+public class TcaRequestFormatterItCase extends AbstractItCase {
 
     String modelProp;
     String modelBpmn;