From 28eb9406c035f73baa99f585fc576ad2b0a2b81b Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 26 Mar 2019 15:42:42 +0000 Subject: Add persistence test for all policy examples The test checks the TOSCA policy examples and ensures they can be persisted and read back from persistence. Test against the expected outcome will be added in later reviews. Tests for legacy and PDP-A policies willbe added in later reviews. Issue-ID: POLICY-1095 Change-Id: Ie06bbd477ff63618f126b01c9ab49bfc45b19ae9 Signed-off-by: liamfallon --- .../tosca/simple/concepts/ToscaProperty.java | 1 - .../ToscaServiceTemplateJsonAdapter.java | 31 ++++++++-------------- .../tosca/authorative/concepts/TestPojos.java | 2 +- .../PlainToscaServiceTemplateMapperTest.java | 2 +- .../MonitoringPolicySerializationTest.java | 1 + 5 files changed, 14 insertions(+), 23 deletions(-) (limited to 'models-tosca') diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaProperty.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaProperty.java index bc454c996..2276f5a7a 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaProperty.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaProperty.java @@ -23,7 +23,6 @@ package org.onap.policy.models.tosca.simple.concepts; -import com.google.gson.JsonElement; import com.google.gson.annotations.SerializedName; import java.util.List; diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/serialization/ToscaServiceTemplateJsonAdapter.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/serialization/ToscaServiceTemplateJsonAdapter.java index e25adfd3e..78f3153e2 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/serialization/ToscaServiceTemplateJsonAdapter.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/serialization/ToscaServiceTemplateJsonAdapter.java @@ -32,13 +32,10 @@ import java.lang.reflect.Type; import lombok.NonNull; -import org.onap.policy.models.base.PfConceptKey; import org.onap.policy.models.tosca.simple.concepts.ToscaDataTypes; import org.onap.policy.models.tosca.simple.concepts.ToscaPolicyTypes; import org.onap.policy.models.tosca.simple.concepts.ToscaServiceTemplate; import org.onap.policy.models.tosca.simple.concepts.ToscaTopologyTemplate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * GSON type adapter for TOSCA policies. @@ -49,8 +46,6 @@ import org.slf4j.LoggerFactory; public class ToscaServiceTemplateJsonAdapter implements JsonSerializer, JsonDeserializer { - private static final Logger LOGGER = LoggerFactory.getLogger(ToscaServiceTemplateJsonAdapter.class); - private static final String TOPOLOGY_TEMPLATE = "topology_template"; private static final String TOSCA_DEFINITIONS_VERSION = "tosca_definitions_version"; private static final String POLICY_TYPES = "policy_types"; @@ -64,10 +59,7 @@ public class ToscaServiceTemplateJsonAdapter final JsonObject serviceTemplateJsonObject = serviceTemplateElement.getAsJsonObject(); // The outgoing object - final PfConceptKey serviceTemplateKey = new PfConceptKey("IncomingServiceTemplate", "0.0.1"); - final ToscaServiceTemplate serviceTemplate = new ToscaServiceTemplate(serviceTemplateKey); - - // Set tosca_definitions_version + final ToscaServiceTemplate serviceTemplate = new ToscaServiceTemplate(); serviceTemplate .setToscaDefinitionsVersion(serviceTemplateJsonObject.get(TOSCA_DEFINITIONS_VERSION).getAsString()); @@ -75,19 +67,18 @@ public class ToscaServiceTemplateJsonAdapter if (serviceTemplateJsonObject.has(TOPOLOGY_TEMPLATE)) { serviceTemplate.setTopologyTemplate(new ToscaTopologyTemplateJsonAdapter().deserialize( serviceTemplateJsonObject.get(TOPOLOGY_TEMPLATE), ToscaTopologyTemplate.class, context)); - serviceTemplate.getTopologyTemplate().getKey().setParentConceptKey(serviceTemplateKey); } // Set policy_types if (serviceTemplateJsonObject.has(POLICY_TYPES)) { - serviceTemplate.setPolicyTypes(new ToscaPolicyTypesJsonAdapter().deserialize( - serviceTemplateJsonObject.get(POLICY_TYPES), ToscaPolicyTypes.class, context)); + serviceTemplate.setPolicyTypes(new ToscaPolicyTypesJsonAdapter() + .deserialize(serviceTemplateJsonObject.get(POLICY_TYPES), ToscaPolicyTypes.class, context)); } // Set data_types if (serviceTemplateJsonObject.has(DATA_TYPES)) { - serviceTemplate.setDataTypes(new ToscaDataTypesJsonAdapter().deserialize( - serviceTemplateJsonObject.get(DATA_TYPES), ToscaDataTypes.class, context)); + serviceTemplate.setDataTypes(new ToscaDataTypesJsonAdapter() + .deserialize(serviceTemplateJsonObject.get(DATA_TYPES), ToscaDataTypes.class, context)); } return serviceTemplate; @@ -101,8 +92,8 @@ public class ToscaServiceTemplateJsonAdapter // Serialize tosca_definitions_version if (serviceTemplate.getToscaDefinitionsVersion() != null) { - serviceTemplateJsonObject.addProperty( - TOSCA_DEFINITIONS_VERSION, serviceTemplate.getToscaDefinitionsVersion()); + serviceTemplateJsonObject.addProperty(TOSCA_DEFINITIONS_VERSION, + serviceTemplate.getToscaDefinitionsVersion()); } // Serialize topoligy_template @@ -114,15 +105,15 @@ public class ToscaServiceTemplateJsonAdapter // Serialize policy_types if (serviceTemplate.getPolicyTypes() != null) { - JsonElement policyTypesJsonElement = new ToscaPolicyTypesJsonAdapter() - .serialize(serviceTemplate.getPolicyTypes(), type, context); + JsonElement policyTypesJsonElement = + new ToscaPolicyTypesJsonAdapter().serialize(serviceTemplate.getPolicyTypes(), type, context); serviceTemplateJsonObject.add(POLICY_TYPES, policyTypesJsonElement); } // Serialize data_types if (serviceTemplate.getDataTypes() != null) { - JsonElement dataTypesJsonElement = new ToscaDataTypesJsonAdapter() - .serialize(serviceTemplate.getDataTypes(), type, context); + JsonElement dataTypesJsonElement = + new ToscaDataTypesJsonAdapter().serialize(serviceTemplate.getDataTypes(), type, context); serviceTemplateJsonObject.add(DATA_TYPES, dataTypesJsonElement); } diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/TestPojos.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/TestPojos.java index 4dd55d562..7c813a625 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/TestPojos.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/TestPojos.java @@ -33,7 +33,7 @@ import org.junit.Test; import org.onap.policy.common.utils.validation.ToStringTester; /** - * Class to perform unit tests of all pojos + * Class to perform unit tests of all pojos. * * @author Chenfei Gao (cgao@research.att.com) * diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/mapping/PlainToscaServiceTemplateMapperTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/mapping/PlainToscaServiceTemplateMapperTest.java index bd6b26bb9..e9223b350 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/mapping/PlainToscaServiceTemplateMapperTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/mapping/PlainToscaServiceTemplateMapperTest.java @@ -37,7 +37,7 @@ import org.onap.policy.models.tosca.simple.concepts.ToscaServiceTemplate; import org.yaml.snakeyaml.Yaml; /** - * This class performs unit test of {@link PlainToscaServiceTemplateMapper}} + * This class performs unit test of {@link PlainToscaServiceTemplateMapper}}. * * @author Chenfei Gao (cgao@research.att.com) */ diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java index e49156330..505e90e28 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java @@ -115,6 +115,7 @@ public class MonitoringPolicySerializationTest { verifyVfwMonitoringOutputserialization(serializedServiceTemplate); } catch (Exception e) { + LOGGER.warn("No exception should be thrown", e); fail("No exception should be thrown"); } } -- cgit 1.2.3-korg