/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2021 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.
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.assertTrue;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfKey;
-import org.onap.policy.models.base.PfValidationResult;
+import org.onap.policy.models.base.PfUtils;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicy;
/**
* DAO test for ToscaPolicy.
*/
public class JpaToscaPolicyTest {
- private static final String KEY_IS_NULL = "key is marked @NonNull but is null";
+ private static final String KEY_IS_NULL = "key is marked .*on.*ull but is null";
private static final String VERSION_001 = "0.0.1";
@Test
assertNotNull(new JpaToscaPolicy(new PfConceptKey(), new PfConceptKey()));
assertNotNull(new JpaToscaPolicy(new JpaToscaPolicy()));
- ToscaPolicy pol = new ToscaPolicy();
+ final ToscaPolicy pol = new ToscaPolicy();
pol.setType("type");
- assertNotNull(new JpaToscaPolicy(pol));
+ assertThatThrownBy(() -> {
+ new JpaToscaPolicy(pol);
+ }).hasMessage(
+ "Version not specified, the version of this TOSCA entity must be specified in the type_version field");
assertThatThrownBy(() -> {
new JpaToscaPolicy((PfConceptKey) null);
- }).hasMessage(KEY_IS_NULL);
+ }).hasMessageMatching(KEY_IS_NULL);
assertThatThrownBy(() -> {
new JpaToscaPolicy(null, null);
- }).hasMessage(KEY_IS_NULL);
+ }).hasMessageMatching(KEY_IS_NULL);
assertThatThrownBy(() -> {
new JpaToscaPolicy(new PfConceptKey(), null);
- }).hasMessage("type is marked @NonNull but is null");
+ }).hasMessageMatching("type is marked .*on.*ull but is null");
assertThatThrownBy(() -> {
new JpaToscaPolicy(null, new PfConceptKey());
- }).hasMessage(KEY_IS_NULL);
+ }).hasMessageMatching(KEY_IS_NULL);
- assertThatThrownBy(() -> {
- new JpaToscaPolicy((JpaToscaPolicy) null);
- }).hasMessage("copyConcept is marked @NonNull but is null");
+ assertThatThrownBy(() -> new JpaToscaPolicy((JpaToscaPolicy) null)).isInstanceOf(NullPointerException.class);
+ }
+ @Test
+ public void testJpaToscaPolicy() {
PfConceptKey tpKey = new PfConceptKey("tdt", VERSION_001);
PfConceptKey ptKey = new PfConceptKey("policyType", VERSION_001);
JpaToscaPolicy tp = new JpaToscaPolicy(tpKey, ptKey);
assertEquals(tp, tdtClone0);
assertEquals(0, tp.compareTo(tdtClone0));
- JpaToscaPolicy tdtClone1 = new JpaToscaPolicy();
- tp.copyTo(tdtClone1);
+ JpaToscaPolicy tdtClone1 = new JpaToscaPolicy(tp);
assertEquals(tp, tdtClone1);
assertEquals(0, tp.compareTo(tdtClone1));
assertEquals(-1, tp.compareTo(null));
assertEquals(0, tp.compareTo(tp));
- assertFalse(tp.compareTo(tp.getKey()) == 0);
+ assertNotEquals(0, tp.compareTo(tp.getKey()));
PfConceptKey otherDtKey = new PfConceptKey("otherDt", VERSION_001);
JpaToscaPolicy otherDt = new JpaToscaPolicy(otherDtKey);
- assertFalse(tp.compareTo(otherDt) == 0);
+ assertNotEquals(0, tp.compareTo(otherDt));
otherDt.setKey(tpKey);
- assertFalse(tp.compareTo(otherDt) == 0);
+ assertNotEquals(0, tp.compareTo(otherDt));
otherDt.setType(ptKey);
- assertFalse(tp.compareTo(otherDt) == 0);
+ assertNotEquals(0, tp.compareTo(otherDt));
otherDt.setProperties(propertyMap);
- assertFalse(tp.compareTo(otherDt) == 0);
+ assertNotEquals(0, tp.compareTo(otherDt));
otherDt.setTargets(targets);
assertEquals(0, tp.compareTo(otherDt));
- assertThatThrownBy(() -> {
- tp.copyTo(null);
- }).hasMessage("target is marked @NonNull but is null");
-
assertEquals(3, tp.getKeys().size());
assertEquals(2, new JpaToscaPolicy().getKeys().size());
new JpaToscaPolicy().clean();
tp.clean();
assertEquals(tdtClone0, tp);
+ }
- assertFalse(new JpaToscaPolicy().validate(new PfValidationResult()).isValid());
- assertTrue(tp.validate(new PfValidationResult()).isValid());
+ @Test
+ public void testJpaToscaPolicyValidation() {
+ JpaToscaPolicy tp = setUpJpaToscaPolicy();
+ assertFalse(new JpaToscaPolicy().validate("").isValid());
+ assertTrue(tp.validate("").isValid());
tp.getProperties().put(null, null);
- assertFalse(tp.validate(new PfValidationResult()).isValid());
+ assertFalse(tp.validate("").isValid());
tp.getProperties().remove(null);
- assertTrue(tp.validate(new PfValidationResult()).isValid());
+ assertTrue(tp.validate("").isValid());
tp.getProperties().put("Key", null);
- assertFalse(tp.validate(new PfValidationResult()).isValid());
+ assertFalse(tp.validate("").isValid());
tp.getProperties().remove("Key");
- assertTrue(tp.validate(new PfValidationResult()).isValid());
+ assertTrue(tp.validate("").isValid());
tp.getProperties().put(null, "Value");
- assertFalse(tp.validate(new PfValidationResult()).isValid());
+ assertFalse(tp.validate("").isValid());
tp.getProperties().remove(null);
- assertTrue(tp.validate(new PfValidationResult()).isValid());
+ assertTrue(tp.validate("").isValid());
tp.getTargets().add(null);
- assertFalse(tp.validate(new PfValidationResult()).isValid());
+ assertFalse(tp.validate("").isValid());
tp.getTargets().remove(null);
- assertTrue(tp.validate(new PfValidationResult()).isValid());
+ assertTrue(tp.validate("").isValid());
+ }
+ @Test
+ public void testJpaToscaPolicyAuthorative() {
+ JpaToscaPolicy tp = setUpJpaToscaPolicy();
PfConceptKey tpTypeKey = tp.getKey();
assertNotNull(tpTypeKey);
tp.setType(null);
- assertFalse(tp.validate(new PfValidationResult()).isValid());
+ assertFalse(tp.validate("").isValid());
tp.setType(PfConceptKey.getNullKey());
- assertFalse(tp.validate(new PfValidationResult()).isValid());
+ assertFalse(tp.validate("").isValid());
tp.setType(tpTypeKey);
- assertTrue(tp.validate(new PfValidationResult()).isValid());
+ assertTrue(tp.validate("").isValid());
assertThatThrownBy(() -> {
tp.validate(null);
- }).hasMessage("resultIn is marked @NonNull but is null");
+ }).hasMessageMatching("fieldName is marked .*on.*ull but is null");
assertNotNull(tp.toAuthorative());
tp.getType().setVersion(PfKey.NULL_KEY_VERSION);
assertThatThrownBy(() -> {
tp.fromAuthorative(null);
- }).hasMessage("toscaPolicy is marked @NonNull but is null");
-
- pol = new ToscaPolicy();
- pol.setName("policy");
- pol.setVersion("1.2.3");
- pol.setType("poltype");
- pol.setTypeVersion("2.2.3");
- tp.fromAuthorative(pol);
+ }).hasMessageMatching("toscaPolicy is marked .*on.*ull but is null");
+
+ ToscaPolicy pol1 = new ToscaPolicy();
+ pol1.setName("policy");
+ pol1.setVersion("1.2.3");
+ pol1.setType("poltype");
+ pol1.setTypeVersion("2.2.3");
+ tp.fromAuthorative(pol1);
assertEquals("2.2.3", tp.getType().getVersion());
}
+
+ @Test
+ public void testPolicyProperties() {
+
+ Map<String, Object> properties = new LinkedHashMap<>();
+
+ // @formatter:off
+ properties.put("byte", Byte.valueOf("2"));
+ properties.put("short", Short.valueOf("1234"));
+ properties.put("int", Integer.valueOf("12345678"));
+ properties.put("long", Long.valueOf("1234567890"));
+ properties.put("float", Float.valueOf("12345.678"));
+ properties.put("double", Double.valueOf("-12345.6789"));
+ properties.put("char", '%');
+ properties.put("string", "hello");
+ properties.put("boolean", false);
+ // @formatter:on
+
+ ToscaPolicy tp = new ToscaPolicy();
+ tp.setType("org.onap.Policy");
+ tp.setTypeVersion("1.2.3");
+ tp.setProperties(properties);
+
+ JpaToscaPolicy jtp = new JpaToscaPolicy(tp);
+ assertEquals(0, PfUtils.compareCollections(tp.getProperties().keySet(), jtp.getProperties().keySet()));
+
+ ToscaPolicy tpFromTo = jtp.toAuthorative();
+
+ // @formatter:off
+ assertEquals(2, tpFromTo.getProperties().get("byte"));
+ assertEquals(1234, tpFromTo.getProperties().get("short"));
+ assertEquals(12345678, tpFromTo.getProperties().get("int"));
+ assertEquals(1234567890, tpFromTo.getProperties().get("long"));
+ assertEquals(12345.678, tpFromTo.getProperties().get("float"));
+ assertEquals(-12345.6789, tpFromTo.getProperties().get("double"));
+ assertEquals("%", tpFromTo.getProperties().get("char"));
+ assertEquals("hello", tpFromTo.getProperties().get("string"));
+ assertEquals(false, tpFromTo.getProperties().get("boolean"));
+ // @formatter:on
+ }
+
+ private JpaToscaPolicy setUpJpaToscaPolicy() {
+ PfConceptKey tpKey = new PfConceptKey("tdt", VERSION_001);
+ PfConceptKey ptKey = new PfConceptKey("policyType", VERSION_001);
+ JpaToscaPolicy tp = new JpaToscaPolicy(tpKey, ptKey);
+
+ // Maps and Lists need to be modifiable
+ Map<String, String> propertyMap = new HashMap<>(Map.of("Property", "\"Property Value\""));
+ tp.setProperties(propertyMap);
+
+ PfConceptKey target = new PfConceptKey("target", VERSION_001);
+ List<PfConceptKey> targets = new ArrayList<>(List.of(target));
+ tp.setTargets(targets);
+ return tp;
+ }
}
Code Review / policy / models.git / blobdiff