Fix some sonars in policy-models

[policy/models.git] / models-pdp / src / test / java / org / onap / policy / models / pdp / persistence / concepts / JpaPdpTest.java

diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java
index 5ffba10..74a3c9e 100644 (file)
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 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.pdp.persistence.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;
 
@@ -43,46 +44,46 @@ import org.onap.policy.models.pdp.testconcepts.DummyJpaPdpChild;
  */
 public class JpaPdpTest {
 
-    private static final String NULL_KEY_ERROR = "key is marked @NonNull but is null";
+    private static final String NULL_KEY_ERROR = "key is marked .*ull but is null";
     private static final String PDP1 = "ThePDP";
 
     @Test
     public void testJpaPdp() {
         assertThatThrownBy(() -> {
             new JpaPdp((JpaPdp) null);
-        }).hasMessage("copyConcept is marked @NonNull but is null");
+        }).hasMessageMatching("copyConcept is marked .*ull but is null");
 
         assertThatThrownBy(() -> {
             new JpaPdp((PfReferenceKey) null);
-        }).hasMessage(NULL_KEY_ERROR);
+        }).hasMessageMatching(NULL_KEY_ERROR);
 
         assertThatThrownBy(() -> {
             new JpaPdp(null, null, null);
-        }).hasMessage(NULL_KEY_ERROR);
+        }).hasMessageMatching(NULL_KEY_ERROR);
 
         assertThatThrownBy(() -> {
             new JpaPdp(new PfReferenceKey(), null, null);
-        }).hasMessage("pdpState is marked @NonNull but is null");
+        }).hasMessageMatching("pdpState is marked .*ull but is null");
 
         assertThatThrownBy(() -> {
             new JpaPdp(new PfReferenceKey(), PdpState.ACTIVE, null);
-        }).hasMessage("healthy is marked @NonNull but is null");
+        }).hasMessageMatching("healthy is marked .*ull but is null");
 
         assertThatThrownBy(() -> {
             new JpaPdp(null, PdpState.ACTIVE, null);
-        }).hasMessage(NULL_KEY_ERROR);
+        }).hasMessageMatching(NULL_KEY_ERROR);
 
         assertThatThrownBy(() -> {
             new JpaPdp(null, PdpState.ACTIVE, PdpHealthStatus.UNKNOWN);
-        }).hasMessage(NULL_KEY_ERROR);
+        }).hasMessageMatching(NULL_KEY_ERROR);
 
         assertThatThrownBy(() -> {
             new JpaPdp(null, null, PdpHealthStatus.UNKNOWN);
-        }).hasMessage(NULL_KEY_ERROR);
+        }).hasMessageMatching(NULL_KEY_ERROR);
 
         assertThatThrownBy(() -> {
             new JpaPdp((Pdp) null);
-        }).hasMessage("authorativeConcept is marked @NonNull but is null");
+        }).hasMessageMatching("authorativeConcept is marked .*ull but is null");
 
         assertNotNull(new JpaPdp((new PfReferenceKey())));
 
@@ -97,11 +98,9 @@ public class JpaPdpTest {
 
         assertThatThrownBy(() -> {
             testJpaPdp.fromAuthorative(null);
-        }).hasMessage("pdp is marked @NonNull but is null");
+        }).hasMessageMatching("pdp is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            testJpaPdp.copyTo(null);
-        }).hasMessage("target is marked @NonNull but is null");
+        assertThatThrownBy(() -> new JpaPdp((JpaPdp) null)).isInstanceOf(NullPointerException.class);
 
         assertEquals(PDP1, testJpaPdp.getKey().getLocalName());
         assertEquals(PDP1, new JpaPdp(testPdp).getKey().getLocalName());
@@ -116,7 +115,7 @@ public class JpaPdpTest {
 
         assertThatThrownBy(() -> {
             testJpaPdp.validate(null);
-        }).hasMessage("resultIn is marked @NonNull but is null");
+        }).hasMessageMatching("resultIn is marked .*ull but is null");
 
         assertFalse(testJpaPdp.validate(new PfValidationResult()).isOk());
         assertTrue(testJpaPdp.validate(new PfValidationResult()).toString()
@@ -163,7 +162,7 @@ public class JpaPdpTest {
         assertEquals(0, testJpaPdp.compareTo(otherJpaPdp));
         assertEquals(-1, testJpaPdp.compareTo(null));
         assertEquals(0, testJpaPdp.compareTo(testJpaPdp));
-        assertFalse(testJpaPdp.compareTo(new DummyJpaPdpChild()) == 0);
+        assertNotEquals(0, testJpaPdp.compareTo(new DummyJpaPdpChild()));
 
         testJpaPdp.getKey().setParentLocalName("ParentLocal1");
         assertEquals(1, testJpaPdp.compareTo(otherJpaPdp));
@@ -184,5 +183,7 @@ public class JpaPdpTest {
         assertEquals(-13, testJpaPdp.compareTo(otherJpaPdp));
         testJpaPdp.setMessage("Valid Message");
         assertEquals(0, testJpaPdp.compareTo(otherJpaPdp));
+
+        assertEquals(testJpaPdp, new JpaPdp(testJpaPdp));
     }
 }