Refactor models for common type handling

[policy/models.git] / models-tosca / src / test / java / org / onap / policy / models / tosca / simple / concepts / JpaToscaPolicyTest.java

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTest.java
index 14a0b6a..b9adce1 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019-2020 Nordix Foundation.
+ *  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");
@@ -30,12 +30,13 @@ 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;
 
 /**
@@ -60,8 +61,7 @@ public class JpaToscaPolicyTest {
         assertThatThrownBy(() -> {
             new JpaToscaPolicy(pol);
         }).hasMessage(
-            "PolicyType version not specified, the version of the PolicyType for this policy must be specified in the "
-                + "type_version field");
+                "Version not specified, the version of this TOSCA entity must be specified in the type_version field");
 
         assertThatThrownBy(() -> {
             new JpaToscaPolicy((PfConceptKey) null);
@@ -128,41 +128,41 @@ public class JpaToscaPolicyTest {
         tp.clean();
         assertEquals(tdtClone0, tp);
 
-        assertFalse(new JpaToscaPolicy().validate(new PfValidationResult()).isValid());
-        assertTrue(tp.validate(new PfValidationResult()).isValid());
+        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());
 
         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);
-        }).hasMessageMatching("resultIn is marked .*on.*ull but is null");
+        }).hasMessageMatching("fieldName is marked .*on.*ull but is null");
 
         assertNotNull(tp.toAuthorative());
         tp.getType().setVersion(PfKey.NULL_KEY_VERSION);
@@ -182,4 +182,44 @@ public class JpaToscaPolicyTest {
         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
+    }
 }