JPA concepts for TOSCA

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

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTypeTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTypeTest.java
index a7ca3cc..43cacda 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTypeTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicyTypeTest.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.
@@ -24,6 +24,7 @@ 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.assertTrue;
 
@@ -32,7 +33,6 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 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.PfKey;
@@ -104,24 +104,24 @@ public class JpaToscaPolicyTypeTest {
 
         assertEquals(-1, tpt.compareTo(null));
         assertEquals(0, tpt.compareTo(tpt));
-        assertFalse(tpt.compareTo(tpt.getKey()) == 0);
+        assertNotEquals(0, tpt.compareTo(tpt.getKey()));
 
         PfConceptKey otherDtKey = new PfConceptKey("otherDt", VERSION_001);
         JpaToscaPolicyType otherDt = new JpaToscaPolicyType(otherDtKey);
 
-        assertFalse(tpt.compareTo(otherDt) == 0);
+        assertNotEquals(0, tpt.compareTo(otherDt));
         otherDt.setKey(ptKey);
-        assertFalse(tpt.compareTo(otherDt) == 0);
+        assertNotEquals(0, tpt.compareTo(otherDt));
         otherDt.setDerivedFrom(derivedFromKey);
-        assertFalse(tpt.compareTo(otherDt) == 0);
+        assertNotEquals(0, tpt.compareTo(otherDt));
         otherDt.setMetadata(metadata);
-        assertFalse(tpt.compareTo(otherDt) == 0);
+        assertNotEquals(0, tpt.compareTo(otherDt));
         otherDt.setDescription(A_DESCRIPTION);
-        assertFalse(tpt.compareTo(otherDt) == 0);
+        assertNotEquals(0, tpt.compareTo(otherDt));
         otherDt.setProperties(properties);
-        assertFalse(tpt.compareTo(otherDt) == 0);
+        assertNotEquals(0, tpt.compareTo(otherDt));
         otherDt.setTargets(targets);
-        assertFalse(tpt.compareTo(otherDt) == 0);
+        assertNotEquals(0, tpt.compareTo(otherDt));
         otherDt.setTriggers(triggers);
         assertEquals(0, tpt.compareTo(otherDt));
 
@@ -182,7 +182,7 @@ public class JpaToscaPolicyTypeTest {
         JpaToscaEntityType<ToscaPolicy> tet = new JpaToscaEntityType<>(tpt.getKey());
         assertEquals(-1, tet.compareTo(null));
         assertEquals(0, tet.compareTo(tet));
-        assertFalse(tet.compareTo(tet.getKey()) == 0);
+        assertNotEquals(0, tet.compareTo(tet.getKey()));
 
         assertNotNull(new JpaToscaPolicyType(new ToscaPolicyType()));
 
@@ -221,7 +221,7 @@ public class JpaToscaPolicyTypeTest {
 
         JpaToscaProperty prop3 = new JpaToscaProperty(new PfReferenceKey(pt0.getKey(), "prop4"));
         prop3.setType(new PfConceptKey("the.property.Type1", "0.0.1"));
-        prop3.setEntrySchema(new JpaToscaEntrySchema());
+        prop3.setEntrySchema(new JpaToscaSchemaDefinition());
         prop3.getEntrySchema().setType(new PfConceptKey("the.property.Type3", "0.0.1"));
         assertTrue(prop3.validate(new PfValidationResult()).isValid());
 
@@ -230,7 +230,7 @@ public class JpaToscaPolicyTypeTest {
 
         JpaToscaProperty prop4 = new JpaToscaProperty(new PfReferenceKey(pt0.getKey(), "prop4"));
         prop4.setType(new PfConceptKey("the.property.Type1", "0.0.1"));
-        prop4.setEntrySchema(new JpaToscaEntrySchema());
+        prop4.setEntrySchema(new JpaToscaSchemaDefinition());
         prop4.getEntrySchema().setType(new PfConceptKey("the.property.Type2", "0.0.1"));
         assertTrue(prop4.validate(new PfValidationResult()).isValid());