diff options
Diffstat (limited to 'models-interactions/model-impl')
37 files changed, 314 insertions, 404 deletions
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java index 2b51a7bde..20998ae0c 100644 --- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java +++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java @@ -45,6 +45,8 @@ public final class AaiManager { /** The Constant logger. */ private static final Logger logger = LoggerFactory.getLogger(AaiManager.class); + private static final String APPLICATION_JSON = "application/json"; + /** The rest manager. */ // The REST manager used for processing REST calls for this AAI manager private final RestManager restManager; @@ -77,7 +79,7 @@ public final class AaiManager { return null; } else { JSONObject responseObj = new JSONObject(getResponse); - JSONArray resultsArray = new JSONArray(); + JSONArray resultsArray; if (responseObj.has("result-data")) { resultsArray = (JSONArray) responseObj.get("result-data"); } else { @@ -138,7 +140,7 @@ public final class AaiManager { url = url + CQ_URL; Pair<Integer, String> httpDetails = - this.restManager.put(url, username, password, headers, "application/json", requestJson); + this.restManager.put(url, username, password, headers, APPLICATION_JSON, requestJson); logger.debug("RestManager.put after"); if (httpDetails == null) { @@ -232,7 +234,7 @@ public final class AaiManager { String requestJson = Serialization.gsonPretty.toJson(request); NetLoggerUtil.log(EventType.OUT, CommInfrastructure.REST, url, requestJson); Pair<Integer, String> httpDetails = - restManager.post(url, username, password, headers, "application/json", requestJson); + restManager.post(url, username, password, headers, APPLICATION_JSON, requestJson); logger.debug("RestManager.post after"); if (httpDetails == null) { @@ -360,7 +362,7 @@ public final class AaiManager { headers.put("X-FromAppId", "POLICY"); headers.put("X-TransactionId", requestId.toString()); - headers.put("Accept", "application/json"); + headers.put("Accept", APPLICATION_JSON); return headers; } diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiCqResponseTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiCqResponseTest.java index efdba10a3..8335ce80b 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiCqResponseTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiCqResponseTest.java @@ -40,6 +40,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class AaiCqResponseTest { + private static final String ETE_VFMODULE = "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0"; + private static final String ETE_VNF = "Ete_vFWCLvFWSNK_7ba1fbde_0"; private static final Logger LOGGER = LoggerFactory.getLogger(AaiCqResponseTest.class); private static final String CQ_RESPONSE_SAMPLE = "src/test/resources/org/onap/policy/aai/AaiCqResponseFull.json"; @@ -168,7 +170,7 @@ public class AaiCqResponseTest { aaiCqResponse = new AaiCqResponse(responseString); GenericVnf genVnf = aaiCqResponse.getDefaultGenericVnf(); assertNotNull(genVnf); - assertEquals("Ete_vFWCLvFWSNK_7ba1fbde_0", genVnf.getVnfName()); + assertEquals(ETE_VNF, genVnf.getVnfName()); LOGGER.info(genVnf.getVnfName()); } @@ -181,7 +183,7 @@ public class AaiCqResponseTest { AaiCqResponse aaiCqResponse; aaiCqResponse = new AaiCqResponse(responseString); - GenericVnf genVnf = aaiCqResponse.getGenericVnfByVnfName("Ete_vFWCLvFWSNK_7ba1fbde_0"); + GenericVnf genVnf = aaiCqResponse.getGenericVnfByVnfName(ETE_VNF); assertNotNull(genVnf); assertEquals("f17face5-69cb-4c88-9e0b-7426db7edddd", genVnf.getVnfId()); LOGGER.info(genVnf.getVnfId()); @@ -214,7 +216,7 @@ public class AaiCqResponseTest { GenericVnf genVnf = aaiCqResponse.getGenericVnfByVfModuleModelInvariantId("e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e"); assertNotNull(genVnf); - assertEquals("Ete_vFWCLvFWSNK_7ba1fbde_0", genVnf.getVnfName()); + assertEquals(ETE_VNF, genVnf.getVnfName()); LOGGER.info(genVnf.getVnfName()); } @@ -245,9 +247,9 @@ public class AaiCqResponseTest { AaiCqResponse aaiCqResponse; aaiCqResponse = new AaiCqResponse(responseString); - VfModule vfModule = aaiCqResponse.getVfModuleByVfModuleName("Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0"); + VfModule vfModule = aaiCqResponse.getVfModuleByVfModuleName(ETE_VFMODULE); assertNotNull(vfModule); - assertEquals("Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0", vfModule.getVfModuleName()); + assertEquals(ETE_VFMODULE, vfModule.getVfModuleName()); LOGGER.info(vfModule.getVfModuleName()); @@ -263,7 +265,7 @@ public class AaiCqResponseTest { aaiCqResponse = new AaiCqResponse(responseString); VfModule vfModule = aaiCqResponse.getVfModuleByVfModelInvariantId("e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e"); assertNotNull(vfModule); - assertEquals("Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0", vfModule.getVfModuleName()); + assertEquals(ETE_VFMODULE, vfModule.getVfModuleName()); LOGGER.info(vfModule.getVfModuleName()); @@ -279,7 +281,7 @@ public class AaiCqResponseTest { aaiCqResponse = new AaiCqResponse(responseString); VfModule vfModule = aaiCqResponse.getDefaultVfModule(); assertNotNull(vfModule); - assertEquals("Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0", vfModule.getVfModuleName()); + assertEquals(ETE_VFMODULE, vfModule.getVfModuleName()); LOGGER.info(vfModule.getVfModuleName()); } @@ -293,7 +295,7 @@ public class AaiCqResponseTest { aaiCqResponse = new AaiCqResponse(responseString); Vserver vserver = aaiCqResponse.getVserver(); assertNotNull(vserver); - assertEquals("Ete_vFWCLvFWSNK_7ba1fbde_0", vserver.getVserverName()); + assertEquals(ETE_VNF, vserver.getVserverName()); LOGGER.info(vserver.getVserverName()); } diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiManagerTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiManagerTest.java index 7842b076c..9a8d7d260 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiManagerTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiManagerTest.java @@ -44,6 +44,12 @@ import org.onap.policy.rest.RestManager; import org.onap.policy.rest.RestManager.Pair; public class AaiManagerTest { + private static final String VSERVER_NAME = "vserverName"; + private static final String CQ_QUERY_URL = "http://testing.cq.query"; + private static final String WITCH = "Witch"; + private static final String DOROTHY = "Dorothy"; + private static final String SOME_URL = "http://somewhere.over.the.rainbow"; + private static final String ANOTHER_URL = "http://somewhere.under.the.rainbow"; RestManager restManagerMock; UUID aaiNqRequestUuid = UUID.randomUUID(); Pair<Integer, String> httpResponseOk; @@ -92,14 +98,14 @@ public class AaiManagerTest { UUID vserverNameRequestId = UUID.randomUUID(); - when(restManagerMock.put(startsWith("http://testing.cq.query"), eq("Foo"), eq("Bar"), anyMap(), anyString(), + when(restManagerMock.put(startsWith(CQ_QUERY_URL), eq("Foo"), eq("Bar"), anyMap(), anyString(), anyString())).thenReturn(httpCqResponseOk); - when(restManagerMock.get(startsWith("http://testing.cq.query"), eq("Foo"), eq("Bar"), anyMap())) + when(restManagerMock.get(startsWith(CQ_QUERY_URL), eq("Foo"), eq("Bar"), anyMap())) .thenReturn(httpTenantResponseOk); AaiCqResponse aaiCqResponse = - aaiManager.getCustomQueryResponse("http://testing.cq.query", "Foo", "Bar", vserverNameRequestId, "Foo"); + aaiManager.getCustomQueryResponse(CQ_QUERY_URL, "Foo", "Bar", vserverNameRequestId, "Foo"); assertNotNull(aaiCqResponse); when(restManagerMock.put(eq(""), eq("Foo"), eq("Bar"), anyMap(), anyString(), anyString())) @@ -146,30 +152,30 @@ public class AaiManagerTest { AaiNqRequest aaiNqRequest = new AaiNqRequest(); aaiNqRequest.setQueryParameters(aaiNqQueryParameters); - when(restManagerMock.post(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Gale"), anyMap(), + when(restManagerMock.post(startsWith(SOME_URL), eq(DOROTHY), eq("Gale"), anyMap(), anyString(), anyString())).thenReturn(httpResponseOk); - AaiNqResponse aaiNqOkResponse = aaiManager.postQuery("http://somewhere.over.the.rainbow", "Dorothy", "Gale", + AaiNqResponse aaiNqOkResponse = aaiManager.postQuery(SOME_URL, DOROTHY, "Gale", aaiNqRequest, aaiNqRequestUuid); assertNotNull(aaiNqOkResponse); - when(restManagerMock.post(isNull(), eq("Dorothy"), anyString(), anyMap(), anyString(), anyString())) + when(restManagerMock.post(isNull(), eq(DOROTHY), anyString(), anyMap(), anyString(), anyString())) .thenReturn(null); - AaiNqResponse aaiNqNullResponse = aaiManager.postQuery(null, "Dorothy", "Gale", null, aaiNqRequestUuid); + AaiNqResponse aaiNqNullResponse = aaiManager.postQuery(null, DOROTHY, "Gale", null, aaiNqRequestUuid); assertNull(aaiNqNullResponse); - when(restManagerMock.post(startsWith("http://somewhere.over.the.rainbow"), eq("Witch"), eq("West"), anyMap(), + when(restManagerMock.post(startsWith(SOME_URL), eq(WITCH), eq("West"), anyMap(), anyString(), anyString())).thenReturn(httpResponseErr0); - AaiNqResponse aaiNqNotOkResponse0 = aaiManager.postQuery("http://somewhere.over.the.rainbow", "Witch", "West", + AaiNqResponse aaiNqNotOkResponse0 = aaiManager.postQuery(SOME_URL, WITCH, "West", aaiNqRequest, aaiNqRequestUuid); assertNull(aaiNqNotOkResponse0); - when(restManagerMock.post(startsWith("http://somewhere.under.the.rainbow"), eq("Witch"), eq("West"), anyMap(), + when(restManagerMock.post(startsWith(ANOTHER_URL), eq(WITCH), eq("West"), anyMap(), anyString(), anyString())).thenReturn(httpResponseErr1); - AaiNqResponse aaiNqNotOkResponse1 = aaiManager.postQuery("http://somewhere.under.the.rainbow", "Witch", "West", + AaiNqResponse aaiNqNotOkResponse1 = aaiManager.postQuery(ANOTHER_URL, WITCH, "West", aaiNqRequest, aaiNqRequestUuid); assertNull(aaiNqNotOkResponse1); } @@ -181,22 +187,22 @@ public class AaiManagerTest { UUID vserverNameRequestId = UUID.randomUUID(); - when(restManagerMock.get(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Gale"), anyMap())) + when(restManagerMock.get(startsWith(SOME_URL), eq(DOROTHY), eq("Gale"), anyMap())) .thenReturn(httpResponseOk); - AaiGetVserverResponse vserverResponse = aaiManager.getQueryByVserverName("http://somewhere.over.the.rainbow", - "Dorothy", "Gale", vserverNameRequestId, "vserverName"); + AaiGetVserverResponse vserverResponse = aaiManager.getQueryByVserverName(SOME_URL, + DOROTHY, "Gale", vserverNameRequestId, VSERVER_NAME); assertNotNull(vserverResponse); AaiGetVserverResponse vserverNullResponse = - aaiManager.getQueryByVserverName(null, "Dorothy", "Gale", vserverNameRequestId, "vserverName"); + aaiManager.getQueryByVserverName(null, DOROTHY, "Gale", vserverNameRequestId, VSERVER_NAME); assertNull(vserverNullResponse); - when(restManagerMock.get(startsWith("http://somewhere.under.the.rainbow"), eq("Witch"), eq("West"), anyMap())) + when(restManagerMock.get(startsWith(ANOTHER_URL), eq(WITCH), eq("West"), anyMap())) .thenReturn(httpResponseErr0); AaiGetVserverResponse vserverNotOkResponse0 = aaiManager.getQueryByVserverName( - "http://somewhere.under.the.rainbow", "Witch", "West", vserverNameRequestId, "vserverName"); + ANOTHER_URL, WITCH, "West", vserverNameRequestId, VSERVER_NAME); assertNull(vserverNotOkResponse0); } @@ -207,10 +213,10 @@ public class AaiManagerTest { UUID vserverNameRequestId = UUID.randomUUID(); - when(restManagerMock.get(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Gale"), anyMap())) + when(restManagerMock.get(startsWith(SOME_URL), eq(DOROTHY), eq("Gale"), anyMap())) .thenReturn(httpResponseOk); - AaiGetVnfResponse vnfResponse = aaiManager.getQueryByVnfId("http://somewhere.over.the.rainbow", "Dorothy", + AaiGetVnfResponse vnfResponse = aaiManager.getQueryByVnfId(SOME_URL, DOROTHY, "Gale", vserverNameRequestId, "vnfID"); assertNotNull(vnfResponse); } @@ -222,10 +228,10 @@ public class AaiManagerTest { UUID vserverNameRequestId = UUID.randomUUID(); - when(restManagerMock.get(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Gale"), anyMap())) + when(restManagerMock.get(startsWith(SOME_URL), eq(DOROTHY), eq("Gale"), anyMap())) .thenReturn(httpResponseOk); - AaiGetVnfResponse vnfResponse = aaiManager.getQueryByVnfId("http://somewhere.over.the.rainbow", "Dorothy", + AaiGetVnfResponse vnfResponse = aaiManager.getQueryByVnfId(SOME_URL, DOROTHY, "Gale", vserverNameRequestId, "vnfName"); assertNotNull(vnfResponse); } diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqCloudRegionTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqCloudRegionTest.java index 6932031db..9bdc758ed 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqCloudRegionTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqCloudRegionTest.java @@ -24,18 +24,10 @@ package org.onap.policy.aai; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; public class AaiNqCloudRegionTest { - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { AaiNqCloudRegion aaiNqCloudRegion = new AaiNqCloudRegion(); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqExtraPropertiesTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqExtraPropertiesTest.java index e1ac2379c..ed76f8a12 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqExtraPropertiesTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqExtraPropertiesTest.java @@ -23,18 +23,10 @@ package org.onap.policy.aai; import static org.junit.Assert.assertNotNull; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; public class AaiNqExtraPropertiesTest { - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { AaiNqExtraProperties aaiNqExtraProperties = new AaiNqExtraProperties(); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqExtraPropertyTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqExtraPropertyTest.java index ebc64efc9..483753679 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqExtraPropertyTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqExtraPropertyTest.java @@ -24,18 +24,10 @@ package org.onap.policy.aai; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; public class AaiNqExtraPropertyTest { - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { AaiNqExtraProperty aaiNqExtraProperty = new AaiNqExtraProperty(); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqGenericVnfTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqGenericVnfTest.java index e30bcaf86..93119c73e 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqGenericVnfTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqGenericVnfTest.java @@ -24,17 +24,12 @@ package org.onap.policy.aai; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; public class AaiNqGenericVnfTest { - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} + private static final String VERSION_ID = "98f410f6-4c63-447b-97d2-42508437cec0"; + private static final String INVARIANT_ID = "653d2caa-7e47-4614-95b3-26c8d82755b8"; @Test public void test() { @@ -44,12 +39,12 @@ public class AaiNqGenericVnfTest { aaiNqGenericVnf.setIpv4Loopback0Address("aa"); aaiNqGenericVnf.setIpv4OamAddress("oamAddress"); aaiNqGenericVnf.setIsClosedLoopDisabled(false); - aaiNqGenericVnf.setModelInvariantId("653d2caa-7e47-4614-95b3-26c8d82755b8"); - aaiNqGenericVnf.setModelVersionId("98f410f6-4c63-447b-97d2-42508437cec0"); + aaiNqGenericVnf.setModelInvariantId(INVARIANT_ID); + aaiNqGenericVnf.setModelVersionId(VERSION_ID); aaiNqGenericVnf.setModelCustomizationId("SomeCustomizationId"); aaiNqGenericVnf.setOperationalState("active"); - aaiNqGenericVnf.setPersonaModelId("653d2caa-7e47-4614-95b3-26c8d82755b8"); - aaiNqGenericVnf.setPersonaModelVersion("98f410f6-4c63-447b-97d2-42508437cec0"); + aaiNqGenericVnf.setPersonaModelId(INVARIANT_ID); + aaiNqGenericVnf.setPersonaModelVersion(VERSION_ID); aaiNqGenericVnf.setProvStatus("complete"); aaiNqGenericVnf.setResourceVersion("1505056714553"); aaiNqGenericVnf.setServiceId("e8cb8968-5411-478b-906a-f28747de72cd"); @@ -64,12 +59,12 @@ public class AaiNqGenericVnfTest { assertEquals("aa", aaiNqGenericVnf.getIpv4Loopback0Address()); assertEquals("oamAddress", aaiNqGenericVnf.getIpv4OamAddress()); assertEquals(false, aaiNqGenericVnf.getIsClosedLoopDisabled()); - assertEquals("653d2caa-7e47-4614-95b3-26c8d82755b8", aaiNqGenericVnf.getModelInvariantId()); - assertEquals("98f410f6-4c63-447b-97d2-42508437cec0", aaiNqGenericVnf.getModelVersionId()); + assertEquals(INVARIANT_ID, aaiNqGenericVnf.getModelInvariantId()); + assertEquals(VERSION_ID, aaiNqGenericVnf.getModelVersionId()); assertEquals("SomeCustomizationId", aaiNqGenericVnf.getModelCustomizationId()); assertEquals("active", aaiNqGenericVnf.getOperationalState()); - assertEquals("653d2caa-7e47-4614-95b3-26c8d82755b8", aaiNqGenericVnf.getPersonaModelId()); - assertEquals("98f410f6-4c63-447b-97d2-42508437cec0", aaiNqGenericVnf.getPersonaModelVersion()); + assertEquals(INVARIANT_ID, aaiNqGenericVnf.getPersonaModelId()); + assertEquals(VERSION_ID, aaiNqGenericVnf.getPersonaModelVersion()); assertEquals("complete", aaiNqGenericVnf.getProvStatus()); assertEquals("1505056714553", aaiNqGenericVnf.getResourceVersion()); assertEquals("e8cb8968-5411-478b-906a-f28747de72cd", aaiNqGenericVnf.getServiceId()); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqInstanceFiltersTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqInstanceFiltersTest.java index 0c487d437..4b4cc6a6a 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqInstanceFiltersTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqInstanceFiltersTest.java @@ -23,18 +23,10 @@ package org.onap.policy.aai; import static org.junit.Assert.assertNotNull; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; public class AaiNqInstanceFiltersTest { - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { AaiNqInstanceFilters aaiNqInstanceFilters = new AaiNqInstanceFilters(); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqInventoryResponseItemTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqInventoryResponseItemTest.java index 97384db76..79f23b629 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqInventoryResponseItemTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqInventoryResponseItemTest.java @@ -24,27 +24,27 @@ package org.onap.policy.aai; import static org.junit.Assert.assertNotNull; import java.util.LinkedList; - -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.aai.util.Serialization; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class AaiNqInventoryResponseItemTest { + private static final String WIDGET = "widget"; + private static final String SERVICE_INSTANCE = "service-instance"; + private static final String MODEL_VERSION_KEY = "model.model-version"; + private static final String MODEL_TYPE_KEY = "model.model-type"; + private static final String MODEL_NAME_KEY = "model.model-name"; + private static final String MODEL_ID_KEY = "model.model-id"; + private static final String PERSONA_MODEL_ID2 = "ef86f9c5-2165-44f3-8fc3-96018b609ea5"; + private static final String PERSONA_MODEL_ID = "82194af1-3c2c-485a-8f44-420e22a9eaa4"; + private static final String RESOURCE_VERSION = "1485366450"; private static final Logger logger = LoggerFactory.getLogger(AaiNqInventoryResponseItemTest.class); - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { AaiNqInventoryResponseItem aaiNqInventoryResponseItem = new AaiNqInventoryResponseItem(); - aaiNqInventoryResponseItem.setModelName("service-instance"); + aaiNqInventoryResponseItem.setModelName(SERVICE_INSTANCE); AaiNqCloudRegion aaiNqCloudRegion = new AaiNqCloudRegion(); aaiNqCloudRegion.setCloudOwner("OWNER"); aaiNqCloudRegion.setCloudRegionId("REGIONID"); @@ -54,11 +54,11 @@ public class AaiNqInventoryResponseItemTest { aaiNqInventoryResponseItem.setCloudRegion(aaiNqCloudRegion); AaiNqExtraProperties aaiNqExtraProperties = new AaiNqExtraProperties(); aaiNqExtraProperties.setExtraProperty(new LinkedList<>()); - aaiNqExtraProperties.getExtraProperty().add(new AaiNqExtraProperty("model.model-name", "generic-vnf")); - aaiNqExtraProperties.getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget")); - aaiNqExtraProperties.getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0")); + aaiNqExtraProperties.getExtraProperty().add(new AaiNqExtraProperty(MODEL_NAME_KEY, "generic-vnf")); + aaiNqExtraProperties.getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET)); + aaiNqExtraProperties.getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0")); aaiNqExtraProperties.getExtraProperty() - .add(new AaiNqExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c")); + .add(new AaiNqExtraProperty(MODEL_ID_KEY, "acc6edd8-a8d4-4b93-afaa-0994068be14c")); aaiNqExtraProperties.getExtraProperty() .add(new AaiNqExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9")); aaiNqInventoryResponseItem.setExtraProperties(aaiNqExtraProperties); @@ -74,29 +74,29 @@ public class AaiNqInventoryResponseItemTest { aaiNqGenericVnf.setIpv4Loopback0Address("dhv-test-gvnfipv4-loopback0-address"); aaiNqGenericVnf.setInMaint(false); aaiNqGenericVnf.setIsClosedLoopDisabled(false); - aaiNqGenericVnf.setResourceVersion("1485366450"); + aaiNqGenericVnf.setResourceVersion(RESOURCE_VERSION); aaiNqGenericVnf.setEncrypedAccessFlag(true); aaiNqGenericVnf.setPersonaModelId("acc6edd8-a8d4-4b93-afaa-0994068be14c"); aaiNqGenericVnf.setPersonaModelVersion("1.0"); aaiNqInventoryResponseItem.setGenericVnf(aaiNqGenericVnf); AaiNqInventoryResponseItem serviceItem = new AaiNqInventoryResponseItem(); - serviceItem.setModelName("service-instance"); + serviceItem.setModelName(SERVICE_INSTANCE); serviceItem.setServiceInstance(new AaiNqServiceInstance()); serviceItem.getServiceInstance().setServiceInstanceId("dhv-test-vhnfportal-service-instance-id"); serviceItem.getServiceInstance().setServiceInstanceName("dhv-test-service-instance-name1"); - serviceItem.getServiceInstance().setPersonaModelId("82194af1-3c2c-485a-8f44-420e22a9eaa4"); + serviceItem.getServiceInstance().setPersonaModelId(PERSONA_MODEL_ID); serviceItem.getServiceInstance().setPersonaModelVersion("1.0"); serviceItem.getServiceInstance().setServiceInstanceLocationId("dhv-test-service-instance-location-id1"); serviceItem.getServiceInstance().setResourceVersion("1485366092"); serviceItem.setExtraProperties(new AaiNqExtraProperties()); serviceItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "service-instance")); - serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget")); - serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, SERVICE_INSTANCE)); + serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET)); + serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0")); serviceItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4")); + .add(new AaiNqExtraProperty(MODEL_ID_KEY, PERSONA_MODEL_ID)); serviceItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "46b92144-923a-4d20-b85a-3cbd847668a9")); AaiNqInventoryResponseItem vfModuleItem = new AaiNqInventoryResponseItem(); vfModuleItem.setModelName("vf-module"); @@ -106,21 +106,21 @@ public class AaiNqInventoryResponseItemTest { vfModuleItem.getVfModule().setHeatStackId("example-heat-stack-id-val-86300"); vfModuleItem.getVfModule().setOrchestrationStatus("example-orchestration-status-val-56523"); vfModuleItem.getVfModule().setIsBaseVfModule(true); - vfModuleItem.getVfModule().setResourceVersion("1485366450"); - vfModuleItem.getVfModule().setPersonaModelId("ef86f9c5-2165-44f3-8fc3-96018b609ea5"); + vfModuleItem.getVfModule().setResourceVersion(RESOURCE_VERSION); + vfModuleItem.getVfModule().setPersonaModelId(PERSONA_MODEL_ID2); vfModuleItem.getVfModule().setPersonaModelVersion("1.0"); vfModuleItem.getVfModule().setWidgetModelId("example-widget-model-id-val-92571"); vfModuleItem.getVfModule().setWidgetModelVersion("example-widget-model-version-val-83317"); vfModuleItem.getVfModule().setContrailServiceInstanceFqdn("example-contrail-service-instance-fqdn-val-86796"); vfModuleItem.setExtraProperties(new AaiNqExtraProperties()); vfModuleItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "vf-module")); - vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget")); - vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "vf-module")); + vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET)); + vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0")); vfModuleItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5")); + .add(new AaiNqExtraProperty(MODEL_ID_KEY, PERSONA_MODEL_ID2)); vfModuleItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "c00563ae-812b-4e62-8330-7c4d0f47088a")); AaiNqInventoryResponseItems aaiNqInventoryResponseItems = new AaiNqInventoryResponseItems(); aaiNqInventoryResponseItems.getInventoryResponseItems().add(serviceItem); @@ -130,7 +130,7 @@ public class AaiNqInventoryResponseItemTest { AaiNqServiceInstance serviceInstance = new AaiNqServiceInstance(); serviceInstance.setServiceInstanceId("dhv-test-vhnfportal-service-instance-id"); serviceInstance.setServiceInstanceName("dhv-test-service-instance-name1"); - serviceInstance.setPersonaModelId("82194af1-3c2c-485a-8f44-420e22a9eaa4"); + serviceInstance.setPersonaModelId(PERSONA_MODEL_ID); serviceInstance.setPersonaModelVersion("1.0"); serviceInstance.setServiceInstanceLocationId("dhv-test-service-instance-location-id1"); serviceInstance.setResourceVersion("1485366092"); @@ -146,8 +146,8 @@ public class AaiNqInventoryResponseItemTest { aaiNqVfModule.setHeatStackId("example-heat-stack-id-val-86300"); aaiNqVfModule.setOrchestrationStatus("example-orchestration-status-val-56523"); aaiNqVfModule.setIsBaseVfModule(true); - aaiNqVfModule.setResourceVersion("1485366450"); - aaiNqVfModule.setPersonaModelId("ef86f9c5-2165-44f3-8fc3-96018b609ea5"); + aaiNqVfModule.setResourceVersion(RESOURCE_VERSION); + aaiNqVfModule.setPersonaModelId(PERSONA_MODEL_ID2); aaiNqVfModule.setPersonaModelVersion("1.0"); aaiNqVfModule.setWidgetModelId("example-widget-model-id-val-92571"); aaiNqVfModule.setWidgetModelVersion("example-widget-model-version-val-83317"); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqInventoryResponseItemsTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqInventoryResponseItemsTest.java index f43d7c777..ef1dd4e09 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqInventoryResponseItemsTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqInventoryResponseItemsTest.java @@ -25,28 +25,25 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.util.LinkedList; - -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.aai.util.Serialization; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class AaiNqInventoryResponseItemsTest { + private static final String WIDGET = "widget"; + private static final String SERVICE_INSTANCE = "service-instance"; + private static final String MODEL_VERSION_KEY = "model.model-version"; + private static final String MODEL_TYPE_KEY = "model.model-type"; + private static final String MODEL_NAME_KEY = "model.model-name"; + private static final String MODEL_ID_KEY = "model.model-id"; private static final Logger logger = LoggerFactory.getLogger(AaiNqInventoryResponseItemsTest.class); - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { AaiNqInventoryResponseItem serviceItem = new AaiNqInventoryResponseItem(); - serviceItem.setModelName("service-instance"); - assertEquals("service-instance", serviceItem.getModelName()); + serviceItem.setModelName(SERVICE_INSTANCE); + assertEquals(SERVICE_INSTANCE, serviceItem.getModelName()); serviceItem.setServiceInstance(new AaiNqServiceInstance()); serviceItem.getServiceInstance().setServiceInstanceId("dhv-test-vhnfportal-service-instance-id"); @@ -57,13 +54,13 @@ public class AaiNqInventoryResponseItemsTest { serviceItem.getServiceInstance().setResourceVersion("1485366092"); serviceItem.setExtraProperties(new AaiNqExtraProperties()); serviceItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "service-instance")); - serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget")); - serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, SERVICE_INSTANCE)); + serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET)); + serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0")); serviceItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4")); + .add(new AaiNqExtraProperty(MODEL_ID_KEY, "82194af1-3c2c-485a-8f44-420e22a9eaa4")); serviceItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "46b92144-923a-4d20-b85a-3cbd847668a9")); AaiNqInventoryResponseItem vfModuleItem = new AaiNqInventoryResponseItem(); vfModuleItem.setModelName("vf-module"); @@ -81,13 +78,13 @@ public class AaiNqInventoryResponseItemsTest { vfModuleItem.getVfModule().setContrailServiceInstanceFqdn("example-contrail-service-instance-fqdn-val-86796"); vfModuleItem.setExtraProperties(new AaiNqExtraProperties()); vfModuleItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "vf-module")); - vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget")); - vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "vf-module")); + vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET)); + vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0")); vfModuleItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5")); + .add(new AaiNqExtraProperty(MODEL_ID_KEY, "ef86f9c5-2165-44f3-8fc3-96018b609ea5")); vfModuleItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "c00563ae-812b-4e62-8330-7c4d0f47088a")); AaiNqInventoryResponseItem genericVnfItem = new AaiNqInventoryResponseItem(); genericVnfItem.setModelName("generic-vnf"); @@ -110,13 +107,13 @@ public class AaiNqInventoryResponseItemsTest { genericVnfItem.setExtraProperties(new AaiNqExtraProperties()); genericVnfItem.getExtraProperties().setExtraProperty(new LinkedList<>()); genericVnfItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "generic-vnf")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "generic-vnf")); genericVnfItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-type", "widget")); + .add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET)); genericVnfItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-version", "1.0")); + .add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0")); genericVnfItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c")); + .add(new AaiNqExtraProperty(MODEL_ID_KEY, "acc6edd8-a8d4-4b93-afaa-0994068be14c")); genericVnfItem.getExtraProperties().getExtraProperty() .add(new AaiNqExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9")); genericVnfItem.setItems(new AaiNqInventoryResponseItems()); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqNamedQueryTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqNamedQueryTest.java index 2986f6db6..a4344d8e6 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqNamedQueryTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqNamedQueryTest.java @@ -25,19 +25,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.util.UUID; - -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; public class AaiNqNamedQueryTest { - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { AaiNqNamedQuery aaiNqNamedQuery = new AaiNqNamedQuery(); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqQueryParametersTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqQueryParametersTest.java index 22c1b4bbf..f304713f9 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqQueryParametersTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqQueryParametersTest.java @@ -25,19 +25,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.util.UUID; - -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; public class AaiNqQueryParametersTest { - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { AaiNqQueryParameters aaiNqQueryParameters = new AaiNqQueryParameters(); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqRequestTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqRequestTest.java index a8863197e..35108a03a 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqRequestTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqRequestTest.java @@ -25,9 +25,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.util.UUID; - -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.aai.util.Serialization; import org.slf4j.Logger; @@ -36,12 +33,6 @@ import org.slf4j.LoggerFactory; public class AaiNqRequestTest { private static final Logger logger = LoggerFactory.getLogger(AaiNqRequestTest.class); - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { AaiNqRequest aaiNqRequest = new AaiNqRequest(); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqResponseTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqResponseTest.java index 9b3a4afee..ba160e2c7 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqResponseTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqResponseTest.java @@ -29,6 +29,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class AaiNqResponseTest { + private static final String WIDGET = "widget"; + private static final String MODEL_VERSION_KEY = "model.model-version"; + private static final String MODEL_TYPE_KEY = "model.model-type"; + private static final String MODEL_NAME_KEY = "model.model-name"; + private static final String MODEL_ID_KEY = "model.model-id"; private static final Logger logger = LoggerFactory.getLogger(AaiNqResponseTest.class); @Test @@ -53,13 +58,13 @@ public class AaiNqResponseTest { serviceItem.getServiceInstance().setResourceVersion("1485366092"); serviceItem.setExtraProperties(new AaiNqExtraProperties()); serviceItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "service-instance")); - serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget")); - serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "service-instance")); + serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET)); + serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0")); serviceItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4")); + .add(new AaiNqExtraProperty(MODEL_ID_KEY, "82194af1-3c2c-485a-8f44-420e22a9eaa4")); serviceItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "46b92144-923a-4d20-b85a-3cbd847668a9")); AaiNqInventoryResponseItem vfModuleItem = new AaiNqInventoryResponseItem(); vfModuleItem.setModelName("vf-module"); @@ -77,13 +82,13 @@ public class AaiNqResponseTest { vfModuleItem.getVfModule().setContrailServiceInstanceFqdn("example-contrail-service-instance-fqdn-val-86796"); vfModuleItem.setExtraProperties(new AaiNqExtraProperties()); vfModuleItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "vf-module")); - vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget")); - vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "vf-module")); + vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET)); + vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0")); vfModuleItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5")); + .add(new AaiNqExtraProperty(MODEL_ID_KEY, "ef86f9c5-2165-44f3-8fc3-96018b609ea5")); vfModuleItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "c00563ae-812b-4e62-8330-7c4d0f47088a")); AaiNqInventoryResponseItem genericVnfItem = new AaiNqInventoryResponseItem(); genericVnfItem.setModelName("generic-vnf"); @@ -106,13 +111,13 @@ public class AaiNqResponseTest { genericVnfItem.setExtraProperties(new AaiNqExtraProperties()); genericVnfItem.getExtraProperties().setExtraProperty(new LinkedList<>()); genericVnfItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "generic-vnf")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "generic-vnf")); genericVnfItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-type", "widget")); + .add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET)); genericVnfItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-version", "1.0")); + .add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0")); genericVnfItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c")); + .add(new AaiNqExtraProperty(MODEL_ID_KEY, "acc6edd8-a8d4-4b93-afaa-0994068be14c")); genericVnfItem.getExtraProperties().getExtraProperty() .add(new AaiNqExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9")); genericVnfItem.setItems(new AaiNqInventoryResponseItems()); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqResponseWrapperTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqResponseWrapperTest.java index 459454e3a..f80fd82bd 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqResponseWrapperTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqResponseWrapperTest.java @@ -37,6 +37,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class AaiNqResponseWrapperTest { + private static final String WIDGET = "widget"; + private static final String MODEL_VERSION_KEY = "model.model-version"; + private static final String MODEL_TYPE_KEY = "model.model-type"; + private static final String MODEL_NAME_KEY = "model.model-name"; + private static final String MODEL_ID_KEY = "model.model-id"; + private static final String VERSION_JSON = "AaiNqResponseWrapper-Vserver.json"; + private static final String NO_NAMES_JSON = "AaiNqResponseWrapper-NoNames.json"; private static final Logger logger = LoggerFactory.getLogger(AaiNqResponseWrapperTest.class); @Test @@ -52,13 +59,13 @@ public class AaiNqResponseWrapperTest { serviceItem.getServiceInstance().setResourceVersion("1485366092"); serviceItem.setExtraProperties(new AaiNqExtraProperties()); serviceItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "service-instance")); - serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget")); - serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "service-instance")); + serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET)); + serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0")); serviceItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4")); + .add(new AaiNqExtraProperty(MODEL_ID_KEY, "82194af1-3c2c-485a-8f44-420e22a9eaa4")); serviceItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "46b92144-923a-4d20-b85a-3cbd847668a9")); AaiNqInventoryResponseItem vfModuleItem = new AaiNqInventoryResponseItem(); vfModuleItem.setModelName("vf-module"); @@ -76,13 +83,13 @@ public class AaiNqResponseWrapperTest { vfModuleItem.getVfModule().setContrailServiceInstanceFqdn("example-contrail-service-instance-fqdn-val-86796"); vfModuleItem.setExtraProperties(new AaiNqExtraProperties()); vfModuleItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "vf-module")); - vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget")); - vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "vf-module")); + vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET)); + vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0")); vfModuleItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5")); + .add(new AaiNqExtraProperty(MODEL_ID_KEY, "ef86f9c5-2165-44f3-8fc3-96018b609ea5")); vfModuleItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "c00563ae-812b-4e62-8330-7c4d0f47088a")); AaiNqInventoryResponseItem genericVnfItem = new AaiNqInventoryResponseItem(); genericVnfItem.setModelName("generic-vnf"); @@ -105,13 +112,13 @@ public class AaiNqResponseWrapperTest { genericVnfItem.setExtraProperties(new AaiNqExtraProperties()); genericVnfItem.getExtraProperties().setExtraProperty(new LinkedList<>()); genericVnfItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-name", "generic-vnf")); + .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "generic-vnf")); genericVnfItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-type", "widget")); + .add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET)); genericVnfItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-version", "1.0")); + .add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0")); genericVnfItem.getExtraProperties().getExtraProperty() - .add(new AaiNqExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c")); + .add(new AaiNqExtraProperty(MODEL_ID_KEY, "acc6edd8-a8d4-4b93-afaa-0994068be14c")); genericVnfItem.getExtraProperties().getExtraProperty() .add(new AaiNqExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9")); genericVnfItem.setItems(new AaiNqInventoryResponseItems()); @@ -175,13 +182,13 @@ public class AaiNqResponseWrapperTest { // null item resp = new AaiNqResponseWrapper(); assertEquals(0, resp.countVfModules()); - + // no names - resp.setAaiNqResponse(load("AaiNqResponseWrapper-NoNames.json")); + resp.setAaiNqResponse(load(NO_NAMES_JSON)); assertEquals(0, resp.countVfModules()); // has VF modules - resp.setAaiNqResponse(load("AaiNqResponseWrapper-Vserver.json")); + resp.setAaiNqResponse(load(VERSION_JSON)); assertEquals(3, resp.countVfModules()); } @@ -192,13 +199,13 @@ public class AaiNqResponseWrapperTest { // null item resp = new AaiNqResponseWrapper(); assertEquals(null, resp.genVfModuleName()); - + // no names - resp.setAaiNqResponse(load("AaiNqResponseWrapper-NoNames.json")); + resp.setAaiNqResponse(load(NO_NAMES_JSON)); assertEquals(null, resp.genVfModuleName()); // has VF modules - resp.setAaiNqResponse(load("AaiNqResponseWrapper-Vserver.json")); + resp.setAaiNqResponse(load(VERSION_JSON)); assertEquals("my-module-abc_124", resp.genVfModuleName()); } @@ -220,25 +227,25 @@ public class AaiNqResponseWrapperTest { resp.getAaiNqResponse().getInventoryResponseItems().get(0).getItems().getInventoryResponseItems().get(0) .getItems().setInventoryResponseItems(null); assertTrue(resp.getVfModuleItems(false).isEmpty()); - + // no modules resp.setAaiNqResponse(load("AaiNqResponseWrapper-NoModules.json")); assertTrue(resp.getVfModuleItems(false).isEmpty()); - + // no names - resp.setAaiNqResponse(load("AaiNqResponseWrapper-NoNames.json")); + resp.setAaiNqResponse(load(NO_NAMES_JSON)); List<AaiNqInventoryResponseItem> lst; lst = resp.getVfModuleItems(false); assertEquals(0, lst.size()); // base VF modules - resp.setAaiNqResponse(load("AaiNqResponseWrapper-Vserver.json")); + resp.setAaiNqResponse(load(VERSION_JSON)); lst = resp.getVfModuleItems(true); assertEquals(1, lst.size()); assertEquals("Vfmodule_vLBMS-0809-1", lst.get(0).getVfModule().getVfModuleName()); - + // non base VF modules - resp.setAaiNqResponse(load("AaiNqResponseWrapper-Vserver.json")); + resp.setAaiNqResponse(load(VERSION_JSON)); lst = resp.getVfModuleItems(false); assertEquals(3, lst.size()); int index; diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqServiceInstanceTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqServiceInstanceTest.java index 4dc9b15e4..45a55c99b 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqServiceInstanceTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqServiceInstanceTest.java @@ -24,8 +24,6 @@ package org.onap.policy.aai; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.aai.util.Serialization; import org.slf4j.Logger; @@ -34,12 +32,6 @@ import org.slf4j.LoggerFactory; public class AaiNqServiceInstanceTest { private static final Logger logger = LoggerFactory.getLogger(AaiNqServiceInstanceTest.class); - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { AaiNqServiceInstance aaiNqServiceInstance = new AaiNqServiceInstance(); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqTenantTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqTenantTest.java index 4e03f57fc..ed4cdb705 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqTenantTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqTenantTest.java @@ -24,8 +24,6 @@ package org.onap.policy.aai; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.aai.util.Serialization; import org.slf4j.Logger; @@ -34,12 +32,6 @@ import org.slf4j.LoggerFactory; public class AaiNqTenantTest { private static final Logger logger = LoggerFactory.getLogger(AaiNqTenantTest.class); - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { AaiNqTenant aaiNqTenant = new AaiNqTenant(); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqVServerTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqVServerTest.java index c6a04a5eb..c613a0223 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqVServerTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqVServerTest.java @@ -27,8 +27,6 @@ import static org.junit.Assert.assertNotNull; import java.io.File; import java.nio.file.Files; import java.util.List; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.aai.util.Serialization; import org.slf4j.Logger; @@ -37,13 +35,6 @@ import org.slf4j.LoggerFactory; public class AaiNqVServerTest { private static final Logger logger = LoggerFactory.getLogger(AaiNqVServerTest.class); - - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() throws Exception { // deserialize json and verify fields are populated properly diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqVfModuleTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqVfModuleTest.java index da169d589..65bde98c2 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqVfModuleTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiNqVfModuleTest.java @@ -24,8 +24,6 @@ package org.onap.policy.aai; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.aai.util.Serialization; import org.slf4j.Logger; @@ -34,13 +32,6 @@ import org.slf4j.LoggerFactory; public class AaiNqVfModuleTest { private static final Logger logger = LoggerFactory.getLogger(AaiNqVfModuleTest.class); - - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { AaiNqVfModule aaiNqVfModule = new AaiNqVfModule(); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfInstanceTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfInstanceTest.java index ab397cd95..8cf839110 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfInstanceTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfInstanceTest.java @@ -27,27 +27,20 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.aai.util.Serialization; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class PnfInstanceTest { + private static final String PNF_NAME_TEST = "pnf-name-test"; private static final Logger logger = LoggerFactory.getLogger(PnfInstanceTest.class); - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { PnfInstance pnfInstance = new PnfInstance(); pnfInstance.setPnfInstanceName("pnf-instance-name-test"); - pnfInstance.setPnfName("pnf-name-test"); + pnfInstance.setPnfName(PNF_NAME_TEST); pnfInstance.setPnfType(PnfType.ENODEB); pnfInstance.setPnfSerial("pnf-serial-test"); assertNotNull(pnfInstance); @@ -59,7 +52,7 @@ public class PnfInstanceTest { PnfInstance pnfInstanceClone = new PnfInstance(pnfInstance); assertNotNull(pnfInstanceClone); - assertEquals("pnf-name-test", pnfInstanceClone.getPnfName()); + assertEquals(PNF_NAME_TEST, pnfInstanceClone.getPnfName()); assertEquals(PnfType.ENODEB, pnfInstanceClone.getPnfType()); assertEquals("pnf-serial-test", pnfInstanceClone.getPnfSerial()); @@ -69,7 +62,7 @@ public class PnfInstanceTest { assertNotEquals(0, new Pnf().hashCode()); PnfInstance pnfInstanceOther0 = new PnfInstance(); - pnfInstanceOther0.setPnfName("pnf-name-test"); + pnfInstanceOther0.setPnfName(PNF_NAME_TEST); PnfInstance pnfInstanceOther1 = new PnfInstance(pnfInstance); pnfInstanceOther1.setPnfName("pnf-name-test-diff"); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfTest.java index b5b152089..54cf4735b 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfTest.java @@ -27,33 +27,26 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.aai.util.Serialization; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class PnfTest { + private static final String PNF_NAME_TEST = "pnf-name-test"; private static final Logger logger = LoggerFactory.getLogger(PnfTest.class); - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { Pnf pnf = new Pnf(); - pnf.setPnfName("pnf-name-test"); + pnf.setPnfName(PNF_NAME_TEST); pnf.setPnfType(PnfType.ENODEB); assertNotNull(pnf); Pnf pnfClone = new Pnf(pnf); assertNotNull(pnfClone); - assertEquals("pnf-name-test", pnfClone.getPnfName()); + assertEquals(PNF_NAME_TEST, pnfClone.getPnfName()); assertEquals(PnfType.ENODEB, pnfClone.getPnfType()); assertEquals("PNF [PNFName=pnf-name-test, PNFType=eNodeB]", pnfClone.toString()); @@ -61,7 +54,7 @@ public class PnfTest { assertNotEquals(0, new Pnf().hashCode()); Pnf pnfOther = new Pnf(); - pnfOther.setPnfName("pnf-name-test"); + pnfOther.setPnfName(PNF_NAME_TEST); assertTrue(pnf.equals(pnf)); assertFalse(pnf.equals(null)); diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfTypeTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfTypeTest.java index 3a24d8c46..d3236904d 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfTypeTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfTypeTest.java @@ -23,8 +23,6 @@ package org.onap.policy.aai; import static org.junit.Assert.assertNotNull; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.aai.util.Serialization; import org.slf4j.Logger; @@ -33,13 +31,6 @@ import org.slf4j.LoggerFactory; public class PnfTypeTest { private static final Logger logger = LoggerFactory.getLogger(PnfTypeTest.class); - - @BeforeClass - public static void setUpBeforeClass() throws Exception {} - - @AfterClass - public static void tearDownAfterClass() throws Exception {} - @Test public void test() { PnfType pnfType = PnfType.ENODEB; diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/util/AaiExceptionTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/util/AaiExceptionTest.java index 4be8a53f6..c15407dd0 100644 --- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/util/AaiExceptionTest.java +++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/util/AaiExceptionTest.java @@ -29,12 +29,14 @@ import org.junit.Test; public class AaiExceptionTest { + private static final String MESSAGE = "message"; + @Test public void test() { assertNotNull(new AaiException()); - assertNotNull(new AaiException("message")); - assertNotNull(new AaiException("message", new IOException())); - assertNotNull(new AaiException("message", new IOException(), true, false)); + assertNotNull(new AaiException(MESSAGE)); + assertNotNull(new AaiException(MESSAGE, new IOException())); + assertNotNull(new AaiException(MESSAGE, new IOException(), true, false)); assertNotNull(new AaiException(new IOException())); } diff --git a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java index 5ff71e03a..ad8fc1f34 100644 --- a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java +++ b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java @@ -19,27 +19,6 @@ * ============LICENSE_END========================================================= */ -/*- - * ============LICENSE_START======================================================= - * appc - * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. - * ================================================================================ - * 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========================================================= - */ - package org.onap.policy.appc; import static org.junit.Assert.assertEquals; @@ -58,6 +37,10 @@ import org.junit.Test; public class CommonHeaderTest { + private static final String KANSAS = "Kansas"; + private static final String DOROTHY = "Dorothy"; + private static final String CAN_I_GO_HOME = "Can I go home?"; + @Test public void testCommonHeader() { CommonHeader commonHeader = new CommonHeader(); @@ -65,15 +48,15 @@ public class CommonHeaderTest { assertNotNull(new CommonHeader(commonHeader)); assertNotEquals(0, commonHeader.hashCode()); - commonHeader.setApiVer("Kansas"); - assertEquals("Kansas", commonHeader.getApiVer()); + commonHeader.setApiVer(KANSAS); + assertEquals(KANSAS, commonHeader.getApiVer()); List<Map<String, String>> flagSet = new ArrayList<>(); commonHeader.setFlags(flagSet); assertEquals(flagSet, commonHeader.getFlags()); - commonHeader.setOriginatorId("Dorothy"); - assertEquals("Dorothy", commonHeader.getOriginatorId()); + commonHeader.setOriginatorId(DOROTHY); + assertEquals(DOROTHY, commonHeader.getOriginatorId()); UUID requestId = UUID.randomUUID(); commonHeader.setRequestId(requestId); @@ -83,8 +66,8 @@ public class CommonHeaderTest { commonHeader.setRequestTrack(requestTrackSet); assertEquals(requestTrackSet, commonHeader.getRequestTrack()); - commonHeader.setSubRequestId("Can I go home?"); - assertEquals("Can I go home?", commonHeader.getSubRequestId()); + commonHeader.setSubRequestId(CAN_I_GO_HOME); + assertEquals(CAN_I_GO_HOME, commonHeader.getSubRequestId()); Instant timestamp = Instant.now(); commonHeader.setTimeStamp(timestamp); @@ -118,9 +101,9 @@ public class CommonHeaderTest { assertFalse(commonHeader.equals(copiedCommonHeader)); copiedCommonHeader.setApiVer(null); assertTrue(commonHeader.equals(copiedCommonHeader)); - commonHeader.setApiVer("Kansas"); + commonHeader.setApiVer(KANSAS); assertFalse(commonHeader.equals(copiedCommonHeader)); - copiedCommonHeader.setApiVer("Kansas"); + copiedCommonHeader.setApiVer(KANSAS); assertTrue(commonHeader.equals(copiedCommonHeader)); commonHeader.setFlags(null); @@ -136,9 +119,9 @@ public class CommonHeaderTest { assertFalse(commonHeader.equals(copiedCommonHeader)); copiedCommonHeader.setOriginatorId(null); assertTrue(commonHeader.equals(copiedCommonHeader)); - commonHeader.setOriginatorId("Dorothy"); + commonHeader.setOriginatorId(DOROTHY); assertFalse(commonHeader.equals(copiedCommonHeader)); - copiedCommonHeader.setOriginatorId("Dorothy"); + copiedCommonHeader.setOriginatorId(DOROTHY); assertTrue(commonHeader.equals(copiedCommonHeader)); commonHeader.setRequestId(null); @@ -163,9 +146,9 @@ public class CommonHeaderTest { assertFalse(commonHeader.equals(copiedCommonHeader)); copiedCommonHeader.setSubRequestId(null); assertTrue(commonHeader.equals(copiedCommonHeader)); - commonHeader.setSubRequestId("Can I go home?"); + commonHeader.setSubRequestId(CAN_I_GO_HOME); assertFalse(commonHeader.equals(copiedCommonHeader)); - copiedCommonHeader.setSubRequestId("Can I go home?"); + copiedCommonHeader.setSubRequestId(CAN_I_GO_HOME); assertTrue(commonHeader.equals(copiedCommonHeader)); commonHeader.setTimeStamp(null); diff --git a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java index 0f461d221..560a7d8d5 100644 --- a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java +++ b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java @@ -34,6 +34,9 @@ import org.junit.Test; public class RequestTest { + private static final String WIZARD = "Wizard"; + private static final String GO_TO_OZ = "Go to Oz"; + @Test public void testRequest() { Request request = new Request(); @@ -45,11 +48,11 @@ public class RequestTest { request.setCommonHeader(commonHeader); assertEquals(commonHeader, request.getCommonHeader()); - request.setAction("Go to Oz"); - assertEquals("Go to Oz", request.getAction()); + request.setAction(GO_TO_OZ); + assertEquals(GO_TO_OZ, request.getAction()); - request.setObjectId("Wizard"); - assertEquals("Wizard", request.getObjectId()); + request.setObjectId(WIZARD); + assertEquals(WIZARD, request.getObjectId()); request.setTargetId("Oz"); assertEquals("Oz", request.getTargetId()); @@ -90,18 +93,18 @@ public class RequestTest { assertFalse(request.equals(copiedRequest)); copiedRequest.setAction(null); assertTrue(request.equals(copiedRequest)); - request.setAction("Go to Oz"); + request.setAction(GO_TO_OZ); assertFalse(request.equals(copiedRequest)); - copiedRequest.setAction("Go to Oz"); + copiedRequest.setAction(GO_TO_OZ); assertTrue(request.equals(copiedRequest)); request.setObjectId(null); assertFalse(request.equals(copiedRequest)); copiedRequest.setObjectId(null); assertTrue(request.equals(copiedRequest)); - request.setObjectId("Wizard"); + request.setObjectId(WIZARD); assertFalse(request.equals(copiedRequest)); - copiedRequest.setObjectId("Wizard"); + copiedRequest.setObjectId(WIZARD); assertTrue(request.equals(copiedRequest)); request.setTargetId(null); diff --git a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseStatusTest.java b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseStatusTest.java index 561c9494b..2541f9b0a 100644 --- a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseStatusTest.java +++ b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseStatusTest.java @@ -31,6 +31,9 @@ import org.junit.Test; public class ResponseStatusTest { + private static final String THERE_S_NO_PLACE_LIKE_HOME = "There's no place like home"; + private static final String THE_WONDERFUL_LAND_OF_OZ = "The wonderful land of Oz"; + @Test public void testResonseStatus() { ResponseStatus status = new ResponseStatus(); @@ -40,11 +43,11 @@ public class ResponseStatusTest { status.setCode(1234); assertEquals(1234, status.getCode()); - status.setDescription("The wonderful land of Oz"); - assertEquals("The wonderful land of Oz", status.getDescription()); + status.setDescription(THE_WONDERFUL_LAND_OF_OZ); + assertEquals(THE_WONDERFUL_LAND_OF_OZ, status.getDescription()); - status.setValue("There's no place like home"); - assertEquals("There's no place like home", status.getValue()); + status.setValue(THERE_S_NO_PLACE_LIKE_HOME); + assertEquals(THERE_S_NO_PLACE_LIKE_HOME, status.getValue()); assertNotEquals(0, status.hashCode()); assertEquals("ResponseStatus [Code=1234, Value=There's no pla", status.toString().substring(0, 47)); @@ -72,18 +75,18 @@ public class ResponseStatusTest { assertFalse(status.equals(copiedStatus)); copiedStatus.setDescription(null); assertTrue(status.equals(copiedStatus)); - status.setDescription("The wonderful land of Oz"); + status.setDescription(THE_WONDERFUL_LAND_OF_OZ); assertFalse(status.equals(copiedStatus)); - copiedStatus.setDescription("The wonderful land of Oz"); + copiedStatus.setDescription(THE_WONDERFUL_LAND_OF_OZ); assertTrue(status.equals(copiedStatus)); status.setValue(null); assertFalse(status.equals(copiedStatus)); copiedStatus.setValue(null); assertTrue(status.equals(copiedStatus)); - status.setValue("There's no place like home"); + status.setValue(THERE_S_NO_PLACE_LIKE_HOME); assertFalse(status.equals(copiedStatus)); - copiedStatus.setValue("There's no place like home"); + copiedStatus.setValue(THERE_S_NO_PLACE_LIKE_HOME); assertTrue(status.equals(copiedStatus)); } } diff --git a/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/AppcLcmTest.java b/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/AppcLcmTest.java index 0ca6239cd..0ee79cf17 100644 --- a/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/AppcLcmTest.java +++ b/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/AppcLcmTest.java @@ -35,6 +35,12 @@ import org.slf4j.LoggerFactory; public class AppcLcmTest { + private static final String VNF_ID_KEY = "vnf-id"; + + private static final String RESTART = "restart"; + + private static final String CORRELATION_ID = "664be3d2-6c12-4f4b-a3e7-c349acced200"; + private static final Logger logger = LoggerFactory.getLogger(AppcLcmTest.class); private static LcmRequestWrapper dmaapRequest; @@ -45,29 +51,29 @@ public class AppcLcmTest { * Construct an APPCLCM Request to be Serialized */ dmaapRequest = new LcmRequestWrapper(); - dmaapRequest.setCorrelationId("664be3d2-6c12-4f4b-a3e7-c349acced200" + "-" + "1"); - dmaapRequest.setRpcName("restart"); + dmaapRequest.setCorrelationId(CORRELATION_ID + "-" + "1"); + dmaapRequest.setRpcName(RESTART); dmaapRequest.setType("request"); dmaapResponse = new LcmResponseWrapper(); - dmaapResponse.setCorrelationId("664be3d2-6c12-4f4b-a3e7-c349acced200" + "-" + "1"); - dmaapResponse.setRpcName("restart"); + dmaapResponse.setCorrelationId(CORRELATION_ID + "-" + "1"); + dmaapResponse.setRpcName(RESTART); dmaapResponse.setType("response"); LcmRequest appcRequest = new LcmRequest(); - appcRequest.setAction("restart"); + appcRequest.setAction(RESTART); HashMap<String, String> actionIdentifiers = new HashMap<>(); - actionIdentifiers.put("vnf-id", "trial-vnf-003"); + actionIdentifiers.put(VNF_ID_KEY, "trial-vnf-003"); actionIdentifiers.put("vserver-id", "08f6c1f9-99e7-49f3-a662-c62b9f200d79"); appcRequest.setActionIdentifiers(actionIdentifiers); LcmCommonHeader commonHeader = new LcmCommonHeader(); - commonHeader.setRequestId(UUID.fromString("664be3d2-6c12-4f4b-a3e7-c349acced200")); + commonHeader.setRequestId(UUID.fromString(CORRELATION_ID)); commonHeader.setSubRequestId("1"); - commonHeader.setOriginatorId("664be3d2-6c12-4f4b-a3e7-c349acced200"); + commonHeader.setOriginatorId(CORRELATION_ID); appcRequest.setCommonHeader(commonHeader); @@ -111,7 +117,7 @@ public class AppcLcmTest { * action-identifiers should exist and contain a vnf-id */ assertTrue(jsonRequest.contains("action-identifiers")); - assertTrue(jsonRequest.contains("vnf-id")); + assertTrue(jsonRequest.contains(VNF_ID_KEY)); /* * The action sub-tag should exist @@ -132,19 +138,19 @@ public class AppcLcmTest { /* * Use the serializer to convert the json string into a java object */ - LcmRequestWrapper dmaapRequest = Serialization.gson.fromJson(jsonRequest, LcmRequestWrapper.class); - assertNotNull(dmaapRequest); + LcmRequestWrapper req = Serialization.gson.fromJson(jsonRequest, LcmRequestWrapper.class); + assertNotNull(req); /* * The type of the DMAAP wrapper should be request */ - assertEquals("request", dmaapRequest.getType()); + assertEquals("request", req.getType()); /* * The DMAAP wrapper must have a body as that is the true APPC request */ - assertNotNull(dmaapRequest.getBody()); - LcmRequest appcRequest = dmaapRequest.getBody(); + assertNotNull(req.getBody()); + LcmRequest appcRequest = req.getBody(); assertNotNull(appcRequest); /* @@ -156,13 +162,13 @@ public class AppcLcmTest { * The action should not be null and should be set to restart */ assertNotNull(appcRequest.getAction()); - assertEquals("restart", appcRequest.getAction()); + assertEquals(RESTART, appcRequest.getAction()); /* * The action-identifiers should not be null and should contain a vnf-id */ assertNotNull(appcRequest.getActionIdentifiers()); - assertNotNull(appcRequest.getActionIdentifiers().get("vnf-id")); + assertNotNull(appcRequest.getActionIdentifiers().get(VNF_ID_KEY)); logger.debug("Request as a Java Object: \n" + appcRequest.toString() + "\n\n"); } @@ -202,19 +208,19 @@ public class AppcLcmTest { /* * Use the serializer to convert the json string into a java object */ - LcmResponseWrapper dmaapResponse = Serialization.gson.fromJson(jsonResponse, LcmResponseWrapper.class); - assertNotNull(dmaapResponse); + LcmResponseWrapper resp = Serialization.gson.fromJson(jsonResponse, LcmResponseWrapper.class); + assertNotNull(resp); /* * The type of the DMAAP wrapper should be response */ - assertEquals("response", dmaapResponse.getType()); + assertEquals("response", resp.getType()); /* * The DMAAP wrapper must have a body as that is the true APPC response */ - assertNotNull(dmaapResponse.getBody()); - LcmResponse appcResponse = dmaapResponse.getBody(); + assertNotNull(resp.getBody()); + LcmResponse appcResponse = resp.getBody(); assertNotNull(appcResponse); /* diff --git a/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmCommonHeaderTest.java b/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmCommonHeaderTest.java index 7825e7fc1..32a4954c1 100644 --- a/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmCommonHeaderTest.java +++ b/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmCommonHeaderTest.java @@ -36,6 +36,10 @@ import org.junit.Test; public class LcmCommonHeaderTest { + private static final String KANSAS = "Kansas"; + private static final String DOROTHY = "Dorothy"; + private static final String CAN_I_GO_HOME = "Can I go home?"; + @Test public void testLcmCommonHeader() { LcmCommonHeader commonHeader = new LcmCommonHeader(); @@ -43,22 +47,22 @@ public class LcmCommonHeaderTest { assertNotNull(new LcmCommonHeader(commonHeader)); assertNotEquals(0, commonHeader.hashCode()); - commonHeader.setApiVer("Kansas"); - assertEquals("Kansas", commonHeader.getApiVer()); + commonHeader.setApiVer(KANSAS); + assertEquals(KANSAS, commonHeader.getApiVer()); Map<String, String> flagMap = new HashMap<>(); commonHeader.setFlags(flagMap); assertEquals(flagMap, commonHeader.getFlags()); - commonHeader.setOriginatorId("Dorothy"); - assertEquals("Dorothy", commonHeader.getOriginatorId()); + commonHeader.setOriginatorId(DOROTHY); + assertEquals(DOROTHY, commonHeader.getOriginatorId()); UUID requestId = UUID.randomUUID(); commonHeader.setRequestId(requestId); assertEquals(requestId, commonHeader.getRequestId()); - commonHeader.setSubRequestId("Can I go home?"); - assertEquals("Can I go home?", commonHeader.getSubRequestId()); + commonHeader.setSubRequestId(CAN_I_GO_HOME); + assertEquals(CAN_I_GO_HOME, commonHeader.getSubRequestId()); Instant timestamp = Instant.now(); commonHeader.setTimeStamp(timestamp); @@ -91,9 +95,9 @@ public class LcmCommonHeaderTest { assertFalse(commonHeader.equals(copiedLcmCommonHeader)); copiedLcmCommonHeader.setApiVer(null); assertTrue(commonHeader.equals(copiedLcmCommonHeader)); - commonHeader.setApiVer("Kansas"); + commonHeader.setApiVer(KANSAS); assertFalse(commonHeader.equals(copiedLcmCommonHeader)); - copiedLcmCommonHeader.setApiVer("Kansas"); + copiedLcmCommonHeader.setApiVer(KANSAS); assertTrue(commonHeader.equals(copiedLcmCommonHeader)); commonHeader.setFlags(null); @@ -109,9 +113,9 @@ public class LcmCommonHeaderTest { assertFalse(commonHeader.equals(copiedLcmCommonHeader)); copiedLcmCommonHeader.setOriginatorId(null); assertTrue(commonHeader.equals(copiedLcmCommonHeader)); - commonHeader.setOriginatorId("Dorothy"); + commonHeader.setOriginatorId(DOROTHY); assertFalse(commonHeader.equals(copiedLcmCommonHeader)); - copiedLcmCommonHeader.setOriginatorId("Dorothy"); + copiedLcmCommonHeader.setOriginatorId(DOROTHY); assertTrue(commonHeader.equals(copiedLcmCommonHeader)); commonHeader.setRequestId(null); @@ -127,9 +131,9 @@ public class LcmCommonHeaderTest { assertFalse(commonHeader.equals(copiedLcmCommonHeader)); copiedLcmCommonHeader.setSubRequestId(null); assertTrue(commonHeader.equals(copiedLcmCommonHeader)); - commonHeader.setSubRequestId("Can I go home?"); + commonHeader.setSubRequestId(CAN_I_GO_HOME); assertFalse(commonHeader.equals(copiedLcmCommonHeader)); - copiedLcmCommonHeader.setSubRequestId("Can I go home?"); + copiedLcmCommonHeader.setSubRequestId(CAN_I_GO_HOME); assertTrue(commonHeader.equals(copiedLcmCommonHeader)); commonHeader.setTimeStamp(null); diff --git a/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmRequestTest.java b/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmRequestTest.java index 4b392f816..40662935d 100644 --- a/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmRequestTest.java +++ b/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmRequestTest.java @@ -34,6 +34,9 @@ import org.junit.Test; public class LcmRequestTest { + private static final String THE_EMERALD_CITY = "The Emerald City"; + private static final String GO_TO_OZ = "Go to Oz"; + @Test public void testLcmRequest() { LcmRequest request = new LcmRequest(); @@ -45,8 +48,8 @@ public class LcmRequestTest { request.setCommonHeader(commonHeader); assertEquals(commonHeader, request.getCommonHeader()); - request.setAction("Go to Oz"); - assertEquals("Go to Oz", request.getAction()); + request.setAction(GO_TO_OZ); + assertEquals(GO_TO_OZ, request.getAction()); Map<String, String> actionIdentifiers = new HashMap<>(); actionIdentifiers.put("North", "Good Witch"); @@ -55,8 +58,8 @@ public class LcmRequestTest { request.setActionIdentifiers(actionIdentifiers); assertEquals(actionIdentifiers, request.getActionIdentifiers()); - request.setPayload("The Emerald City"); - assertEquals("The Emerald City", request.getPayload()); + request.setPayload(THE_EMERALD_CITY); + assertEquals(THE_EMERALD_CITY, request.getPayload()); assertNotEquals(0, request.hashCode()); @@ -86,9 +89,9 @@ public class LcmRequestTest { assertFalse(request.equals(copiedLcmRequest)); copiedLcmRequest.setAction(null); assertTrue(request.equals(copiedLcmRequest)); - request.setAction("Go to Oz"); + request.setAction(GO_TO_OZ); assertFalse(request.equals(copiedLcmRequest)); - copiedLcmRequest.setAction("Go to Oz"); + copiedLcmRequest.setAction(GO_TO_OZ); assertTrue(request.equals(copiedLcmRequest)); request.setActionIdentifiers(null); @@ -104,9 +107,9 @@ public class LcmRequestTest { assertFalse(request.equals(copiedLcmRequest)); copiedLcmRequest.setPayload(null); assertTrue(request.equals(copiedLcmRequest)); - request.setPayload("The Emerald City"); + request.setPayload(THE_EMERALD_CITY); assertFalse(request.equals(copiedLcmRequest)); - copiedLcmRequest.setPayload("The Emerald City"); + copiedLcmRequest.setPayload(THE_EMERALD_CITY); assertTrue(request.equals(copiedLcmRequest)); } } diff --git a/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmResponseStatusTest.java b/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmResponseStatusTest.java index b022aa1cb..a4d1bc6d1 100644 --- a/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmResponseStatusTest.java +++ b/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmResponseStatusTest.java @@ -31,6 +31,8 @@ import org.junit.Test; public class LcmResponseStatusTest { + private static final String THE_WONDERFUL_LAND_OF_OZ = "The wonderful land of Oz"; + @Test public void testResonseStatus() { LcmResponseStatus status = new LcmResponseStatus(); @@ -40,8 +42,8 @@ public class LcmResponseStatusTest { status.setCode(1234); assertEquals(1234, status.getCode()); - status.setMessage("The wonderful land of Oz"); - assertEquals("The wonderful land of Oz", status.getMessage()); + status.setMessage(THE_WONDERFUL_LAND_OF_OZ); + assertEquals(THE_WONDERFUL_LAND_OF_OZ, status.getMessage()); assertEquals("ResponseStatus [code=1234, message=The wonderfu", status.toString().substring(0, 47)); @@ -67,9 +69,9 @@ public class LcmResponseStatusTest { assertFalse(status.equals(copiedStatus)); copiedStatus.setMessage(null); assertTrue(status.equals(copiedStatus)); - status.setMessage("The wonderful land of Oz"); + status.setMessage(THE_WONDERFUL_LAND_OF_OZ); assertFalse(status.equals(copiedStatus)); - copiedStatus.setMessage("The wonderful land of Oz"); + copiedStatus.setMessage(THE_WONDERFUL_LAND_OF_OZ); assertTrue(status.equals(copiedStatus)); } } diff --git a/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmWrapperTest.java b/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmWrapperTest.java index 18fdc8ca2..7d005cdd4 100644 --- a/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmWrapperTest.java +++ b/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmWrapperTest.java @@ -31,26 +31,32 @@ import org.junit.Test; public class LcmWrapperTest { + private static final String YELLOW_BRICK_ROAD = "YellowBrickRoad"; + private static final String TORNADO = "Tornado"; + private static final String THE_EMERALD_CITY = "The Emerald City"; + private static final String MUNCHKIN = "Munchkin"; + private static final String VERSION19 = "19.3.9"; + @Test public void testLcmWrapper() { LcmWrapper wrapper = new LcmWrapper(); assertNotNull(wrapper); assertNotEquals(0, wrapper.hashCode()); - wrapper.setVersion("19.3.9"); - assertEquals("19.3.9", wrapper.getVersion()); + wrapper.setVersion(VERSION19); + assertEquals(VERSION19, wrapper.getVersion()); - wrapper.setCambriaPartition("The Emerald City"); - assertEquals("The Emerald City", wrapper.getCambriaPartition()); + wrapper.setCambriaPartition(THE_EMERALD_CITY); + assertEquals(THE_EMERALD_CITY, wrapper.getCambriaPartition()); - wrapper.setRpcName("Tornado"); - assertEquals("Tornado", wrapper.getRpcName()); + wrapper.setRpcName(TORNADO); + assertEquals(TORNADO, wrapper.getRpcName()); - wrapper.setCorrelationId("YellowBrickRoad"); - assertEquals("YellowBrickRoad", wrapper.getCorrelationId()); + wrapper.setCorrelationId(YELLOW_BRICK_ROAD); + assertEquals(YELLOW_BRICK_ROAD, wrapper.getCorrelationId()); - wrapper.setType("Munchkin"); - assertEquals("Munchkin", wrapper.getType()); + wrapper.setType(MUNCHKIN); + assertEquals(MUNCHKIN, wrapper.getType()); assertNotEquals(0, wrapper.hashCode()); @@ -72,45 +78,45 @@ public class LcmWrapperTest { assertFalse(wrapper.equals(copiedLcmWrapper)); copiedLcmWrapper.setVersion(null); assertTrue(wrapper.equals(copiedLcmWrapper)); - wrapper.setVersion("19.3.9"); + wrapper.setVersion(VERSION19); assertFalse(wrapper.equals(copiedLcmWrapper)); - copiedLcmWrapper.setVersion("19.3.9"); + copiedLcmWrapper.setVersion(VERSION19); assertTrue(wrapper.equals(copiedLcmWrapper)); wrapper.setCambriaPartition(null); assertFalse(wrapper.equals(copiedLcmWrapper)); copiedLcmWrapper.setCambriaPartition(null); assertTrue(wrapper.equals(copiedLcmWrapper)); - wrapper.setCambriaPartition("The Emerald City"); + wrapper.setCambriaPartition(THE_EMERALD_CITY); assertFalse(wrapper.equals(copiedLcmWrapper)); - copiedLcmWrapper.setCambriaPartition("The Emerald City"); + copiedLcmWrapper.setCambriaPartition(THE_EMERALD_CITY); assertTrue(wrapper.equals(copiedLcmWrapper)); wrapper.setRpcName(null); assertFalse(wrapper.equals(copiedLcmWrapper)); copiedLcmWrapper.setRpcName(null); assertTrue(wrapper.equals(copiedLcmWrapper)); - wrapper.setRpcName("Tornado"); + wrapper.setRpcName(TORNADO); assertFalse(wrapper.equals(copiedLcmWrapper)); - copiedLcmWrapper.setRpcName("Tornado"); + copiedLcmWrapper.setRpcName(TORNADO); assertTrue(wrapper.equals(copiedLcmWrapper)); wrapper.setCorrelationId(null); assertFalse(wrapper.equals(copiedLcmWrapper)); copiedLcmWrapper.setCorrelationId(null); assertTrue(wrapper.equals(copiedLcmWrapper)); - wrapper.setCorrelationId("YellowBrickRoad"); + wrapper.setCorrelationId(YELLOW_BRICK_ROAD); assertFalse(wrapper.equals(copiedLcmWrapper)); - copiedLcmWrapper.setCorrelationId("YellowBrickRoad"); + copiedLcmWrapper.setCorrelationId(YELLOW_BRICK_ROAD); assertTrue(wrapper.equals(copiedLcmWrapper)); wrapper.setType(null); assertFalse(wrapper.equals(copiedLcmWrapper)); copiedLcmWrapper.setType(null); assertTrue(wrapper.equals(copiedLcmWrapper)); - wrapper.setType("Munchkin"); + wrapper.setType(MUNCHKIN); assertFalse(wrapper.equals(copiedLcmWrapper)); - copiedLcmWrapper.setType("Munchkin"); + copiedLcmWrapper.setType(MUNCHKIN); assertTrue(wrapper.equals(copiedLcmWrapper)); } } diff --git a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptor.java b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptor.java index 3957fe5e4..17eefd227 100644 --- a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptor.java +++ b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptor.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Bell Canada. + * Modifications Copyright (C) 2019 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. @@ -49,12 +50,12 @@ public class BasicAuthClientHeaderInterceptor implements ClientInterceptor { } @Override - public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> method, + public <Q, P> ClientCall<Q, P> interceptCall(MethodDescriptor<Q, P> method, CallOptions callOptions, Channel channel) { Key<String> authHeader = Key.of(BASIC_AUTH_HEADER_KEY, Metadata.ASCII_STRING_MARSHALLER); - return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(channel.newCall(method, callOptions)) { + return new ForwardingClientCall.SimpleForwardingClientCall<Q, P>(channel.newCall(method, callOptions)) { @Override - public void start(Listener<RespT> responseListener, Metadata headers) { + public void start(Listener<P> responseListener, Metadata headers) { headers.put(authHeader, props.getBasicAuth()); super.start(responseListener, headers); } diff --git a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/properties/CdsServerProperties.java b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/properties/CdsServerProperties.java index 94a336b6d..2e919814b 100644 --- a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/properties/CdsServerProperties.java +++ b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/properties/CdsServerProperties.java @@ -39,7 +39,6 @@ public class CdsServerProperties implements ParameterGroup { private static final int MIN_USER_PORT = 1024; private static final int MAX_USER_PORT = 65535; - private static final String INVALID_PROP = "Invalid CDS property: "; private static final String SERVER_PROPERTIES_TYPE = "CDS gRPC Server Properties"; // CDS carrier properties diff --git a/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptorTest.java b/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptorTest.java index 3b6ad7da1..fedf4703c 100644 --- a/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptorTest.java +++ b/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptorTest.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Bell Canada. + * Modifications Copyright (C) 2019 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. @@ -127,9 +128,8 @@ public class BasicAuthClientHeaderInterceptorTest { private static class TestServerInterceptor implements ServerInterceptor { @Override - public <ReqT, RespT> Listener<ReqT> interceptCall(final ServerCall<ReqT, RespT> serverCall, - final Metadata metadata, - final ServerCallHandler<ReqT, RespT> serverCallHandler) { + public <Q, P> Listener<Q> interceptCall(final ServerCall<Q, P> serverCall, + final Metadata metadata, final ServerCallHandler<Q, P> serverCallHandler) { return serverCallHandler.startCall(serverCall, metadata); } } diff --git a/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/CdsProcessorGrpcClientTest.java b/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/CdsProcessorGrpcClientTest.java index b9a9a84cd..17b4dc534 100644 --- a/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/CdsProcessorGrpcClientTest.java +++ b/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/CdsProcessorGrpcClientTest.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Bell Canada. + * Modifications Copyright (C) 2019 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. @@ -19,9 +20,8 @@ package org.onap.policy.cds.client; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -128,13 +128,13 @@ public class CdsProcessorGrpcClientTest { @Test public void testCdsProcessorGrpcClientConstructor() { - new CdsProcessorGrpcClient(listener, props); + new CdsProcessorGrpcClient(listener, props).close(); } @Test(expected = IllegalStateException.class) public void testCdsProcessorGrpcClientConstructorFailure() { props.setHost(null); - new CdsProcessorGrpcClient(listener, props); + new CdsProcessorGrpcClient(listener, props).close(); } @Test diff --git a/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/ControlLoopNotificationTest.java b/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/ControlLoopNotificationTest.java index 0c1070e44..2ad097254 100644 --- a/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/ControlLoopNotificationTest.java +++ b/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/ControlLoopNotificationTest.java @@ -61,7 +61,7 @@ public class ControlLoopNotificationTest { assertEquals("from", notification.getFrom()); notification.setHistory(Collections.emptyList()); - assertTrue(notification.getHistory().size() == 0); + assertTrue(notification.getHistory().isEmpty()); notification.setMessage("message"); assertEquals("message", notification.getMessage()); diff --git a/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/params/ControlLoopParamsTest.java b/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/params/ControlLoopParamsTest.java index bf23e5706..fd17f782e 100644 --- a/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/params/ControlLoopParamsTest.java +++ b/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/params/ControlLoopParamsTest.java @@ -21,8 +21,8 @@ package org.onap.policy.controlloop.params; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import org.junit.Test; @@ -41,11 +41,11 @@ public class ControlLoopParamsTest { ControlLoopParams params2 = new ControlLoopParams(params); - assertTrue(params2.getClosedLoopControlName().equals("name")); - assertTrue(params2.getControlLoopYaml().equals("yaml")); - assertTrue(params2.getPolicyName().equals("name")); - assertTrue(params2.getPolicyScope().equals("scope")); - assertTrue(params2.getPolicyVersion().equals("1")); + assertEquals("name", params2.getClosedLoopControlName()); + assertEquals("yaml", params2.getControlLoopYaml()); + assertEquals("name", params2.getPolicyName()); + assertEquals("scope", params2.getPolicyScope()); + assertEquals("1", params2.getPolicyVersion()); } } |