diff options
9 files changed, 223 insertions, 73 deletions
diff --git a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAICustomerRspTest.java b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAICustomerRspTest.java index f0ccfdf1..8562f637 100644 --- a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAICustomerRspTest.java +++ b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAICustomerRspTest.java @@ -1,6 +1,9 @@ /** * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved. * + * ================================================================================ + * Modifications Copyright (C) 2020 IBM. + * ================================================================================ * 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 @@ -40,6 +43,8 @@ import org.hibernate.Transaction; import mockit.Mock; import mockit.MockUp; +import static org.junit.Assert.assertNotNull; + public class AAICustomerRspTest { @Before @@ -52,8 +57,11 @@ public class AAICustomerRspTest { @Test public void testAAICustomerRsp() throws Exception { + AAICustomer ac = new AAICustomer("globalCustomerId", "subscriberName", "subscriberType","resourceVersion"); + List acList=new ArrayList<AAICustomer>(); + acList.add(ac); AAICustomerRsp acr = new AAICustomerRsp(); - acr.setCustomer(null); - acr.getCustomer(); + acr.setCustomer(acList); + assertNotNull(acr.getCustomer()); } } diff --git a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIEsrNfvoTest.java b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIEsrNfvoTest.java index a6581da6..04572d9d 100644 --- a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIEsrNfvoTest.java +++ b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIEsrNfvoTest.java @@ -1,6 +1,9 @@ /** * Copyright 2020 Huawei Corporation. * + * ================================================================================ + * Modifications Copyright (C) 2020 IBM. + * ================================================================================ * 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 @@ -16,25 +19,13 @@ package org.onap.usecaseui.server.service.lcm.domain.aai.bean; -/** - * Copyright (C) 2020 Huawei, Inc. and others. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + import org.junit.After; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class AAIEsrNfvoTest { @Before @@ -53,7 +44,13 @@ public class AAIEsrNfvoTest { aaiEsrNfvo.getName(); aaiEsrNfvo.getNfvoId(); aaiEsrNfvo.getResourceVersion(); - aaiEsrNfvo.setName("123"); + + assertEquals("123",aaiEsrNfvo.getApiRoot()); + assertEquals("123",aaiEsrNfvo.getName()); + assertEquals("123",aaiEsrNfvo.getNfvoId()); + assertEquals("123",aaiEsrNfvo.getResourceVersion()); + aaiEsrNfvo.setName("test"); + assertEquals("test",aaiEsrNfvo.getName()); } } diff --git a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIOrchestratorRspTest.java b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIOrchestratorRspTest.java index a5beb5c4..f6dd302b 100644 --- a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIOrchestratorRspTest.java +++ b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIOrchestratorRspTest.java @@ -55,5 +55,6 @@ public class AAIOrchestratorRspTest { rspObj.add(aaiEsrNfvo); rsp.setEsrNfvo(rspObj); assertNotNull(rsp); + assertNotNull(rsp.getEsrNfvo()); } } diff --git a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/RelationshipTest.java b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/RelationshipTest.java index 85847020..ccd235db 100644 --- a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/RelationshipTest.java +++ b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/RelationshipTest.java @@ -1,6 +1,9 @@ /** * Copyright (C) 2020 Huawei, Inc. and others. All rights reserved. * + * ================================================================================ + * Modifications Copyright (C) 2020 IBM. + * ================================================================================ * 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 @@ -20,6 +23,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class RelationshipTest { @Before @@ -34,16 +40,22 @@ public class RelationshipTest { public void relationshiptest() throws Exception { Relationship relationship = new Relationship(); - - relationship.getRelatedLink(); - relationship.getRelatedTo(); - relationship.getRelationshipData(); - relationship.getRelationshipLabel(); - + RelationshipData relationshipData = new RelationshipData(); + relationshipData.setRelationshipKey("123"); + relationshipData.setRelationshipValue("123"); + RelationshipData[] rd=new RelationshipData[]{relationshipData}; + relationship.setRelationshipData(rd); relationship.setRelatedLink("123"); relationship.setRelatedTo("123"); relationship.setRelationshipLabel("123"); + assertEquals("123",relationship.getRelatedLink()); + assertEquals("123",relationship.getRelatedTo()); + assertNotNull(relationship.getRelationshipData()); + assertEquals("123",relationship.getRelationshipLabel()); + + + } diff --git a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/ResultsTest.java b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/ResultsTest.java new file mode 100644 index 00000000..94f62586 --- /dev/null +++ b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/ResultsTest.java @@ -0,0 +1,66 @@ +/*- + * ============LICENSE_START============================================ + * ONAP + * ===================================================================== + * Copyright (C) 2020 IBM Intellectual Property. All rights reserved. + * ===================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software 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. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * 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.usecaseui.server.service.lcm.domain.aai.bean; + +import org.junit.Test; + +import static org.junit.Assert.assertNotNull; + +public class ResultsTest { + + + @Test + public void testSetGetMethod() { + PInterface pInterface = new PInterface(); + RelationshipList relationshipList = new RelationshipList(); + Results res= new Results(); + pInterface.setInMaint("123"); + pInterface.setInterfaceName("123"); + pInterface.setInterfaceType("123"); + pInterface.setNetworkInterfaceType("123"); + pInterface.setNetworkRef("123"); + pInterface.setOperationalStatus("123"); + pInterface.setRelationshipList(relationshipList); + pInterface.setPortDescription("123"); + pInterface.setSpeedValue("123"); + pInterface.setSpeedUnits("123"); + pInterface.setResourceVersion("1.0.0"); + res.setPinterface(pInterface); + assertNotNull(res.getPinterface()); + } +} diff --git a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/SDNCControllerRspTest.java b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/SDNCControllerRspTest.java index 9495b6a7..2e4fde3f 100644 --- a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/SDNCControllerRspTest.java +++ b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/SDNCControllerRspTest.java @@ -40,6 +40,8 @@ import org.hibernate.Transaction; import mockit.Mock; import mockit.MockUp; +import static org.junit.Assert.assertNotNull; + public class SDNCControllerRspTest { @Before @@ -52,8 +54,13 @@ public class SDNCControllerRspTest { @Test public void testSDNCControllerRsp() throws Exception { + SDNCController sc = new SDNCController(); + sc.setSdncId("sdncId"); + sc.setLocation("location"); + List sdncList=new ArrayList<SDNCController>(); + sdncList.add(sc); SDNCControllerRsp scr = new SDNCControllerRsp(); - scr.setEsrThirdpartySdncList(null); - scr.getEsrThirdpartySdncList(); + scr.setEsrThirdpartySdncList(sdncList); + assertNotNull(scr.getEsrThirdpartySdncList()); } } diff --git a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/ServiceInstanceTest.java b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/ServiceInstanceTest.java index 8625349a..7d838e2c 100644 --- a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/ServiceInstanceTest.java +++ b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/ServiceInstanceTest.java @@ -15,52 +15,27 @@ */ package org.onap.usecaseui.server.service.lcm.domain.aai.bean; -import org.junit.Test; -import org.junit.Before; -import org.junit.After; -import org.junit.runner.RunWith; -import org.onap.usecaseui.server.UuiServerApplication; -import org.onap.usecaseui.server.service.lcm.domain.aai.bean.*; -import org.onap.usecaseui.server.util.DateUtils; -import org.onap.usecaseui.server.util.Page; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; +import org.junit.Test; +import org.junit.Assert; -import java.sql.Timestamp; -import java.text.SimpleDateFormat; -import java.util.*; -import java.io.*; -import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.Transaction; -import mockit.Mock; -import mockit.MockUp; +import static org.junit.Assert.assertEquals; public class ServiceInstanceTest { - @Before - public void before() throws Exception { - } - - @After - public void after() throws Exception { - } - @Test public void testServiceInstance() throws Exception { ServiceInstance si = new ServiceInstance("globalCustomerId", "serviceType", "serviceInstanceId", "subscriberName", "subscriberType", "serviceInstanceName", "serviceInstanceLocationId"); - si.getGlobalCustomerId(); - si.getServiceType(); - si.getServiceInstanceId(); - si.getSubscriberName(); - si.getSubscriberType(); - si.getServiceInstanceName(); - si.getServiceInstanceLocationId(); + si.setServiceDomain("serviceDomain"); + assertEquals("globalCustomerId",si.getGlobalCustomerId()); + assertEquals("serviceType",si.getServiceType()); + assertEquals("serviceInstanceId",si.getServiceInstanceId()); + assertEquals("subscriberName",si.getSubscriberName()); + assertEquals("subscriberType",si.getSubscriberType()); + assertEquals("serviceInstanceName",si.getServiceInstanceName()); + assertEquals("serviceInstanceLocationId",si.getServiceInstanceLocationId()); + assertEquals("serviceDomain",si.getServiceDomain()); } } diff --git a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/OperationProgressTest.java b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/OperationProgressTest.java index 1f3cb84e..fae9cf4e 100644 --- a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/OperationProgressTest.java +++ b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/OperationProgressTest.java @@ -40,6 +40,8 @@ import org.hibernate.Transaction; import mockit.Mock; import mockit.MockUp; +import static org.junit.Assert.assertEquals; + public class OperationProgressTest { @Before @@ -53,15 +55,17 @@ public class OperationProgressTest { @Test public void testOperationProgress() throws Exception { OperationProgress op = new OperationProgress(); - op.setUserId(""); - op.setOperationId(""); - op.setOperation(""); - op.setResult(""); - op.setReason(""); - op.setOperationContent(""); - op.setProgress(1); - op.setOperateAt(""); - op.setFinishedAt(""); + op.setUserId("test"); + op.setOperationId("test"); + op.setOperation("test"); + op.setResult("test"); + op.setReason("test"); + op.setOperationContent("test"); + op.setProgress(123); + op.setOperateAt("test"); + op.setFinishedAt("test"); + op.setServiceId("123"); + op.setServiceName("test"); op.getOperationId(); op.getOperation(); op.getResult(); @@ -70,6 +74,33 @@ public class OperationProgressTest { op.getOperationContent(); op.getProgress(); op.getOperateAt(); - op.getFinishedAt(); + assertEquals("123",op.getServiceId()); + assertEquals("test",op.getOperationId()); + assertEquals("test",op.getServiceName()); + assertEquals("test",op.getOperation()); + assertEquals("test",op.getResult()); + assertEquals("test",op.getReason()); + assertEquals("test",op.getUserId()); + assertEquals("test",op.getFinishedAt()); + assertEquals("test",op.getOperateAt()); + assertEquals("test",op.getOperationContent()); + assertEquals(123,op.getProgress()); + + } + @Test + public void testConstructor(){ + OperationProgress op = new OperationProgress("123","test","test","test","test","test","test","test",123,"test","test"); + assertEquals("123",op.getServiceId()); + assertEquals("test",op.getOperationId()); + assertEquals("test",op.getServiceName()); + assertEquals("test",op.getOperation()); + assertEquals("test",op.getResult()); + assertEquals("test",op.getReason()); + assertEquals("test",op.getUserId()); + assertEquals("test",op.getFinishedAt()); + assertEquals("test",op.getOperateAt()); + assertEquals("test",op.getOperationContent()); + assertEquals(123,op.getProgress()); + } } diff --git a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/SaveOrUpdateOperationRspTest.java b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/SaveOrUpdateOperationRspTest.java new file mode 100644 index 00000000..750df1ad --- /dev/null +++ b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/so/bean/SaveOrUpdateOperationRspTest.java @@ -0,0 +1,53 @@ +/*- + * ============LICENSE_START============================================ + * ONAP + * ===================================================================== + * Copyright (C) 2020 IBM Intellectual Property. All rights reserved. + * ===================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software 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. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * 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.usecaseui.server.service.lcm.domain.so.bean; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class SaveOrUpdateOperationRspTest { + + @Test + public void testGetOpertionId(){ + SaveOrUpdateOperationRsp suor= new SaveOrUpdateOperationRsp(); + suor.setOperationId("test"); + assertEquals("test",suor.getOperationId()); + assertEquals("SaveOrUpdateOperationRsp [operationId=test]",suor.toString()); + } +} |