Changes for Checkstyle 8.32

[policy/models.git] / models-interactions / model-impl / appc / src / test / java / org / onap / policy / appc / RequestTest.java

diff --git a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java
index 560a7d8..e6fb868 100644 (file)
--- a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java
+++ b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java
@@ -22,14 +22,11 @@
 package org.onap.policy.appc;
 
 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.HashMap;
 import java.util.Map;
-
 import org.junit.Test;
 
 public class RequestTest {
@@ -75,54 +72,54 @@ public class RequestTest {
         copiedRequest.setPayload(request.getPayload());
         copiedRequest.setTargetId(request.getTargetId());
 
-        assertTrue(request.equals(request));
-        assertTrue(request.equals(copiedRequest));
-        assertFalse(request.equals(null));
-        assertFalse(request.equals("Hello"));
+        assertEquals(request, request);
+        assertEquals(request, copiedRequest);
+        assertNotEquals(null, request);
+        assertNotEquals("Hello", request);
 
         request.setCommonHeader(null);
-        assertFalse(request.equals(copiedRequest));
+        assertNotEquals(request, copiedRequest);
         copiedRequest.setCommonHeader(null);
-        assertTrue(request.equals(copiedRequest));
+        assertEquals(request, copiedRequest);
         request.setCommonHeader(commonHeader);
-        assertFalse(request.equals(copiedRequest));
+        assertNotEquals(request, copiedRequest);
         copiedRequest.setCommonHeader(commonHeader);
-        assertTrue(request.equals(copiedRequest));
+        assertEquals(request, copiedRequest);
 
         request.setAction(null);
-        assertFalse(request.equals(copiedRequest));
+        assertNotEquals(request, copiedRequest);
         copiedRequest.setAction(null);
-        assertTrue(request.equals(copiedRequest));
+        assertEquals(request, copiedRequest);
         request.setAction(GO_TO_OZ);
-        assertFalse(request.equals(copiedRequest));
+        assertNotEquals(request, copiedRequest);
         copiedRequest.setAction(GO_TO_OZ);
-        assertTrue(request.equals(copiedRequest));
+        assertEquals(request, copiedRequest);
 
         request.setObjectId(null);
-        assertFalse(request.equals(copiedRequest));
+        assertNotEquals(request, copiedRequest);
         copiedRequest.setObjectId(null);
-        assertTrue(request.equals(copiedRequest));
+        assertEquals(request, copiedRequest);
         request.setObjectId(WIZARD);
-        assertFalse(request.equals(copiedRequest));
+        assertNotEquals(request, copiedRequest);
         copiedRequest.setObjectId(WIZARD);
-        assertTrue(request.equals(copiedRequest));
+        assertEquals(request, copiedRequest);
 
         request.setTargetId(null);
-        assertFalse(request.equals(copiedRequest));
+        assertNotEquals(request, copiedRequest);
         copiedRequest.setTargetId(null);
-        assertTrue(request.equals(copiedRequest));
+        assertEquals(request, copiedRequest);
         request.setTargetId("Oz");
-        assertFalse(request.equals(copiedRequest));
+        assertNotEquals(request, copiedRequest);
         copiedRequest.setTargetId("Oz");
-        assertTrue(request.equals(copiedRequest));
+        assertEquals(request, copiedRequest);
 
-        request.setPayload(new HashMap<String, Object>());
-        assertFalse(request.equals(copiedRequest));
-        copiedRequest.setPayload(new HashMap<String, Object>());
-        assertTrue(request.equals(copiedRequest));
+        request.setPayload(new HashMap<>());
+        assertNotEquals(request, copiedRequest);
+        copiedRequest.setPayload(new HashMap<>());
+        assertEquals(request, copiedRequest);
         request.setPayload(payload);
-        assertFalse(request.equals(copiedRequest));
+        assertNotEquals(request, copiedRequest);
         copiedRequest.setPayload(payload);
-        assertTrue(request.equals(copiedRequest));
+        assertEquals(request, copiedRequest);
     }
 }