JPA concepts for TOSCA

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

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPropertyTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPropertyTest.java
index 18837d4..0fa0d3f 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPropertyTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPropertyTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ *  Copyright (C) 2019-2020 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.
@@ -24,7 +24,9 @@ package org.onap.policy.models.tosca.simple.concepts;
 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.assertNotSame;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
@@ -44,7 +46,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaProperty;
  */
 public class JpaToscaPropertyTest {
 
-    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 DEFAULT_KEY = "defaultKey";
     private static final String A_DESCRIPTION = "A Description";
     private static final String VERSION_001 = "0.0.1";
@@ -56,14 +58,14 @@ public class JpaToscaPropertyTest {
         assertNotNull(new JpaToscaProperty(new PfReferenceKey(), new PfConceptKey()));
         assertNotNull(new JpaToscaProperty(new JpaToscaProperty()));
 
-        assertThatThrownBy(() -> new JpaToscaProperty((PfReferenceKey) null)).hasMessage(KEY_IS_NULL);
+        assertThatThrownBy(() -> new JpaToscaProperty((PfReferenceKey) null)).hasMessageMatching(KEY_IS_NULL);
 
-        assertThatThrownBy(() -> new JpaToscaProperty(null, null)).hasMessage(KEY_IS_NULL);
+        assertThatThrownBy(() -> new JpaToscaProperty(null, null)).hasMessageMatching(KEY_IS_NULL);
 
-        assertThatThrownBy(() -> new JpaToscaProperty(null, new PfConceptKey())).hasMessage(KEY_IS_NULL);
+        assertThatThrownBy(() -> new JpaToscaProperty(null, new PfConceptKey())).hasMessageMatching(KEY_IS_NULL);
 
         assertThatThrownBy(() -> new JpaToscaProperty(new PfReferenceKey(), null))
-                        .hasMessage("type is marked @NonNull but is null");
+                .hasMessageMatching("type is marked .*on.*ull but is null");
 
         PfConceptKey pparentKey = new PfConceptKey("tParentKey", VERSION_001);
         PfReferenceKey pkey = new PfReferenceKey(pparentKey, "trigger0");
@@ -89,10 +91,10 @@ public class JpaToscaPropertyTest {
         assertEquals(constraints, tp.getConstraints());
 
         PfConceptKey typeKey = new PfConceptKey("type", VERSION_001);
-        JpaToscaEntrySchema tes = new JpaToscaEntrySchema(typeKey);
+        JpaToscaSchemaDefinition tes = new JpaToscaSchemaDefinition(typeKey);
         tp.setEntrySchema(tes);
 
-        TreeMap<String,String> metadata = new TreeMap<>();
+        TreeMap<String, String> metadata = new TreeMap<>();
         metadata.put("metaA", "dataA");
         metadata.put("metaB", "dataB");
         tp.setMetadata(metadata);
@@ -102,7 +104,7 @@ public class JpaToscaPropertyTest {
         assertEquals(tp, tdtClone0);
         assertEquals(0, tp.compareTo(tdtClone0));
 
-        assertTrue(tdtClone0.getMetadata() != tp.getMetadata());
+        assertNotSame(tdtClone0.getMetadata(), tp.getMetadata());
 
         JpaToscaProperty tdtClone1 = new JpaToscaProperty(tp);
         assertEquals(tp, tdtClone1);
@@ -110,42 +112,44 @@ public class JpaToscaPropertyTest {
 
         assertEquals(-1, tp.compareTo(null));
         assertEquals(0, tp.compareTo(tp));
-        assertFalse(tp.compareTo(tp.getKey()) == 0);
+        assertNotEquals(0, tp.compareTo(tp.getKey()));
 
         PfReferenceKey otherDtKey = new PfReferenceKey("otherDt", VERSION_001, "OtherProperty");
         JpaToscaProperty otherDt = new JpaToscaProperty(otherDtKey);
 
-        assertFalse(tp.compareTo(otherDt) == 0);
+        assertNotEquals(0, tp.compareTo(otherDt));
         otherDt.setKey(pkey);
-        assertFalse(tp.compareTo(otherDt) == 0);
+        assertNotEquals(0, tp.compareTo(otherDt));
         otherDt.setType(ptypeKey);
-        assertFalse(tp.compareTo(otherDt) == 0);
+        assertNotEquals(0, tp.compareTo(otherDt));
         otherDt.setDescription(A_DESCRIPTION);
-        assertFalse(tp.compareTo(otherDt) == 0);
+        assertNotEquals(0, tp.compareTo(otherDt));
         otherDt.setRequired(false);
-        assertFalse(tp.compareTo(otherDt) == 0);
+        assertNotEquals(0, tp.compareTo(otherDt));
         otherDt.setDefaultValue(DEFAULT_KEY);
-        assertFalse(tp.compareTo(otherDt) == 0);
+        assertNotEquals(0, tp.compareTo(otherDt));
         otherDt.setStatus(ToscaProperty.Status.SUPPORTED);
-        assertFalse(tp.compareTo(otherDt) == 0);
-        assertFalse(tp.compareTo(otherDt) == 0);
+        assertNotEquals(0, tp.compareTo(otherDt));
+        assertNotEquals(0, tp.compareTo(otherDt));
         otherDt.setConstraints(constraints);
-        assertFalse(tp.compareTo(otherDt) == 0);
+        assertNotEquals(0, tp.compareTo(otherDt));
         otherDt.setEntrySchema(tes);
+        assertNotEquals(0, tp.compareTo(otherDt));
+        otherDt.setMetadata(metadata);
         assertEquals(0, tp.compareTo(otherDt));
 
         otherDt.setRequired(true);
-        assertFalse(tp.compareTo(otherDt) == 0);
+        assertNotEquals(0, tp.compareTo(otherDt));
         otherDt.setRequired(false);
         assertEquals(0, tp.compareTo(otherDt));
 
         otherDt.setStatus(ToscaProperty.Status.UNSUPPORTED);
-        assertFalse(tp.compareTo(otherDt) == 0);
+        assertNotEquals(0, tp.compareTo(otherDt));
         otherDt.setStatus(ToscaProperty.Status.SUPPORTED);
         assertEquals(0, tp.compareTo(otherDt));
 
         assertThatThrownBy(() -> new JpaToscaProperty((JpaToscaProperty) null))
-                        .isInstanceOf(NullPointerException.class);
+                .isInstanceOf(NullPointerException.class);
 
         assertEquals(3, tp.getKeys().size());
         assertEquals(2, new JpaToscaProperty().getKeys().size());
@@ -189,7 +193,7 @@ public class JpaToscaPropertyTest {
         tp.setMetadata(null);
         assertTrue(tp.validate(new PfValidationResult()).isValid());
 
-        assertThatThrownBy(() -> tp.validate(null)).hasMessage("resultIn is marked @NonNull but is null");
+        assertThatThrownBy(() -> tp.validate(null)).hasMessageMatching("resultIn is marked .*on.*ull but is null");
     }
 
     @Test
@@ -218,10 +222,10 @@ public class JpaToscaPropertyTest {
         tp.setConstraints(constraints);
 
         PfConceptKey typeKey = new PfConceptKey("type", VERSION_001);
-        JpaToscaEntrySchema tes = new JpaToscaEntrySchema(typeKey);
+        JpaToscaSchemaDefinition tes = new JpaToscaSchemaDefinition(typeKey);
         tp.setEntrySchema(tes);
 
-        TreeMap<String,String> metadata = new TreeMap<>();
+        TreeMap<String, String> metadata = new TreeMap<>();
         metadata.put("metaA", "dataA");
         metadata.put("metaB", "dataB");
         tp.setMetadata(metadata);