Code Review / policy / models.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Use ValidationResult for models v2.0
[policy/models.git] / models-tosca / src / test / java / org / onap / policy / models / tosca / simple / concepts / JpaToscaServiceTemplateTest.java
diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplateTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplateTest.java
index bb0d2dc..d6266b4 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplateTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplateTest.java
@@ -33,9 +33,10 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.TreeMap;
 import org.junit.Test;
+import org.onap.policy.common.parameters.BeanValidationResult;
 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.base.Validated;
 
 /**
  * DAO test for ToscaDatatype.
@@ -126,31 +127,31 @@ public class JpaToscaServiceTemplateTest {
         tst.clean();
         assertEquals(tttClone0, tst);
 
-        assertTrue(new JpaToscaServiceTemplate().validate(new PfValidationResult()).isValid());
-        assertTrue(tst.validate(new PfValidationResult()).isValid());
+        assertTrue(new JpaToscaServiceTemplate().validate("").isValid());
+        assertTrue(tst.validate("").isValid());
 
         tst.setDescription(null);
-        assertTrue(tst.validate(new PfValidationResult()).isValid());
+        assertTrue(tst.validate("").isValid());
         tst.setDescription("");
-        assertFalse(tst.validate(new PfValidationResult()).isValid());
+        assertFalse(tst.validate("").isValid());
         tst.setDescription("A Description");
-        assertTrue(tst.validate(new PfValidationResult()).isValid());
+        assertTrue(tst.validate("").isValid());
 
-        assertThatThrownBy(() -> tst.validate(null)).hasMessageMatching("resultIn is marked .*on.*ull but is null");
+        assertThatThrownBy(() -> tst.validate(null)).hasMessageMatching("fieldName is marked .*on.*ull but is null");
 
         tst.setToscaDefinitionsVersion(null);
-        PfValidationResult result = tst.validate(new PfValidationResult());
-        assertThat(result.toString()).contains("service template tosca definitions version may not be null");
+        BeanValidationResult result = tst.validate("");
+        assertThat(result.getResult()).contains("toscaDefinitionsVersion").contains(Validated.IS_BLANK);
 
         tst.setToscaDefinitionsVersion(JpaToscaServiceTemplate.DEFAULT_TOSCA_DEFINTIONS_VERISON);
         tst.setDataTypes(null);
-        result = tst.validate(new PfValidationResult());
-        assertTrue(result.isOk());
+        result = tst.validate("");
+        assertTrue(result.isValid());
 
         JpaToscaPolicyType pt0 = new JpaToscaPolicyType(new PfConceptKey("pt0:0.0.1"));
         tst.getPolicyTypes().getConceptMap().put(pt0.getKey(), pt0);
-        result = tst.validate(new PfValidationResult());
-        assertTrue(result.isOk());
+        result = tst.validate("");
+        assertTrue(result.isValid());
 
         JpaToscaDataType dt0 = new JpaToscaDataType(new PfConceptKey("dt0:0.0.1"));
         JpaToscaProperty prop0 = new JpaToscaProperty(new PfReferenceKey(pt0.getKey(), "prop0"));
@@ -158,81 +159,82 @@ public class JpaToscaServiceTemplateTest {
 
         pt0.setProperties(new LinkedHashMap<>());
         pt0.getProperties().put(prop0.getKey().getLocalName(), prop0);
-        result = tst.validate(new PfValidationResult());
-        assertFalse(result.isOk());
-        assertThat(result.toString()).contains("referenced data type dt0:0.0.1 not found");
+        result = tst.validate("");
+        assertFalse(result.isValid());
+        assertThat(result.getResult()).contains("data type").contains("dt0:0.0.1").contains(Validated.NOT_FOUND);
 
         tst.setDataTypes(null);
-        result = tst.validate(new PfValidationResult());
-        assertFalse(result.isOk());
-        assertThat(result.toString()).contains("referenced data type dt0:0.0.1 not found");
+        result = tst.validate("");
+        assertFalse(result.isValid());
+        assertThat(result.getResult()).contains("data type").contains("dt0:0.0.1").contains(Validated.NOT_FOUND);
 
         tst.setDataTypes(new JpaToscaDataTypes());
-        result = tst.validate(new PfValidationResult());
-        assertFalse(result.isOk());
-        assertThat(result.toString()).contains("referenced data type dt0:0.0.1 not found");
+        result = tst.validate("");
+        assertFalse(result.isValid());
+        assertThat(result.getResult()).contains("data type").contains("dt0:0.0.1").contains(Validated.NOT_FOUND);
 
         tst.getDataTypes().getConceptMap().put(dt0.getKey(), dt0);
-        result = tst.validate(new PfValidationResult());
-        assertTrue(result.isOk());
+        result = tst.validate("");
+        assertTrue(result.isValid());
 
         tst.setTopologyTemplate(null);
-        result = tst.validate(new PfValidationResult());
-        assertTrue(result.isOk());
+        result = tst.validate("");
+        assertTrue(result.isValid());
 
         tst.setTopologyTemplate(new JpaToscaTopologyTemplate());
-        result = tst.validate(new PfValidationResult());
-        assertTrue(result.isOk());
+        result = tst.validate("");
+        assertTrue(result.isValid());
 
         tst.getTopologyTemplate().setPolicies(new JpaToscaPolicies());
-        result = tst.validate(new PfValidationResult());
-        assertTrue(result.isOk());
+        result = tst.validate("");
+        assertTrue(result.isValid());
 
         tst.setPolicyTypes(null);
-        result = tst.validate(new PfValidationResult());
-        assertTrue(result.isOk());
+        result = tst.validate("");
+        assertTrue(result.isValid());
 
         JpaToscaPolicy pol0 = new JpaToscaPolicy(new PfConceptKey("pol0:0.0.1"));
         tst.getTopologyTemplate().getPolicies().getConceptMap().put(pol0.getKey(), pol0);
-        result = tst.validate(new PfValidationResult());
-        assertFalse(result.isOk());
-        assertThat(result.toString()).contains("type is null or a null key");
+        result = tst.validate("");
+        assertFalse(result.isValid());
+        assertThat(result.getResult()).contains("type").contains(Validated.IS_A_NULL_KEY);
 
         pol0.setType(new PfConceptKey("i.dont.Exist:0.0.1"));
-        result = tst.validate(new PfValidationResult());
-        assertFalse(result.isOk());
-        assertThat(result.toString()).contains(
+        result = tst.validate("");
+        assertFalse(result.isValid());
+        assertThat(result.getResult()).contains(
                 "no policy types are defined on the service template for the policies in the topology template");
 
         tst.setPolicyTypes(policyTypes);
-        result = tst.validate(new PfValidationResult());
-        assertFalse(result.isOk());
-        assertThat(result.toString()).contains("policy type i.dont.Exist:0.0.1 referenced in policy not found");
+        result = tst.validate("");
+        assertFalse(result.isValid());
+        assertThat(result.getResult()).contains("policy type").contains("i.dont.Exist:0.0.1")
+                        .contains(Validated.NOT_FOUND);
 
         pol0.setType(dt0.getKey());
-        result = tst.validate(new PfValidationResult());
-        assertFalse(result.isOk());
-        assertThat(result.toString()).contains("policy type dt0:0.0.1 referenced in policy not found");
+        result = tst.validate("");
+        assertFalse(result.isValid());
+        assertThat(result.getResult()).contains("policy type").contains("dt0:0.0.1").contains(Validated.NOT_FOUND);
 
         pol0.setType(pt0.getKey());
-        result = tst.validate(new PfValidationResult());
-        assertTrue(result.isOk());
+        result = tst.validate("");
+        assertTrue(result.isValid());
 
         tst.setPolicyTypes(null);
-        result = tst.validate(new PfValidationResult());
-        assertFalse(result.isOk());
-        assertThat(result.toString()).contains(
+        result = tst.validate("");
+        assertFalse(result.isValid());
+        assertThat(result.getResult()).contains(
                 "no policy types are defined on the service template for the policies in the topology template");
 
         tst.setPolicyTypes(policyTypes);
         pol0.setType(pt0.getKey());
-        result = tst.validate(new PfValidationResult());
-        assertTrue(result.isOk());
+        result = tst.validate("");
+        assertTrue(result.isValid());
 
         tst.setPolicyTypes(new JpaToscaPolicyTypes());
-        result = tst.validate(new PfValidationResult());
-        assertFalse(result.isOk());
-        assertThat(result.toString()).contains(
+        result = tst.validate("");
+        assertFalse(result.isValid());
+        assertThat(result.getResult()).contains(
                 "no policy types are defined on the service template for the policies in the topology template");
 
     }
This repo will hold model code agnostic to PDP engines (Casablanca)