/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2021, 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.
package org.onap.policy.models.tosca.simple.concepts;
+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.assertNotEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
-
+import java.util.Map;
+import java.util.TreeMap;
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfReferenceKey;
-import org.onap.policy.models.base.PfValidationResult;
import org.onap.policy.models.tosca.authorative.concepts.ToscaProperty;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaConstraint;
/**
* DAO test for ToscaProperty.
*/
public class JpaToscaPropertyTest {
+ private static final String KEY_IS_NULL = "key is marked .*on.*ull but is null";
+ private static final String DEFAULT_KEY = "defaultKey";
+ private static final String A_DESCRIPTION = "A Description";
+ private static final String VERSION_001 = "0.0.1";
+
@Test
- public void testPropertyPojo() {
+ public void testPropertyNull() {
assertNotNull(new JpaToscaProperty());
assertNotNull(new JpaToscaProperty(new PfReferenceKey()));
assertNotNull(new JpaToscaProperty(new PfReferenceKey(), new PfConceptKey()));
assertNotNull(new JpaToscaProperty(new JpaToscaProperty()));
- try {
- new JpaToscaProperty((PfReferenceKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaProperty(null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaProperty(null, new PfConceptKey());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaProperty(new PfReferenceKey(), null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("type is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaProperty((JpaToscaProperty) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
-
- PfConceptKey pparentKey = new PfConceptKey("tParentKey", "0.0.1");
+ assertThatThrownBy(() -> new JpaToscaProperty((PfReferenceKey) null)).hasMessageMatching(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaProperty(null, null)).hasMessageMatching(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaProperty(null, new PfConceptKey())).hasMessageMatching(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaProperty(new PfReferenceKey(), null))
+ .hasMessageMatching("type is marked .*on.*ull but is null");
+ }
+
+ @Test
+ public void testProperty() {
+ PfConceptKey pparentKey = new PfConceptKey("tParentKey", VERSION_001);
PfReferenceKey pkey = new PfReferenceKey(pparentKey, "trigger0");
- PfConceptKey ptypeKey = new PfConceptKey("TTypeKey", "0.0.1");
+ PfConceptKey ptypeKey = new PfConceptKey("TTypeKey", VERSION_001);
JpaToscaProperty tp = new JpaToscaProperty(pkey, ptypeKey);
- tp.setDescription("A Description");
- assertEquals("A Description", tp.getDescription());
+ assertEquals(tp, new JpaToscaProperty(tp));
+
+ tp.setDescription(A_DESCRIPTION);
+ assertEquals(A_DESCRIPTION, tp.getDescription());
tp.setRequired(false);
assertFalse(tp.isRequired());
- tp.setDefaultValue("defaultKey");
+ tp.setDefaultValue(DEFAULT_KEY);
tp.setStatus(ToscaProperty.Status.SUPPORTED);
tp.setConstraints(constraints);
assertEquals(constraints, tp.getConstraints());
- PfConceptKey typeKey = new PfConceptKey("type", "0.0.1");
- JpaToscaEntrySchema tes = new JpaToscaEntrySchema(typeKey);
+ PfConceptKey typeKey = new PfConceptKey("type", VERSION_001);
+ JpaToscaSchemaDefinition tes = new JpaToscaSchemaDefinition(typeKey);
tp.setEntrySchema(tes);
+ TreeMap<String, String> metadata = new TreeMap<>();
+ metadata.put("metaA", "dataA");
+ metadata.put("metaB", "dataB");
+ tp.setMetadata(metadata);
+ assertSame(metadata, tp.getMetadata());
+
JpaToscaProperty tdtClone0 = new JpaToscaProperty(tp);
assertEquals(tp, tdtClone0);
assertEquals(0, tp.compareTo(tdtClone0));
- JpaToscaProperty tdtClone1 = new JpaToscaProperty();
- tp.copyTo(tdtClone1);
+ assertNotSame(tdtClone0.getMetadata(), tp.getMetadata());
+
+ JpaToscaProperty tdtClone1 = new JpaToscaProperty(tp);
assertEquals(tp, tdtClone1);
assertEquals(0, tp.compareTo(tdtClone1));
- assertEquals(-1, tp.compareTo(null));
+ assertThatThrownBy(() -> tp.compareTo(null)).isInstanceOf(NullPointerException.class);
assertEquals(0, tp.compareTo(tp));
- assertFalse(tp.compareTo(tp.getKey()) == 0);
+ assertNotEquals(0, tp.compareTo(tp.getKey()));
+ }
- PfReferenceKey otherDtKey = new PfReferenceKey("otherDt", "0.0.1", "OtherProperty");
+ @Test
+ public void testPropertyCompareData() {
+ JpaToscaProperty tp = setUpJpaToscaProperty();
+
+ PfReferenceKey otherDtKey = new PfReferenceKey("otherDt", VERSION_001, "OtherProperty");
JpaToscaProperty otherDt = new JpaToscaProperty(otherDtKey);
- assertFalse(tp.compareTo(otherDt) == 0);
+ assertNotEquals(0, tp.compareTo(otherDt));
+
+ PfConceptKey pparentKey = new PfConceptKey("tParentKey", VERSION_001);
+ PfReferenceKey pkey = new PfReferenceKey(pparentKey, "trigger0");
otherDt.setKey(pkey);
- assertFalse(tp.compareTo(otherDt) == 0);
+ assertNotEquals(0, tp.compareTo(otherDt));
+
+ PfConceptKey ptypeKey = new PfConceptKey("TTypeKey", VERSION_001);
otherDt.setType(ptypeKey);
- assertFalse(tp.compareTo(otherDt) == 0);
- otherDt.setDescription("A Description");
- assertFalse(tp.compareTo(otherDt) == 0);
+ assertNotEquals(0, tp.compareTo(otherDt));
+ otherDt.setDescription(A_DESCRIPTION);
+ assertNotEquals(0, tp.compareTo(otherDt));
otherDt.setRequired(false);
- assertFalse(tp.compareTo(otherDt) == 0);
- otherDt.setDefaultValue("defaultKey");
- assertFalse(tp.compareTo(otherDt) == 0);
+ assertNotEquals(0, tp.compareTo(otherDt));
+ otherDt.setDefaultValue(DEFAULT_KEY);
+ assertNotEquals(0, tp.compareTo(otherDt));
otherDt.setStatus(ToscaProperty.Status.SUPPORTED);
- assertFalse(tp.compareTo(otherDt) == 0);
- assertFalse(tp.compareTo(otherDt) == 0);
+ assertNotEquals(0, tp.compareTo(otherDt));
+ assertNotEquals(0, tp.compareTo(otherDt));
+
+ List<JpaToscaConstraint> constraints = new ArrayList<>();
+ JpaToscaConstraintLogical lsc = new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, "hello");
+ constraints.add(lsc);
otherDt.setConstraints(constraints);
- assertFalse(tp.compareTo(otherDt) == 0);
+ assertNotEquals(0, tp.compareTo(otherDt));
+
+ PfConceptKey typeKey = new PfConceptKey("type", VERSION_001);
+ JpaToscaSchemaDefinition tes = new JpaToscaSchemaDefinition(typeKey);
otherDt.setEntrySchema(tes);
+ assertNotEquals(0, tp.compareTo(otherDt));
+
+ TreeMap<String, String> metadata = new TreeMap<>();
+ metadata.put("metaA", "dataA");
+ metadata.put("metaB", "dataB");
+ otherDt.setMetadata(metadata);
assertEquals(0, tp.compareTo(otherDt));
otherDt.setRequired(true);
- assertFalse(tp.compareTo(otherDt) == 0);
+ assertNotEquals(0, tp.compareTo(otherDt));
otherDt.setRequired(false);
assertEquals(0, tp.compareTo(otherDt));
otherDt.setStatus(ToscaProperty.Status.UNSUPPORTED);
- assertFalse(tp.compareTo(otherDt) == 0);
+ assertNotEquals(0, tp.compareTo(otherDt));
otherDt.setStatus(ToscaProperty.Status.SUPPORTED);
assertEquals(0, tp.compareTo(otherDt));
- try {
- tp.copyTo(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("target is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaProperty((JpaToscaProperty) null))
+ .isInstanceOf(NullPointerException.class);
assertEquals(3, tp.getKeys().size());
assertEquals(2, new JpaToscaProperty().getKeys().size());
+ }
+
+ @Test
+ public void testPropertyCompareDescription() {
+ JpaToscaProperty tp = setUpJpaToscaProperty();
+ JpaToscaProperty tdtClone0 = new JpaToscaProperty(tp);
new JpaToscaProperty().clean();
tp.clean();
assertEquals(tdtClone0, tp);
- assertFalse(new JpaToscaProperty().validate(new PfValidationResult()).isValid());
- assertTrue(tp.validate(new PfValidationResult()).isValid());
+ assertFalse(new JpaToscaProperty().validate("").isValid());
+ assertTrue(tp.validate("").isValid());
tp.setDescription(null);
- assertTrue(tp.validate(new PfValidationResult()).isValid());
+ assertTrue(tp.validate("").isValid());
tp.setDescription("");
- assertFalse(tp.validate(new PfValidationResult()).isValid());
- tp.setDescription("A Description");
- assertTrue(tp.validate(new PfValidationResult()).isValid());
+ assertFalse(tp.validate("").isValid());
+ tp.setDescription(A_DESCRIPTION);
+ assertTrue(tp.validate("").isValid());
tp.setType(null);
- assertFalse(tp.validate(new PfValidationResult()).isValid());
+ assertFalse(tp.validate("").isValid());
+ }
+
+ @Test
+ public void testPropertyCompareMetadata() {
+ JpaToscaProperty tp = setUpJpaToscaProperty();
+ PfConceptKey typeKey = new PfConceptKey("type", VERSION_001);
tp.setType(typeKey);
- assertTrue(tp.validate(new PfValidationResult()).isValid());
+ assertTrue(tp.validate("").isValid());
tp.setType(PfConceptKey.getNullKey());
- assertFalse(tp.validate(new PfValidationResult()).isValid());
+ assertFalse(tp.validate("").isValid());
tp.setType(typeKey);
- assertTrue(tp.validate(new PfValidationResult()).isValid());
+ assertTrue(tp.validate("").isValid());
tp.setDefaultValue(null);
- assertTrue(tp.validate(new PfValidationResult()).isValid());
+ assertTrue(tp.validate("").isValid());
tp.setDefaultValue("");
- assertFalse(tp.validate(new PfValidationResult()).isValid());
- tp.setDefaultValue("defaultKey");
- assertTrue(tp.validate(new PfValidationResult()).isValid());
+ assertFalse(tp.validate("").isValid());
+ tp.setDefaultValue(DEFAULT_KEY);
+ assertTrue(tp.validate("").isValid());
tp.getConstraints().add(null);
- assertFalse(tp.validate(new PfValidationResult()).isValid());
+ assertFalse(tp.validate("").isValid());
tp.getConstraints().remove(null);
- assertTrue(tp.validate(new PfValidationResult()).isValid());
-
- try {
- tp.validate(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
- }
+ assertTrue(tp.validate("").isValid());
+
+ tp.setMetadata(null);
+ assertTrue(tp.validate("").isValid());
+
+ assertThatThrownBy(() -> tp.validate(null)).hasMessageMatching("fieldName is marked .*on.*ull but is null");
+ }
+
+ @Test
+ public void testToAuthorative_testFromAuthorative() {
+ // check with empty structure
+ JpaToscaProperty tp = new JpaToscaProperty();
+ ToscaProperty auth = tp.toAuthorative();
+ JpaToscaProperty tp2 = new JpaToscaProperty();
+ tp2.fromAuthorative(auth);
+ assertEquals(tp, tp2);
+
+ // populate and try again
+ PfConceptKey pparentKey = new PfConceptKey("tParentKey", VERSION_001);
+ PfReferenceKey pkey = new PfReferenceKey(pparentKey, "trigger0");
+ PfConceptKey ptypeKey = new PfConceptKey("TTypeKey", VERSION_001);
+ tp = new JpaToscaProperty(pkey, ptypeKey);
+
+ tp.setDescription(A_DESCRIPTION);
+ tp.setRequired(true);
+ tp.setDefaultValue(DEFAULT_KEY);
+ tp.setStatus(ToscaProperty.Status.SUPPORTED);
+
+ List<JpaToscaConstraint> constraints = new ArrayList<>();
+ JpaToscaConstraintLogical lsc = new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, "hello");
+ constraints.add(lsc);
+ tp.setConstraints(constraints);
+
+ PfConceptKey typeKey = new PfConceptKey("type", VERSION_001);
+ JpaToscaSchemaDefinition tes = new JpaToscaSchemaDefinition(typeKey);
+ tp.setEntrySchema(tes);
+
+ TreeMap<String, String> metadata = new TreeMap<>();
+ metadata.put("metaA", "dataA");
+ metadata.put("metaB", "dataB");
+ tp.setMetadata(metadata);
+
+ auth = tp.toAuthorative();
+ tp2 = new JpaToscaProperty();
+ tp2.fromAuthorative(auth);
+
+ // note: parent key info is not copied, so we manually copy it
+ tp2.getKey().setParentConceptKey(tp.getKey().getParentConceptKey());
+
+ assertEquals(tp.toString(), tp2.toString());
+ assertEquals(tp, tp2);
+ }
+
+ private JpaToscaProperty setUpJpaToscaProperty() {
+ PfConceptKey pparentKey = new PfConceptKey("tParentKey", VERSION_001);
+ PfReferenceKey pkey = new PfReferenceKey(pparentKey, "trigger0");
+ PfConceptKey ptypeKey = new PfConceptKey("TTypeKey", VERSION_001);
+
+ JpaToscaProperty tp = new JpaToscaProperty(pkey, ptypeKey);
+ tp.setDescription(A_DESCRIPTION);
+ tp.setRequired(false);
+ tp.setDefaultValue(DEFAULT_KEY);
+ tp.setStatus(ToscaProperty.Status.SUPPORTED);
+
+ JpaToscaConstraintLogical lsc = new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, "hello");
+ // Maps and Lists need to be modifiable
+ List<JpaToscaConstraint> constraints = new ArrayList<>(List.of(lsc));
+ tp.setConstraints(constraints);
+
+ PfConceptKey typeKey = new PfConceptKey("type", VERSION_001);
+ JpaToscaSchemaDefinition tes = new JpaToscaSchemaDefinition(typeKey);
+ tp.setEntrySchema(tes);
+ TreeMap<String, String> metadata = new TreeMap<>(Map.of("metaA", "dataA", "metaB", "dataB"));
+ tp.setMetadata(metadata);
+
+ return tp;
}
}
Code Review / policy / models.git / blobdiff