From f1eb76a0f0773780c9179f6098ed9847ecb9f9fa Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 19 Mar 2020 17:37:05 +0000 Subject: Add unit test for Version fetch change Issue-ID: POLICY-2377 Change-Id: Iaad1da84de058fcb50d24663156b4b0bcedd427e Signed-off-by: liamfallon --- .../policy/models/base/PfConceptContainerTest.java | 16 +++++++ .../policy/models/base/PfConceptFilterTest.java | 55 ++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 models-base/src/test/java/org/onap/policy/models/base/PfConceptFilterTest.java (limited to 'models-base/src/test/java/org/onap') 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 a00363627..600605ae1 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 @@ -171,7 +171,23 @@ public class PfConceptContainerTest { returnSet = container.getAll(conceptKey.getName(), conceptKey.getVersion()); assertEquals(conceptKey, returnSet.iterator().next().getKey()); + returnSet = container.getAllNamesAndVersions(conceptKey.getName(), conceptKey.getVersion()); + assertEquals(conceptKey, returnSet.iterator().next().getKey()); + returnSet = container.getAllNamesAndVersions(null, conceptKey.getVersion()); + assertEquals(conceptKey, returnSet.iterator().next().getKey()); + returnSet = container.getAllNamesAndVersions(null, null); + assertEquals(conceptKey, returnSet.iterator().next().getKey()); + returnSet = container.getAllNamesAndVersions(conceptKey.getName(), null); + assertEquals(conceptKey, returnSet.iterator().next().getKey()); + returnSet = container.getAllNamesAndVersions("IDontExist", "1.0.0"); + assertTrue(returnSet.isEmpty()); + container.getConceptMap().put(conceptKey, new DummyPfConceptSub(conceptKey)); + + PfConceptKey anotherKey = new PfConceptKey(conceptKey); + assertEquals(conceptKey, container.get(anotherKey).getKey()); + anotherKey.setVersion(PfKey.NULL_KEY_VERSION); + assertEquals(conceptKey, container.get(anotherKey).getKey()); } @Test diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfConceptFilterTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfConceptFilterTest.java new file mode 100644 index 000000000..e82ab41eb --- /dev/null +++ b/models-base/src/test/java/org/onap/policy/models/base/PfConceptFilterTest.java @@ -0,0 +1,55 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2020 Nordix Foundation. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.models.base; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Test; + +/** + * Test the {@link PfObjectFilter} interface. + * + * @author Liam Fallon (liam.fallon@est.tech) + */ +public class PfConceptFilterTest { + + @Test + public void testPfConceptFilter() { + List listToBeFiltered = new ArrayList<>(); + + PfConceptFilter conceptFilter = new PfConceptFilter(null, null, null); + List filteredList = conceptFilter.filter(listToBeFiltered); + assertTrue(filteredList.isEmpty()); + + conceptFilter = new PfConceptFilter(null, PfConceptFilter.LATEST_VERSION, null); + filteredList = conceptFilter.filter(listToBeFiltered); + assertTrue(filteredList.isEmpty()); + + assertThatThrownBy(() -> { + final PfConceptFilter conceptFilterNull = new PfConceptFilter(null, null, null); + conceptFilterNull.filter(null); + }).hasMessageMatching("^originalList is marked .*on.*ull but is null$"); + } +} -- cgit 1.2.3-korg