From 10c11e142feb1d040612fed695aaf76d007294da Mon Sep 17 00:00:00 2001 From: liamfallon Date: Fri, 14 Jun 2019 07:38:26 +0000 Subject: Allow multiple versions of entities to be returned Fix .gitreviw file to point at "master" rather than "dublin" Allow return of multiple versions of policy types and data types in TOSCA service templates and multiple policies in TOSCA topology templates. Because the return type is a list of singleton maps, utility methods were added to return flat maps of poliicy types, data types, and policies keyed by a compound ToscaEntityKey name/version key. Issue-ID: POLICY-1807 Change-Id: I355038aaca26f41064d0e3cb3b45b1de2294cf5f Signed-off-by: liamfallon --- .../java/org/onap/policy/models/base/PfConceptContainerTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'models-base/src/test') diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfConceptContainerTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfConceptContainerTest.java index 44ec51019..4ad7c0f9e 100644 --- a/models-base/src/test/java/org/onap/policy/models/base/PfConceptContainerTest.java +++ b/models-base/src/test/java/org/onap/policy/models/base/PfConceptContainerTest.java @@ -213,9 +213,9 @@ public class PfConceptContainerTest { List> outMapList = container.toAuthorative(); - assertEquals(dacMap.get("name0"), outMapList.get(0).get("name0")); - assertEquals(dacMap.get("name1").getDescription(), outMapList.get(0).get("NULL").getDescription()); - assertEquals(dacMap.get("name2"), outMapList.get(0).get("name2")); + assertEquals(dacMap.get("name1"), outMapList.get(0).get("NULL")); + assertEquals(dacMap.get("name0").getDescription(), outMapList.get(1).get("name0").getDescription()); + assertEquals(dacMap.get("name2"), outMapList.get(2).get("name2")); DummyBadPfConceptContainer badContainer = new DummyBadPfConceptContainer(); assertThatThrownBy(() -> { -- cgit 1.2.3-korg