From 2ecb0d9cfcb4fab803da12787b6e75f68fdff280 Mon Sep 17 00:00:00 2001 From: "Tait,Trevor(rt0435)" Date: Fri, 1 Mar 2019 14:15:33 -0500 Subject: X-ONAP-RequestId and X-ONAP-PartnerName support Also cleaned up a few hundred ONAP code audit issues related to: - white space - long lines - naming conventions Issue-ID: LOG-551 Change-Id: Ic2af0093e1b4d14c42b95fffe013247afbbadd52 Signed-off-by: Tait,Trevor(rt0435) --- .../VnfcInstanceTest.java | 87 ---------------------- 1 file changed, 87 deletions(-) delete mode 100644 src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/VnfcInstanceTest.java (limited to 'src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/VnfcInstanceTest.java') diff --git a/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/VnfcInstanceTest.java b/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/VnfcInstanceTest.java deleted file mode 100644 index 29c55a9..0000000 --- a/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/VnfcInstanceTest.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * ============LICENSE_START=================================================== - * Copyright (c) 2018 Amdocs - * ============================================================================ - * 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.logging_analytics.pomba.pomba_aai_context_builder; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; -import org.onap.pomba.contextbuilder.aai.datatype.RelationshipList; -import org.onap.pomba.contextbuilder.aai.datatype.VnfcInstance; - -public class VnfcInstanceTest { - @Test - public void testVnfcInstance() { - VnfcInstance vnfcInstance = new VnfcInstance(); - vnfcInstance.setVnfcName("vnfcName"); - vnfcInstance.setNfcNamingCode("nfcNamingCode"); - vnfcInstance.setNfcFunction("nfcFunction"); - vnfcInstance.setProvisionStatus("provisionStatus"); - vnfcInstance.setOrchestrationStatus("orchestrationStatus"); - vnfcInstance.setInMaintenance(true); - vnfcInstance.setIsClosedLoopDisabled(true); - vnfcInstance.setResourceVersion("resourceVersion"); - vnfcInstance.setModelInvariantId("modelInvariantId"); - vnfcInstance.setModelVersionId("modelVersionId"); - vnfcInstance.setRelationshipList(new RelationshipList()); - - assertEquals("vnfcName", vnfcInstance.getVnfcName()); - assertEquals("nfcNamingCode", vnfcInstance.getNfcNamingCode()); - assertEquals("nfcFunction", vnfcInstance.getNfcFunction()); - assertEquals("provisionStatus", vnfcInstance.getProvisionStatus()); - assertEquals("orchestrationStatus", vnfcInstance.getOrchestrationStatus()); - assertTrue(vnfcInstance.getInMaintenance()); - assertTrue(vnfcInstance.getIsClosedLoopDisabled()); - assertEquals("resourceVersion", vnfcInstance.getResourceVersion()); - assertEquals("modelInvariantId", vnfcInstance.getModelInvariantId()); - assertEquals("modelVersionId", vnfcInstance.getModelVersionId()); - assertTrue(vnfcInstance.getRelationshipList() instanceof RelationshipList); - - } - - @Test - public void testVnfcInstanceWithParameters() { - VnfcInstance vnfcInstance = new VnfcInstance("vnfcName", "nfcNamingCode", "nfcFunction", "provisionStatus", "orchestrationStatus", true, true, "resourceVersion", "modelInvariantId", "modelVersionId", new RelationshipList()); - - assertEquals("vnfcName", vnfcInstance.getVnfcName()); - assertEquals("nfcNamingCode", vnfcInstance.getNfcNamingCode()); - assertEquals("nfcFunction", vnfcInstance.getNfcFunction()); - assertEquals("provisionStatus", vnfcInstance.getProvisionStatus()); - assertEquals("orchestrationStatus", vnfcInstance.getOrchestrationStatus()); - assertTrue(vnfcInstance.getInMaintenance()); - assertTrue(vnfcInstance.getIsClosedLoopDisabled()); - assertEquals("resourceVersion", vnfcInstance.getResourceVersion()); - assertEquals("modelInvariantId", vnfcInstance.getModelInvariantId()); - assertEquals("modelVersionId", vnfcInstance.getModelVersionId()); - assertTrue(vnfcInstance.getRelationshipList() instanceof RelationshipList); - - String vnfcInstanceString = vnfcInstance.toString(); - assertTrue(vnfcInstanceString.contains("[vnfcName=vnfcName,nfcNamingCode=nfcNamingCode,nfcFunction=nfcFunction,provisionStatus=provisionStatus,orchestration_status=orchestrationStatus,inMaintenance=true,isClosedLoopDisabled=true,resourceVersion=resourceVersion,modelInvariantId=modelInvariantId,modelVersionId=modelVersionId,")); - } - - @Test - public void testVnfcInstanceEquals() { - VnfcInstance vnfcInstance1 = new VnfcInstance("vnfcName1", "nfcNamingCode1", "nfcFunction1", "provisionStatus1", "orchestrationStatus1", true, true, "resourceVersion1", "modelInvariantId1", "modelVersionId1", new RelationshipList()); - VnfcInstance vnfcInstance2 = new VnfcInstance("vnfcName2", "nfcNamingCode2", "nfcFunction2", "provisionStatus2", "orchestrationStatus2", true, true, "resourceVersion2", "modelInvariantId2", "modelVersionId2", new RelationshipList()); - VnfcInstance vnfcInstance3 = new VnfcInstance("vnfcName1", "nfcNamingCode1", "nfcFunction1", "provisionStatus1", "orchestrationStatus1", true, true, "resourceVersion1", "modelInvariantId1", "modelVersionId1", new RelationshipList()); - - assertTrue(vnfcInstance1.equals(vnfcInstance1)); - assertTrue(!vnfcInstance1.equals(vnfcInstance2)); - assertTrue(vnfcInstance1.equals(vnfcInstance3)); - } -} -- cgit 1.2.3-korg