From 70d33f19094d05d7762eb04fbada9157e9979110 Mon Sep 17 00:00:00 2001 From: c00149107 Date: Wed, 21 Mar 2018 14:33:34 +0800 Subject: Generate sdnc network operation request body Generate sdnc network operation request body Change-Id: I192a50e322f9982b07b3fa3cbb7c180ab6a66bc3 Issue-ID: SO-501 Signed-off-by: c00149107 --- .../mso/bpmn/common/recipe/ResourceInputTest.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'bpmn/MSOCommonBPMN/src/test/java/org') diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceInputTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceInputTest.java index fe1975faf9..466f4a1f3f 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceInputTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceInputTest.java @@ -19,9 +19,10 @@ */ package org.openecomp.mso.bpmn.common.recipe; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; +import org.openecomp.mso.bpmn.core.domain.ModelInfo; public class ResourceInputTest { @@ -34,9 +35,16 @@ public class ResourceInputTest { ri.setServiceType("serviceType"); ri.setServiceInstanceId("serviceId"); ri.setOperationId("operationId"); - ri.setResourceInvariantUuid("resourceInvariantUuid"); - ri.setResourceUuid("resourceUuid"); - ri.setResourceCustomizationUuid("resourceCustomizationUuid"); + ModelInfo serviceModelInfo = new ModelInfo(); + serviceModelInfo.setModelCustomizationUuid("modelCustomizationUuid"); + serviceModelInfo.setModelInvariantUuid("modelInvariantUuid"); + serviceModelInfo.setModelUuid("modelUuid"); + ri.setServiceModelInfo(serviceModelInfo); + ModelInfo resourceModelInfo = new ModelInfo(); + resourceModelInfo.setModelCustomizationUuid("modelCustomizationUuid"); + resourceModelInfo.setModelInvariantUuid("modelInvariantUuid"); + resourceModelInfo.setModelUuid("modelUuid"); + ri.setResourceModelInfo(resourceModelInfo); ri.setResourceInstancenUuid("resourceInstancenUuid"); ri.setResourceParameters("resourceParameters"); ri.setOperationType("operationType"); @@ -46,9 +54,6 @@ public class ResourceInputTest { assertEquals(ri.getServiceType(), "serviceType"); assertEquals(ri.getServiceInstanceId(), "serviceId"); assertEquals(ri.getOperationId(), "operationId"); - assertEquals(ri.getResourceInvariantUuid(), "resourceInvariantUuid"); - assertEquals(ri.getResourceUuid(), "resourceUuid"); - assertEquals(ri.getResourceCustomizationUuid(), "resourceCustomizationUuid"); assertEquals(ri.getResourceInstancenUuid(), "resourceInstancenUuid"); assertEquals(ri.getResourceParameters(), "resourceParameters"); assertEquals(ri.getOperationType(), "operationType"); -- cgit 1.2.3-korg