From 99bfdc2584c408970d9d9cdc0e8ab869dc126edb Mon Sep 17 00:00:00 2001 From: liamfallon Date: Fri, 20 Mar 2020 12:50:35 +0000 Subject: Test cascaded multiple revision gets This patch tests cascaded get requests with multiple revisions. Issue-ID: POLICY-2377 Change-Id: Ie7dc849d7b930b861d38c386a9950ae7e84e2a05 Signed-off-by: liamfallon --- .../src/main/java/org/onap/policy/models/base/PfConceptContainer.java | 2 +- .../test/java/org/onap/policy/models/base/PfConceptContainerTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'models-base') diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java b/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java index d259fa260..b94900430 100644 --- a/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java +++ b/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java @@ -322,7 +322,7 @@ public class PfConceptContainer ex * @return conceptKeyVersion */ public Set getAllNamesAndVersions(final String conceptKeyName, final String conceptKeyVersion) { - if (conceptKeyName == null || conceptKeyVersion == null) { + if (conceptKeyName == null || conceptKeyVersion == null || PfKey.NULL_KEY_VERSION.equals(conceptKeyVersion)) { return getAll(conceptKeyName, conceptKeyVersion); } else { final Set returnSet = new TreeSet<>(); 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 600605ae1..e28fa4cdf 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 @@ -179,6 +179,8 @@ public class PfConceptContainerTest { assertEquals(conceptKey, returnSet.iterator().next().getKey()); returnSet = container.getAllNamesAndVersions(conceptKey.getName(), null); assertEquals(conceptKey, returnSet.iterator().next().getKey()); + returnSet = container.getAllNamesAndVersions(conceptKey.getName(), "0.0.0"); + assertEquals(conceptKey, returnSet.iterator().next().getKey()); returnSet = container.getAllNamesAndVersions("IDontExist", "1.0.0"); assertTrue(returnSet.isEmpty()); -- cgit 1.2.3-korg