From 81a61d098ee5125f065853da2aa503a00ca846d8 Mon Sep 17 00:00:00 2001 From: root1 Date: Tue, 11 Aug 2020 18:44:29 +0530 Subject: CLAMP should not display all CDS workflow properties CLAMP should not display all CDS workflow properties Issue-ID: CLAMP-856 Signed-off-by: root1 (cherry picked from commit 2d9f989e0d37002c758bdf66a3f25fcfdac35b62) Change-Id: Icc07decf95a4e8977cd9559373bde9053ef6b8bb Signed-off-by: sebdet --- .../update/ToscaConverterWithDictionarySupportItCase.java | 2 +- .../concepts/ControlLoopToscaServiceTemplateTest.java | 13 +++++++------ .../OperationalPolicyRepresentationBuilderTest.java | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/test/java/org/onap') diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java index 7f0e57602..f7774214c 100644 --- a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java +++ b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java @@ -128,7 +128,7 @@ public class ToscaConverterWithDictionarySupportItCase { @Transactional public final void testMetadataClampPossibleValueWithExecutor() throws IOException, UnknownComponentException { Service service = new Service(ResourceFileUtil.getResourceAsString("tosca/service-details.json"), - ResourceFileUtil.getResourceAsString("tosca/resource-details.json")); + ResourceFileUtil.getResourceAsString("tosca/resource-details-cds.json")); JsonTemplateManager jsonTemplateManager = new JsonTemplateManager( ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap" diff --git a/src/test/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplateTest.java b/src/test/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplateTest.java index f89c78687..b1bbd512e 100644 --- a/src/test/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplateTest.java +++ b/src/test/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplateTest.java @@ -20,14 +20,15 @@ package org.onap.clamp.controlloop.models.tosca.authorative.concepts; -import org.junit.Test; import static org.junit.Assert.assertNotNull; +import org.junit.Test; + public class ControlLoopToscaServiceTemplateTest { - @Test - public void testClassDef() { - ControlLoopToscaServiceTemplate serviceTemplate = new ControlLoopToscaServiceTemplate(); - assertNotNull("ControlLoopToscaServiceTemplate is Not null", serviceTemplate); - } + @Test + public void testClassDef() { + ControlLoopToscaServiceTemplate serviceTemplate = new ControlLoopToscaServiceTemplate(); + assertNotNull("ControlLoopToscaServiceTemplate is Not null", serviceTemplate); + } } \ No newline at end of file diff --git a/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java b/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java index b90a28616..4f728b44a 100644 --- a/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java +++ b/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java @@ -37,8 +37,8 @@ public class OperationalPolicyRepresentationBuilderTest { @Test public void testOperationalPolicyPayloadConstruction() throws IOException { - JsonObject jsonModel = new GsonBuilder().create() - .fromJson(ResourceFileUtil.getResourceAsString("tosca/model-properties.json"), JsonObject.class); + JsonObject jsonModel = new GsonBuilder().create().fromJson(ResourceFileUtil + .getResourceAsString("tosca/model-properties-operational-policy.json"), JsonObject.class); Service service = new Service(jsonModel.get("serviceDetails").getAsJsonObject(), jsonModel.get("resourceDetails").getAsJsonObject(), "1.0"); -- cgit