summaryrefslogtreecommitdiffstats
path: root/models-base/src/test
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-11-15 14:12:23 -0500
committerJim Hahn <jrh3@att.com>2019-11-15 16:24:10 -0500
commite81da8dac30b0525dd0f84e3518bcc452695e224 (patch)
tree6ccae8d31f1384e144cab6ab3015a82f31f7ecb4 /models-base/src/test
parent94c19c4395d37147a1721c508e4ba4d18a555464 (diff)
Support wild cards in "supported policy types"
Refactored PfConceptKey, extracting most of it into PfKeyImpl. Added PfSearchableKey as a subclass of PfKeyImpl. Change-Id: I524f4ce9208fc9ba09e77db4cc7dde5a21e1d7fc Issue-ID: POLICY-2224 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'models-base/src/test')
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/PfConceptKeyTest.java78
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/PfKeyImplTest.java (renamed from models-base/src/test/java/org/onap/policy/models/base/PfKeyTest.java)103
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/PfSearchableKeyTest.java77
3 files changed, 219 insertions, 39 deletions
diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfConceptKeyTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfConceptKeyTest.java
new file mode 100644
index 000000000..a29858393
--- /dev/null
+++ b/models-base/src/test/java/org/onap/policy/models/base/PfConceptKeyTest.java
@@ -0,0 +1,78 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.onap.policy.models.base.testconcepts.DummyPfConcept;
+
+public class PfConceptKeyTest {
+
+ private static final String VERSION001 = "0.0.1";
+ private static final String ID_IS_NULL = "id is marked @NonNull but is null";
+
+ @Test
+ public void testConceptKey() {
+ PfConceptKey someKey0 = new PfConceptKey();
+ assertEquals(PfConceptKey.getNullKey(), someKey0);
+ assertTrue(someKey0.isNullKey());
+ assertEquals("PfConceptKey(name=NULL, version=0.0.0)", someKey0.toString());
+
+ PfConceptKey someKey1 = new PfConceptKey("my-name", VERSION001);
+ PfConceptKey someKey2 = new PfConceptKey(someKey1);
+ PfConceptKey someKey3 = new PfConceptKey(someKey1.getId());
+ assertEquals(someKey1, someKey2);
+ assertEquals(someKey1, someKey3);
+ assertFalse(someKey1.isNullVersion());
+ assertEquals("PfConceptKey(name=my-name, version=0.0.1)", someKey1.toString());
+
+ assertEquals("my-name", someKey1.getName());
+ assertEquals(VERSION001, someKey1.getVersion());
+
+ assertEquals(someKey2, someKey1.getKey());
+ assertEquals(1, someKey1.getKeys().size());
+
+
+ PfConcept pfc = new DummyPfConcept();
+ assertEquals(PfConceptKey.getNullKey().getId(), pfc.getId());
+
+ assertTrue(PfConceptKey.getNullKey().matchesId(pfc.getId()));
+
+ assertTrue(PfConceptKey.getNullKey().isNullKey());
+
+ assertThatThrownBy(() -> PfConceptKey.getNullKey().matchesId(null)).hasMessage(ID_IS_NULL);
+
+ assertThatThrownBy(() -> someKey0.setName(null)).isInstanceOf(NullPointerException.class)
+ .hasMessage("name is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> someKey0.setVersion(null)).isInstanceOf(NullPointerException.class)
+ .hasMessage("version is marked @NonNull but is null");
+
+ assertThatIllegalArgumentException().isThrownBy(() -> new PfConceptKey("my-name.*", VERSION001)).withMessage(
+ "parameter 'name': value 'my-name.*', does not match regular expression '^[A-Za-z0-9\\-_\\.]+$'"
+ .replace('\'', '"'));
+ }
+}
diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfKeyTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfKeyImplTest.java
index fca73b0d6..f467ec35a 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/PfKeyTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/PfKeyImplTest.java
@@ -29,12 +29,15 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.Field;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
import org.junit.Test;
import org.onap.policy.models.base.PfKey.Compatibility;
-import org.onap.policy.models.base.testconcepts.DummyPfConcept;
import org.onap.policy.models.base.testconcepts.DummyPfKey;
-public class PfKeyTest {
+public class PfKeyImplTest {
private static final String OTHER_IS_NULL = "otherKey is marked @NonNull but is null";
private static final String ID_IS_NULL = "id is marked @NonNull but is null";
@@ -44,21 +47,23 @@ public class PfKeyTest {
@Test
public void testConceptKey() {
- assertThatIllegalArgumentException().isThrownBy(() -> new PfConceptKey("some bad key id"))
+ assertThatIllegalArgumentException().isThrownBy(() -> new MyKey("some bad key id"))
.withMessage("parameter \"id\": value \"some bad key id\", "
+ "does not match regular expression \"" + PfKey.KEY_ID_REGEXP + "\"");
- assertThatThrownBy(() -> new PfConceptKey((PfConceptKey) null))
+ assertThatThrownBy(() -> new MyKey((MyKey) null))
.hasMessage("copyConcept is marked @NonNull but is null");
- PfConceptKey someKey0 = new PfConceptKey();
- assertEquals(PfConceptKey.getNullKey(), someKey0);
+ MyKey someKey0 = new MyKey();
+ assertTrue(someKey0.isNullKey());
+ assertEquals(new MyKey(PfKey.NULL_KEY_NAME, PfKey.NULL_KEY_VERSION), someKey0);
- PfConceptKey someKey1 = new PfConceptKey("name", VERSION001);
- PfConceptKey someKey2 = new PfConceptKey(someKey1);
- PfConceptKey someKey3 = new PfConceptKey(someKey1.getId());
+ MyKey someKey1 = new MyKey("name", VERSION001);
+ MyKey someKey2 = new MyKey(someKey1);
+ MyKey someKey3 = new MyKey(someKey1.getId());
assertEquals(someKey1, someKey2);
assertEquals(someKey1, someKey3);
+ assertFalse(someKey1.isNullKey());
assertFalse(someKey1.isNullVersion());
assertEquals(someKey2, someKey1.getKey());
@@ -69,28 +74,22 @@ public class PfKeyTest {
someKey3.setVersion("0.0.2");
- PfConceptKey someKey4 = new PfConceptKey(someKey1);
+ MyKey someKey4 = new MyKey(someKey1);
someKey4.setVersion("0.1.2");
- PfConceptKey someKey4a = new PfConceptKey(someKey1);
+ MyKey someKey4a = new MyKey(someKey1);
someKey4a.setVersion("0.0.0");
- PfConceptKey someKey5 = new PfConceptKey(someKey1);
+ MyKey someKey5 = new MyKey(someKey1);
someKey5.setVersion("1.2.2");
- PfConceptKey someKey6 = new PfConceptKey(someKey1);
+ MyKey someKey6 = new MyKey(someKey1);
someKey6.setVersion("3.0.0");
assertEquals("name:0.1.2", someKey4.getId());
- PfConcept pfc = new DummyPfConcept();
- assertEquals(PfConceptKey.getNullKey().getId(), pfc.getId());
-
- assertTrue(PfConceptKey.getNullKey().matchesId(pfc.getId()));
-
- assertTrue(PfConceptKey.getNullKey().isNullKey());
-
- assertThatThrownBy(() -> PfConceptKey.getNullKey().matchesId(null)).hasMessage(ID_IS_NULL);
+ assertThatThrownBy(() -> someKey0.getCompatibility(null)).isInstanceOf(NullPointerException.class)
+ .hasMessage("otherKey is marked @NonNull but is null");
assertEquals(Compatibility.DIFFERENT, someKey0.getCompatibility(new DummyPfKey()));
assertEquals(Compatibility.DIFFERENT, someKey0.getCompatibility(someKey1));
@@ -127,7 +126,7 @@ public class PfKeyTest {
someKey0.clean();
assertNotNull(someKey0.toString());
- PfConceptKey someKey7 = new PfConceptKey(someKey1);
+ MyKey someKey7 = new MyKey(someKey1);
assertEquals(244799191, someKey7.hashCode());
assertEquals(0, someKey7.compareTo(someKey1));
assertEquals(-12, someKey7.compareTo(someKey0));
@@ -141,27 +140,31 @@ public class PfKeyTest {
assertFalse(someKey0.equals(null));
assertTrue(someKey0.equals(someKey0));
assertFalse(someKey0.equals(new DummyPfKey()));
+
+ MyKey someKey8 = new MyKey();
+ someKey8.setVersion(VERSION001);
+ assertFalse(someKey8.isNullKey());
}
@Test
public void testNullArguments() {
- assertThatThrownBy(() -> new PfConceptKey((String) null)).hasMessage(ID_IS_NULL);
+ assertThatThrownBy(() -> new MyKey((String) null)).hasMessage(ID_IS_NULL);
- assertThatThrownBy(() -> new PfConceptKey((PfConceptKey) null))
+ assertThatThrownBy(() -> new MyKey((MyKey) null))
.hasMessage("copyConcept is marked @NonNull but is null");
- assertThatThrownBy(() -> new PfConceptKey(null, null)).hasMessage("name is marked @NonNull but is null");
+ assertThatThrownBy(() -> new MyKey(null, null)).hasMessage("name is marked @NonNull but is null");
- assertThatThrownBy(() -> new PfConceptKey("name", null)).hasMessage("version is marked @NonNull but is null");
+ assertThatThrownBy(() -> new MyKey("name", null)).hasMessage("version is marked @NonNull but is null");
- assertThatThrownBy(() -> new PfConceptKey(null, VERSION001)).hasMessage("name is marked @NonNull but is null");
+ assertThatThrownBy(() -> new MyKey(null, VERSION001)).hasMessage("name is marked @NonNull but is null");
- assertThatThrownBy(() -> new PfConceptKey("AKey", VERSION001).isCompatible(null)).hasMessage(OTHER_IS_NULL);
+ assertThatThrownBy(() -> new MyKey("AKey", VERSION001).isCompatible(null)).hasMessage(OTHER_IS_NULL);
}
@Test
public void testValidation() throws Exception {
- PfConceptKey testKey = new PfConceptKey("TheKey", VERSION001);
+ MyKey testKey = new MyKey("TheKey", VERSION001);
assertEquals("TheKey:0.0.1", testKey.getId());
Field nameField = testKey.getClass().getDeclaredField("name");
@@ -191,20 +194,20 @@ public class PfKeyTest {
@Test
public void testkeynewerThan() {
- PfConceptKey key1 = new PfConceptKey("Key1", VERSION123);
+ MyKey key1 = new MyKey("Key1", VERSION123);
assertThatThrownBy(() -> key1.isNewerThan(null)).hasMessage(OTHER_IS_NULL);
assertThatThrownBy(() -> key1.isNewerThan(new PfReferenceKey()))
.hasMessage("org.onap.policy.models.base.PfReferenceKey is not "
- + "an instance of org.onap.policy.models.base.PfConceptKey");
+ + "an instance of " + PfKeyImpl.class.getName());
assertFalse(key1.isNewerThan(key1));
- PfConceptKey key1a = new PfConceptKey("Key1a", VERSION123);
+ MyKey key1a = new MyKey("Key1a", VERSION123);
assertFalse(key1.isNewerThan(key1a));
- PfConceptKey key1b = new PfConceptKey("Key0", VERSION123);
+ MyKey key1b = new MyKey("Key0", VERSION123);
assertTrue(key1.isNewerThan(key1b));
key1a.setName("Key1");
@@ -240,28 +243,50 @@ public class PfKeyTest {
assertThatThrownBy(() -> refKey.isNewerThan(null)).hasMessage(OTHER_IS_NULL);
- assertThatThrownBy(() -> refKey.isNewerThan(new PfConceptKey()))
- .hasMessage("org.onap.policy.models.base.PfConceptKey is not "
- + "an instance of org.onap.policy.models.base.PfReferenceKey");
+ assertThatThrownBy(() -> refKey.isNewerThan(new MyKey()))
+ .hasMessage(MyKey.class.getName() + " is not an instance of " + PfReferenceKey.class.getName());
assertFalse(refKey.isNewerThan(refKey));
}
@Test
public void testmajorMinorPatch() {
- PfConceptKey key = new PfConceptKey("Key", VERSION100);
+ MyKey key = new MyKey("Key", VERSION100);
assertEquals(1, key.getMajorVersion());
assertEquals(0, key.getMinorVersion());
assertEquals(0, key.getPatchVersion());
- key = new PfConceptKey("Key", "1.2.0");
+ key = new MyKey("Key", "1.2.0");
assertEquals(1, key.getMajorVersion());
assertEquals(2, key.getMinorVersion());
assertEquals(0, key.getPatchVersion());
- key = new PfConceptKey("Key", VERSION123);
+ key = new MyKey("Key", VERSION123);
assertEquals(1, key.getMajorVersion());
assertEquals(2, key.getMinorVersion());
assertEquals(3, key.getPatchVersion());
}
+
+ @Getter
+ @Setter
+ @EqualsAndHashCode(callSuper = false)
+ @NoArgsConstructor
+ private static class MyKey extends PfKeyImpl {
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+ private String version;
+
+ public MyKey(String name, String version) {
+ super(name, version);
+ }
+
+ public MyKey(String id) {
+ super(id);
+ }
+
+ public MyKey(MyKey myKey) {
+ super(myKey);
+ }
+ }
}
diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfSearchableKeyTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfSearchableKeyTest.java
new file mode 100644
index 000000000..942f47c1d
--- /dev/null
+++ b/models-base/src/test/java/org/onap/policy/models/base/PfSearchableKeyTest.java
@@ -0,0 +1,77 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.onap.policy.models.base.testconcepts.DummyPfConcept;
+
+public class PfSearchableKeyTest {
+
+ private static final String VERSION001 = "0.0.1";
+ private static final String ID_IS_NULL = "id is marked @NonNull but is null";
+
+ @Test
+ public void testSearchableKey() {
+ PfSearchableKey someKey0 = new PfSearchableKey();
+ assertEquals(PfSearchableKey.getNullKey(), someKey0);
+ assertTrue(someKey0.isNullKey());
+ assertEquals("PfSearchableKey(name=NULL, version=0.0.0)", someKey0.toString());
+
+ PfSearchableKey someKey1 = new PfSearchableKey("my-name", VERSION001);
+ PfSearchableKey someKey2 = new PfSearchableKey(someKey1);
+ PfSearchableKey someKey3 = new PfSearchableKey(someKey1.getId());
+ assertEquals(someKey1, someKey2);
+ assertEquals(someKey1, someKey3);
+ assertFalse(someKey1.isNullVersion());
+ assertEquals("PfSearchableKey(name=my-name, version=0.0.1)", someKey1.toString());
+
+ assertEquals("my-name", someKey1.getName());
+ assertEquals(VERSION001, someKey1.getVersion());
+
+ assertEquals(someKey2, someKey1.getKey());
+ assertEquals(1, someKey1.getKeys().size());
+
+
+ PfConcept pfc = new DummyPfConcept();
+ assertEquals(PfSearchableKey.getNullKey().getId(), pfc.getId());
+
+ assertTrue(PfSearchableKey.getNullKey().matchesId(pfc.getId()));
+
+ assertTrue(PfSearchableKey.getNullKey().isNullKey());
+
+ assertThatThrownBy(() -> PfSearchableKey.getNullKey().matchesId(null)).hasMessage(ID_IS_NULL);
+
+ assertThatThrownBy(() -> someKey0.setName(null)).isInstanceOf(NullPointerException.class)
+ .hasMessage("name is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> someKey0.setVersion(null)).isInstanceOf(NullPointerException.class)
+ .hasMessage("version is marked @NonNull but is null");
+
+ PfSearchableKey someKey4 = new PfSearchableKey("my-name.*", VERSION001);
+ assertEquals("my-name.*", someKey4.getName());
+ assertEquals(VERSION001, someKey4.getVersion());
+ }
+}