From: danielhanrahan Date: Mon, 5 Jan 2026 20:18:07 +0000 (+0000) Subject: Remove dummy classes from policy models tests X-Git-Tag: 9.0.1~15 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=27b8e3d05eb7d2e6458ac979828d5b15a00d1da5;p=policy%2Fclamp.git Remove dummy classes from policy models tests Issue-ID: POLICY-5509 Change-Id: I85f12d6e7b07fdb726a9bfc923b4bde778f2eb35 Signed-off-by: danielhanrahan --- diff --git a/policy-models/src/test/java/org/onap/policy/models/base/PfConceptKeyTest.java b/policy-models/src/test/java/org/onap/policy/models/base/PfConceptKeyTest.java index 277c927ac..4c8dfc3f3 100644 --- a/policy-models/src/test/java/org/onap/policy/models/base/PfConceptKeyTest.java +++ b/policy-models/src/test/java/org/onap/policy/models/base/PfConceptKeyTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019-2020, 2024 Nordix Foundation. + * Copyright (C) 2019-2026 OpenInfra Foundation Europe. All rights reserved. * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,7 +28,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.onap.policy.models.base.testconcepts.DummyPfConcept; class PfConceptKeyTest { @@ -57,7 +56,7 @@ class PfConceptKeyTest { assertEquals(someKey2, someKey1.getKey()); assertEquals(1, someKey1.getKeys().size()); - PfConcept pfc = new DummyPfConcept(); + PfConcept pfc = new PfConceptKey(); assertEquals(PfConceptKey.getNullKey().getId(), pfc.getId()); assertTrue(PfConceptKey.getNullKey().matchesId(pfc.getId())); diff --git a/policy-models/src/test/java/org/onap/policy/models/base/PfKeyImplTest.java b/policy-models/src/test/java/org/onap/policy/models/base/PfKeyImplTest.java index bc0012e29..83e38e341 100644 --- a/policy-models/src/test/java/org/onap/policy/models/base/PfKeyImplTest.java +++ b/policy-models/src/test/java/org/onap/policy/models/base/PfKeyImplTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019-2021, 2023, 2024 Nordix Foundation. + * Copyright (C) 2019-2026 OpenInfra Foundation Europe. All rights reserved. * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,6 +26,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -39,7 +40,6 @@ import org.junit.jupiter.api.Test; import org.onap.policy.common.parameters.ValidationResult; import org.onap.policy.common.parameters.annotations.Pattern; import org.onap.policy.models.base.PfKey.Compatibility; -import org.onap.policy.models.base.testconcepts.DummyPfKey; class PfKeyImplTest { @@ -121,8 +121,8 @@ class PfKeyImplTest { assertThatThrownBy(() -> someKey0.getCompatibility(null)).isInstanceOf(NullPointerException.class) .hasMessageMatching("^otherKey is marked .*on.*ull but is null$"); - assertEquals(Compatibility.DIFFERENT, someKey0.getCompatibility(new DummyPfKey())); - assertEquals(Compatibility.DIFFERENT, buildKey1.getCompatibility(new DummyPfKey())); + assertEquals(Compatibility.DIFFERENT, someKey0.getCompatibility(new PfConceptKey())); + assertEquals(Compatibility.DIFFERENT, buildKey1.getCompatibility(new PfConceptKey())); assertEquals(Compatibility.DIFFERENT, someKey0.getCompatibility(someKey1)); assertEquals(Compatibility.IDENTICAL, someKey2.getCompatibility(someKey1)); assertEquals(Compatibility.IDENTICAL, buildKey1.getCompatibility(new MyKey(buildKey1))); @@ -166,7 +166,7 @@ class PfKeyImplTest { .hasMessageMatching("^otherObj is marked .*on.*ull but is null$"); assertEquals(0, someKey0.compareTo(someKey0)); - assertEquals(-36, someKey0.compareTo(new DummyPfKey())); + assertNotEquals(0, someKey0.compareTo(new PfConceptKey())); MyKey someKey8 = new MyKey(); someKey8.setVersion(VERSION001); diff --git a/policy-models/src/test/java/org/onap/policy/models/base/PfNameVersionTest.java b/policy-models/src/test/java/org/onap/policy/models/base/PfNameVersionTest.java index 6272404d7..2cc7e1002 100644 --- a/policy-models/src/test/java/org/onap/policy/models/base/PfNameVersionTest.java +++ b/policy-models/src/test/java/org/onap/policy/models/base/PfNameVersionTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019-2020, 2024 Nordix Foundation. + * Copyright (C) 2019-2026 OpenInfra Foundation Europe. 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. @@ -22,8 +22,8 @@ package org.onap.policy.models.base; import static org.junit.jupiter.api.Assertions.assertEquals; +import lombok.Data; import org.junit.jupiter.api.Test; -import org.onap.policy.models.base.testconcepts.DummyPfNameVersion; /** * Test the {@link PfNameVersion} interface. @@ -63,4 +63,11 @@ class PfNameVersionTest { dnv1.setVersion("1.2.3"); assertEquals(0, dnv0.compareNameVersion(dnv0, dnv1)); } + + @Data + private static class DummyPfNameVersion implements PfNameVersion { + private String name; + private String version; + } + } diff --git a/policy-models/src/test/java/org/onap/policy/models/base/testconcepts/DummyAuthorativeConcept.java b/policy-models/src/test/java/org/onap/policy/models/base/testconcepts/DummyAuthorativeConcept.java deleted file mode 100644 index 0734108a4..000000000 --- a/policy-models/src/test/java/org/onap/policy/models/base/testconcepts/DummyAuthorativeConcept.java +++ /dev/null @@ -1,51 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2019 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.testconcepts; - -import lombok.Data; -import lombok.NoArgsConstructor; -import org.onap.policy.models.base.PfNameVersion; - -/** - * Dummy authorative concept. - * - * @author Liam Fallon (liam.fallon@est.tech) - */ -@Data -@NoArgsConstructor -public class DummyAuthorativeConcept implements PfNameVersion { - private String name; - private String version; - private String description; - - /** - * Constructor. - * - * @param name the name - * @param version the version - * @param description the description - */ - public DummyAuthorativeConcept(final String name, final String version, final String description) { - this.name = name; - this.version = version; - this.description = description; - } -} diff --git a/policy-models/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConcept.java b/policy-models/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConcept.java deleted file mode 100644 index 25a6cb7ba..000000000 --- a/policy-models/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConcept.java +++ /dev/null @@ -1,129 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2019, 2023 Nordix Foundation. - * Modifications Copyright (C) 2019-2020 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.testconcepts; - -import jakarta.persistence.EmbeddedId; -import java.io.Serial; -import java.util.List; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NonNull; -import org.apache.commons.lang3.ObjectUtils; -import org.onap.policy.common.parameters.annotations.NotBlank; -import org.onap.policy.common.parameters.annotations.NotNull; -import org.onap.policy.models.base.PfAuthorative; -import org.onap.policy.models.base.PfConcept; -import org.onap.policy.models.base.PfConceptKey; -import org.onap.policy.models.base.PfKey; -import org.onap.policy.models.base.validation.annotations.VerifyKey; - -@Data -@EqualsAndHashCode(callSuper = false) -public class DummyPfConcept extends PfConcept implements PfAuthorative { - @Serial - private static final long serialVersionUID = 1L; - - @EmbeddedId - @VerifyKey - @NotNull - private PfConceptKey key; - - @NotBlank - private String description; - - - /** - * The Default Constructor creates a {@link DummyPfConcept} object with a null key. - */ - public DummyPfConcept() { - this(new PfConceptKey()); - } - - /** - * The Key Constructor creates a {@link DummyPfConcept} object with the given concept key. - * - * @param key the key - */ - public DummyPfConcept(@NonNull final PfConceptKey key) { - this.key = key; - } - - /** - * Copy constructor. - * - * @param copyConcept the concept to copy from - */ - public DummyPfConcept(final DummyPfConcept copyConcept) { - super(copyConcept); - this.key = new PfConceptKey(copyConcept.key); - this.description = copyConcept.description; - } - - @Override - public DummyAuthorativeConcept toAuthorative() { - DummyAuthorativeConcept dac = new DummyAuthorativeConcept(); - dac.setName(key.getName()); - dac.setVersion(key.getVersion()); - dac.setDescription(description); - - return dac; - } - - @Override - public void fromAuthorative(DummyAuthorativeConcept dac) { - key.setName(dac.getName()); - key.setVersion(dac.getVersion()); - description = dac.getDescription(); - } - - @Override - public List getKeys() { - return getKey().getKeys(); - } - - @Override - public void clean() { - key.clean(); - - description = (description != null ? description.trim() : null); - } - - @Override - public int compareTo(final PfConcept otherConcept) { - if (otherConcept == null) { - return -1; - } - if (this == otherConcept) { - return 0; - } - if (getClass() != otherConcept.getClass()) { - return this.hashCode() - otherConcept.hashCode(); - } - - final DummyPfConcept other = (DummyPfConcept) otherConcept; - if (!key.equals(other.key)) { - return key.compareTo(other.key); - } - - return ObjectUtils.compare(description, other.description); - } -} diff --git a/policy-models/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfKey.java b/policy-models/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfKey.java deleted file mode 100644 index 538720222..000000000 --- a/policy-models/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfKey.java +++ /dev/null @@ -1,97 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2019, 2023 Nordix Foundation. - * Modifications Copyright (C) 2019-2020 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.testconcepts; - -import java.io.Serial; -import java.util.List; -import lombok.NonNull; -import org.onap.policy.common.parameters.BeanValidationResult; -import org.onap.policy.models.base.PfConcept; -import org.onap.policy.models.base.PfKey; - -public class DummyPfKey extends PfKey { - @Serial - private static final long serialVersionUID = 1L; - - public DummyPfKey() { - // Default constructor - } - - public DummyPfKey(DummyPfKey source) { - super(source); - } - - @Override - public int compareTo(@NonNull PfConcept arg0) { - return 0; - } - - @Override - public String getId() { - return null; - } - - @Override - public boolean isNullKey() { - return false; - } - - @Override - public Compatibility getCompatibility(@NonNull PfKey otherKey) { - return null; - } - - @Override - public PfKey getKey() { - return null; - } - - @Override - public List getKeys() { - return List.of(getKey()); - } - - @Override - public BeanValidationResult validate(@NonNull String fieldName) { - return null; - } - - @Override - public void clean() { - // nothing to do - } - - @Override - public boolean equals(Object otherObject) { - return false; - } - - @Override - public String toString() { - return ""; - } - - @Override - public int hashCode() { - return 0; - } -} diff --git a/policy-models/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfNameVersion.java b/policy-models/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfNameVersion.java deleted file mode 100644 index 1d28573ff..000000000 --- a/policy-models/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfNameVersion.java +++ /dev/null @@ -1,36 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. - * 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.testconcepts; - -import lombok.Data; -import org.onap.policy.models.base.PfNameVersion; - -/** - * Dummy implementation of the {@link PfNameVersion} interface. - * - * @author Liam Fallon (liam.fallon@est.tech) - */ -@Data -public class DummyPfNameVersion implements PfNameVersion { - private String name; - private String version; -}