diff options
author | 2019-12-06 15:07:03 +0000 | |
---|---|---|
committer | 2019-12-06 15:07:03 +0000 | |
commit | 3c98ef789246de51d6f1495b7232167d351ca44f (patch) | |
tree | e8ac2a06bcad934d8e9b301bc5f064e4d09f4ee3 /models-tosca | |
parent | dfc7c87b5f94087d209a2b9f7e2dc6d9a9dce1a8 (diff) | |
parent | 19093bbdec52fbe97fa404670aba4af12dc750e0 (diff) |
Merge "Add new Operational Policy Type"
Diffstat (limited to 'models-tosca')
-rw-r--r-- | models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilterTest.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilterTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilterTest.java index bf9f92e28..2c62e7fc0 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilterTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilterTest.java @@ -182,7 +182,7 @@ public class ToscaPolicyFilterTest { filter = ToscaPolicyFilter.builder().version(VERSION_100).build(); filteredList = filter.filter(policyList); - assertEquals(17, filteredList.size()); + assertEquals(15, filteredList.size()); filter = ToscaPolicyFilter.builder().name("OSDF_CASABLANCA.SubscriberPolicy_v1").version(VERSION_100).build(); filteredList = filter.filter(policyList); @@ -202,7 +202,7 @@ public class ToscaPolicyFilterTest { filter = ToscaPolicyFilter.builder().versionPrefix("1.").build(); filteredList = filter.filter(policyList); - assertEquals(17, filteredList.size()); + assertEquals(14, filteredList.size()); filter = ToscaPolicyFilter.builder().versionPrefix("100.").build(); filteredList = filter.filter(policyList); @@ -213,7 +213,11 @@ public class ToscaPolicyFilterTest { public void testFilterTypeVersion() { ToscaPolicyFilter filter = ToscaPolicyFilter.builder().type("onap.policies.controlloop.Operational").build(); List<ToscaPolicy> filteredList = filter.filter(policyList); - assertEquals(4, filteredList.size()); + assertEquals(1, filteredList.size()); + + filter = ToscaPolicyFilter.builder().type("onap.policies.controlloop.operational.common.Drools").build(); + filteredList = filter.filter(policyList); + assertEquals(3, filteredList.size()); filter = ToscaPolicyFilter.builder().type("onap.policies.monitoring.cdap.tca.hi.lo.app").build(); filteredList = filter.filter(policyList); @@ -225,7 +229,7 @@ public class ToscaPolicyFilterTest { filter = ToscaPolicyFilter.builder().typeVersion(VERSION_000).build(); filteredList = filter.filter(policyList); - assertEquals(17, filteredList.size()); + assertEquals(14, filteredList.size()); filter = ToscaPolicyFilter.builder().type("onap.policies.optimization.HpaPolicy").typeVersion(VERSION_000) .build(); @@ -235,6 +239,6 @@ public class ToscaPolicyFilterTest { filter = ToscaPolicyFilter.builder().type("onap.policies.controlloop.Operational").typeVersion(VERSION_000) .build(); filteredList = filter.filter(policyList); - assertEquals(4, filteredList.size()); + assertEquals(1, filteredList.size()); } } |