diff options
| author |   Arthur Martella <amartell@research.att.com> | 2017-09-08 13:27:46 -0400 |
|---|---|---|
| committer | Arthur Martella <amartell@research.att.com> | 2017-09-08 13:32:24 -0400 |
| commit | 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 (patch) | |
| tree | 68c0c53c9156f5aa3c6b3599ac940770f986633d /asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java | |
| parent | fa1a211d28a912892fcd888569df033900eb01ee (diff) | |
1710 Rebase - Second Attempt
This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400
Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000
Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>
Diffstat (limited to 'asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java')
| -rw-r--r-- | asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java index bce9324de9..7351b1b439 100644 --- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java +++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java @@ -53,7 +53,7 @@ public class YamlTest { InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTest.yaml")); YamlEditor decoder = new YamlEditor (IOUtils.toByteArray(input)); - Set <HeatTemplateParam> paramSet = decoder.getParameterList(); + Set <HeatTemplateParam> paramSet = decoder.getParameterList("123456"); assertTrue(paramSet.size() == 5); @@ -79,12 +79,12 @@ public class YamlTest { Set <HeatTemplateParam> newParamSet = new HashSet <HeatTemplateParam> (); HeatTemplateParam heatParam1 = new HeatTemplateParam(); - heatParam1.setId(1); + heatParam1.setHeatTemplateArtifactUuid("1"); heatParam1.setParamName("testos1"); heatParam1.setParamType("string"); HeatTemplateParam heatParam2 = new HeatTemplateParam(); - heatParam2.setId(2); + heatParam2.setHeatTemplateArtifactUuid("2"); heatParam2.setParamName("testos2"); heatParam2.setParamType("number"); @@ -93,7 +93,7 @@ public class YamlTest { decoder.addParameterList(newParamSet); - Set <HeatTemplateParam> paramSet = decoder.getParameterList(); + Set <HeatTemplateParam> paramSet = decoder.getParameterList("123456"); assertTrue(paramSet.size() == 2); assertTrue(decoder.encode().contains("testos1")); @@ -111,12 +111,12 @@ public class YamlTest { Set <HeatTemplateParam> newParamSet = new HashSet <HeatTemplateParam> (); HeatTemplateParam heatParam1 = new HeatTemplateParam(); - heatParam1.setId(1); + heatParam1.setHeatTemplateArtifactUuid("1"); heatParam1.setParamName("testos1"); heatParam1.setParamType("string"); HeatTemplateParam heatParam2 = new HeatTemplateParam(); - heatParam2.setId(2); + heatParam2.setHeatTemplateArtifactUuid("2"); heatParam2.setParamName("testos2"); heatParam2.setParamType("number"); @@ -125,7 +125,7 @@ public class YamlTest { decoder.addParameterList(newParamSet); - Set <HeatTemplateParam> paramSet = decoder.getParameterList(); + Set <HeatTemplateParam> paramSet = decoder.getParameterList("123456"); assertTrue(paramSet.size() == 7); |