1 files changed, 7 insertions, 5 deletions
diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaWithStringPropertiesTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaWithStringPropertiesTest.java
index 23e0e6a7e..7cd6facf0 100644
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaWithStringPropertiesTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaWithStringPropertiesTest.java
@@ -104,17 +104,15 @@ public class JpaToscaWithStringPropertiesTest {
         jpa.setDescription(SOME_DESCRIPTION);
         jpa.setProperties(Map.of(KEY1, STRING1, KEY2, STRING2));
 
-        assertThat(jpa.compareTo(null)).isNegative();
-        assertThat(jpa.compareTo(jpa)).isZero();
-        assertThat(jpa.compareTo(new PfConceptKey())).isNotZero();
+        assertThat(jpa).isNotEqualByComparingTo(null).isEqualByComparingTo(jpa).isNotEqualByComparingTo(new MyJpa2());
 
         MyJpa jpa2 = new MyJpa();
         jpa2.setDescription(SOME_DESCRIPTION);
         jpa2.setProperties(Map.of(KEY1, STRING1, KEY2, STRING2));
-        assertThat(jpa.compareTo(jpa2)).isZero();
+        assertThat(jpa).isEqualByComparingTo(jpa2);
 
         jpa2.setProperties(Map.of(KEY1, STRING1));
-        assertThat(jpa.compareTo(jpa2)).isNotZero();
+        assertThat(jpa).isNotEqualByComparingTo(jpa2);
     }
 
     @Test
@@ -211,4 +209,8 @@ public class JpaToscaWithStringPropertiesTest {
             return propValue.toString();
         }
     }
+
+    private static class MyJpa2 extends MyJpa {
+        private static final long serialVersionUID = 1L;
+    }
 }