Fix some sonars in policy-models

[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 0f461d2..7d804c8 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * appc
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,18 +22,18 @@
 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 {
 
+    private static final String WIZARD = "Wizard";
+    private static final String GO_TO_OZ = "Go to Oz";
+
     @Test
     public void testRequest() {
         Request request = new Request();
@@ -45,11 +45,11 @@ public class RequestTest {
         request.setCommonHeader(commonHeader);
         assertEquals(commonHeader, request.getCommonHeader());
 
-        request.setAction("Go to Oz");
-        assertEquals("Go to Oz", request.getAction());
+        request.setAction(GO_TO_OZ);
+        assertEquals(GO_TO_OZ, request.getAction());
 
-        request.setObjectId("Wizard");
-        assertEquals("Wizard", request.getObjectId());
+        request.setObjectId(WIZARD);
+        assertEquals(WIZARD, request.getObjectId());
 
         request.setTargetId("Oz");
         assertEquals("Oz", request.getTargetId());
@@ -72,54 +72,57 @@ 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"));
+        /*
+         * Disabling sonar to test equals().
+         */
+        assertEquals(request, request);             // NOSONAR
+        assertEquals(request, copiedRequest);
+        assertNotEquals(request, null);
+        assertNotEquals(request, "Hello");          // NOSONAR
 
         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));
-        request.setAction("Go to Oz");
-        assertFalse(request.equals(copiedRequest));
-        copiedRequest.setAction("Go to Oz");
-        assertTrue(request.equals(copiedRequest));
+        assertEquals(request, copiedRequest);
+        request.setAction(GO_TO_OZ);
+        assertNotEquals(request, copiedRequest);
+        copiedRequest.setAction(GO_TO_OZ);
+        assertEquals(request, copiedRequest);
 
         request.setObjectId(null);
-        assertFalse(request.equals(copiedRequest));
+        assertNotEquals(request, copiedRequest);
         copiedRequest.setObjectId(null);
-        assertTrue(request.equals(copiedRequest));
-        request.setObjectId("Wizard");
-        assertFalse(request.equals(copiedRequest));
-        copiedRequest.setObjectId("Wizard");
-        assertTrue(request.equals(copiedRequest));
+        assertEquals(request, copiedRequest);
+        request.setObjectId(WIZARD);
+        assertNotEquals(request, copiedRequest);
+        copiedRequest.setObjectId(WIZARD);
+        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);
     }
 }