JPA concepts for TOSCA

[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 5cbec00..bb0d2dc 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
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019-2020 Nordix Foundation.
- *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ *  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.
@@ -25,12 +25,13 @@ import static org.assertj.core.api.Assertions.assertThat;
 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.assertTrue;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.TreeMap;
-
 import org.junit.Test;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfReferenceKey;
@@ -101,20 +102,20 @@ public class JpaToscaServiceTemplateTest {
 
         assertEquals(-1, tst.compareTo(null));
         assertEquals(0, tst.compareTo(tst));
-        assertFalse(tst.compareTo(tst.getKey()) == 0);
+        assertNotEquals(0, tst.compareTo(tst.getKey()));
 
         PfConceptKey otherDtKey = new PfConceptKey("otherDt", VERSION_001);
         JpaToscaServiceTemplate otherDt = new JpaToscaServiceTemplate(otherDtKey);
 
-        assertFalse(tst.compareTo(otherDt) == 0);
+        assertNotEquals(0, tst.compareTo(otherDt));
         otherDt.setKey(tstKey);
-        assertFalse(tst.compareTo(otherDt) == 0);
+        assertNotEquals(0, tst.compareTo(otherDt));
         otherDt.setToscaDefinitionsVersion("Tosca Version");
-        assertFalse(tst.compareTo(otherDt) == 0);
+        assertNotEquals(0, tst.compareTo(otherDt));
         otherDt.setDataTypes(dataTypes);
-        assertFalse(tst.compareTo(otherDt) == 0);
+        assertNotEquals(0, tst.compareTo(otherDt));
         otherDt.setPolicyTypes(policyTypes);
-        assertFalse(tst.compareTo(otherDt) == 0);
+        assertNotEquals(0, tst.compareTo(otherDt));
         otherDt.setTopologyTemplate(ttt);
         assertEquals(0, tst.compareTo(otherDt));
 
@@ -154,6 +155,8 @@ public class JpaToscaServiceTemplateTest {
         JpaToscaDataType dt0 = new JpaToscaDataType(new PfConceptKey("dt0:0.0.1"));
         JpaToscaProperty prop0 = new JpaToscaProperty(new PfReferenceKey(pt0.getKey(), "prop0"));
         prop0.setType(dt0.getKey());
+
+        pt0.setProperties(new LinkedHashMap<>());
         pt0.getProperties().put(prop0.getKey().getLocalName(), prop0);
         result = tst.validate(new PfValidationResult());
         assertFalse(result.isOk());