Refactor models for common type handling

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

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaCapabilityAssignmentTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaCapabilityAssignmentTest.java
index ee2fee8..4fcdd8c 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaCapabilityAssignmentTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaCapabilityAssignmentTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
+ *  Copyright (C) 2020-2021 Nordix Foundation.
+ *  Modifications Copyright (C) 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.
@@ -31,7 +32,7 @@ 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.PfValidationResult;
+import org.onap.policy.models.base.Validated;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaCapabilityAssignment;
 
 /**
@@ -43,10 +44,16 @@ public class JpaToscaCapabilityAssignmentTest {
 
     @Test
     public void testPropertyPojo() {
+        ToscaCapabilityAssignment tca = new ToscaCapabilityAssignment();
+        tca.setName("world");
+        tca.setVersion("1.2.3");
+        tca.setType("planet");
+        tca.setTypeVersion("4.5.6");
+
         assertNotNull(new JpaToscaCapabilityAssignment());
         assertNotNull(new JpaToscaCapabilityAssignment(new PfConceptKey()));
         assertNotNull(new JpaToscaCapabilityAssignment(new JpaToscaCapabilityAssignment()));
-        assertNotNull(new JpaToscaCapabilityAssignment(new ToscaCapabilityAssignment()));
+        assertNotNull(new JpaToscaCapabilityAssignment(tca));
 
         assertThatThrownBy(() -> new JpaToscaCapabilityAssignment((PfConceptKey) null)).hasMessageMatching(KEY_IS_NULL);
         assertThatThrownBy(() -> new JpaToscaCapabilityAssignment((JpaToscaCapabilityAssignment) null))
@@ -69,7 +76,7 @@ public class JpaToscaCapabilityAssignmentTest {
         assertEquals(caKey, ca.getKeys().get(0));
 
         ca.clean();
-        ca.validate(new PfValidationResult());
+        ca.validate("");
         assertThat(ca.getProperties()).isNullOrEmpty();
         assertThat(ca.getAttributes()).isNullOrEmpty();
 
@@ -77,7 +84,7 @@ public class JpaToscaCapabilityAssignmentTest {
         ca.setAttributes(null);
         ca.setOccurrences(null);
         ca.clean();
-        ca.validate(new PfValidationResult());
+        ca.validate("");
         assertEquals(null, ca.getProperties());
         assertEquals(null, ca.getAttributes());
 
@@ -94,7 +101,7 @@ public class JpaToscaCapabilityAssignmentTest {
         ca.setOccurrences(occurrences);
 
         ca.clean();
-        ca.validate(new PfValidationResult());
+        ca.validate("");
         assertEquals("Untrimmed Value", ca.getProperties().get("Key0"));
         assertEquals("Untrimmed Value", ca.getAttributes().get("Key0"));
 
@@ -102,10 +109,10 @@ public class JpaToscaCapabilityAssignmentTest {
         ca.getAttributes().put("Key1", null);
         ca.getOccurrences().add(null);
         ca.getOccurrences().add(-12345);
-        PfValidationResult result = ca.validate(new PfValidationResult());
-        assertThat(result.toString()).contains("capability assignment property Key1 value may not be null");
-        assertThat(result.toString()).contains("capability assignment attribute Key1 value may not be null");
-        assertThat(result.toString()).contains("capability assignment occurrence value may not be negative");
+        assertThat(ca.validate("").getResult())
+            .contains("properties").contains("Key1").contains(Validated.IS_NULL)
+            .contains("attributes").contains("Key1").contains(Validated.IS_NULL)
+            .contains("occurrence").contains("value").contains("is below the minimum value: 0");
     }
 
     @Test
@@ -148,11 +155,19 @@ public class JpaToscaCapabilityAssignmentTest {
 
     @Test
     public void testAuthorative() {
-        ToscaCapabilityAssignment tca =
-                new JpaToscaCapabilityAssignment(new ToscaCapabilityAssignment()).toAuthorative();
+        ToscaCapabilityAssignment tca = new ToscaCapabilityAssignment();
+        tca.setName("world");
+        tca.setVersion("1.2.3");
+        tca.setType("planet");
+        tca.setTypeVersion("4.5.6");
+
+        ToscaCapabilityAssignment tcaConsTo =
+                new JpaToscaCapabilityAssignment(tca).toAuthorative();
+
+        assertEquals(tca, tcaConsTo);
 
-        JpaToscaCapabilityAssignment jtca = new JpaToscaCapabilityAssignment(tca);
-        ToscaCapabilityAssignment tca2 = jtca.toAuthorative();
-        assertEquals(tca, tca2);
+        JpaToscaCapabilityAssignment jtca = new JpaToscaCapabilityAssignment(tcaConsTo);
+        ToscaCapabilityAssignment tcaFromTo = jtca.toAuthorative();
+        assertEquals(tca, tcaFromTo);
     }
 }