/*-
* ============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");
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
-import org.onap.policy.models.base.testconcepts.DummyPfConcept;
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()));
/*-
* ============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");
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;
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 {
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)));
.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);
/*-
* ============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.
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.
dnv1.setVersion("1.2.3");
assertEquals(0, dnv0.compareNameVersion(dnv0, dnv1));
}
+
+ @Data
+ private static class DummyPfNameVersion implements PfNameVersion {
+ private String name;
+ private String version;
+ }
+
}
+++ /dev/null
-/*-
- * ============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;
- }
-}
+++ /dev/null
-/*-
- * ============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<DummyAuthorativeConcept> {
- @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<PfKey> 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);
- }
-}
+++ /dev/null
-/*-
- * ============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<PfKey> 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;
- }
-}
+++ /dev/null
-/*-
- * ============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;
-}
Code Review / policy / clamp.git / commitdiff