aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/java/org/onap
diff options
context:
space:
mode:
authorEddy Hautot <eh552t@intl.att.com>2019-03-15 17:55:27 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-15 17:55:27 +0000
commit157e2de9766fdf9adc939dca43df4ccf0b16188d (patch)
treead7a2215e2cdb596dca843af4f203fb932d92084 /src/test/java/org/onap
parent7fc8fd594dddbd079fcb8419f658e08620eb38c7 (diff)
parent3d51989fd3559babafeb0ca1d0d0ca8b40ee46a3 (diff)
Merge "Fix policy Tosca converter"
Diffstat (limited to 'src/test/java/org/onap')
-rw-r--r--src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java3
-rw-r--r--src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java b/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java
index d94ffabaf..199d05370 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java
@@ -47,8 +47,7 @@ public class ToscaYamlToJsonConvertorTest {
String parsedJsonSchema = convertor.parseToscaYaml(toscaModelYaml);
assertNotNull(parsedJsonSchema);
- JSONAssert.assertEquals(
- ResourceFileUtil.getResourceAsString("example/json-editor-schema/tca-policy-json-editor-schema.json"),
+ JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json.json"),
parsedJsonSchema, true);
}
}
diff --git a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
index afa07236d..fcef5b79e 100644
--- a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
+++ b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
@@ -135,7 +135,7 @@ public class CsarInstallerItCase {
// Mockito.when(csarHandler.getSdcCsarHelper()).thenReturn(csarHelper);
Mockito.when(csarHandler.getPolicyModelYaml())
- .thenReturn(Optional.ofNullable(ResourceFileUtil.getResourceAsString("tosca/tca-policy-test.yaml")));
+ .thenReturn(Optional.ofNullable(ResourceFileUtil.getResourceAsString("tosca/tosca_example.yaml")));
return csarHandler;
}
@@ -173,6 +173,7 @@ public class CsarInstallerItCase {
assertThat(loop.getSvgRepresentation()).startsWith("<svg ");
assertThat(loop.getGlobalPropertiesJson().get("dcaeDeployParameters")).isNotNull();
assertThat(loop.getMicroServicePolicies()).hasSize(1);
+
assertThat(loop.getOperationalPolicies()).hasSize(1);
assertThat(loop.getModelPropertiesJson().get("serviceDetails")).isNotNull();
assertThat(loop.getModelPropertiesJson().get("resourceDetails")).isNotNull();