Address more sonar issues in policy-models

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

diff --git a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java
index e9d1cd6..9149746 100644 (file)
--- a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java
+++ b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java
@@ -4,13 +4,14 @@
  * ================================================================================
  * Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019 Nordix Foundation.
+ * 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.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,35 +23,39 @@
 package org.onap.policy.sdnr;
 
 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 org.junit.Test;
 
 public class PciWrapperTest {
 
+    private static final String YELLOW_BRICK_ROAD = "YellowBrickRoad";
+    private static final String TORNADO = "Tornado";
+    private static final String THE_EMERALD_CITY = "The Emerald City";
+    private static final String MUNCHKIN = "Munchkin";
+    private static final String VERSION_19 = "19.3.9";
+
     @Test
     public void testPciWrapper() {
         PciWrapper wrapper = new PciWrapper();
         assertNotNull(wrapper);
         assertNotEquals(0, wrapper.hashCode());
 
-        wrapper.setVersion("19.3.9");
-        assertEquals("19.3.9", wrapper.getVersion());
+        wrapper.setVersion(VERSION_19);
+        assertEquals(VERSION_19, wrapper.getVersion());
 
-        wrapper.setCambriaPartition("The Emerald City");
-        assertEquals("The Emerald City", wrapper.getCambriaPartition());
+        wrapper.setCambriaPartition(THE_EMERALD_CITY);
+        assertEquals(THE_EMERALD_CITY, wrapper.getCambriaPartition());
 
-        wrapper.setRpcName("Tornado");
-        assertEquals("Tornado", wrapper.getRpcName());
+        wrapper.setRpcName(TORNADO);
+        assertEquals(TORNADO, wrapper.getRpcName());
 
-        wrapper.setCorrelationId("YellowBrickRoad");
-        assertEquals("YellowBrickRoad", wrapper.getCorrelationId());
+        wrapper.setCorrelationId(YELLOW_BRICK_ROAD);
+        assertEquals(YELLOW_BRICK_ROAD, wrapper.getCorrelationId());
 
-        wrapper.setType("Munchkin");
-        assertEquals("Munchkin", wrapper.getType());
+        wrapper.setType(MUNCHKIN);
+        assertEquals(MUNCHKIN, wrapper.getType());
 
         assertNotEquals(0, wrapper.hashCode());
 
@@ -63,54 +68,54 @@ public class PciWrapperTest {
         copiedPciWrapper.setCorrelationId(wrapper.getCorrelationId());
         copiedPciWrapper.setType(wrapper.getType());
 
-        assertTrue(wrapper.equals(wrapper));
-        assertTrue(wrapper.equals(copiedPciWrapper));
-        assertFalse(wrapper.equals(null));
-        assertFalse(wrapper.equals("Hello"));
+        assertEquals(wrapper, (Object) wrapper);
+        assertEquals(wrapper, copiedPciWrapper);
+        assertNotEquals(wrapper, null);
+        assertNotEquals(wrapper, (Object) "Hello");
 
         wrapper.setVersion(null);
-        assertFalse(wrapper.equals(copiedPciWrapper));
+        assertNotEquals(wrapper, copiedPciWrapper);
         copiedPciWrapper.setVersion(null);
-        assertTrue(wrapper.equals(copiedPciWrapper));
-        wrapper.setVersion("19.3.9");
-        assertFalse(wrapper.equals(copiedPciWrapper));
-        copiedPciWrapper.setVersion("19.3.9");
-        assertTrue(wrapper.equals(copiedPciWrapper));
+        assertEquals(wrapper, copiedPciWrapper);
+        wrapper.setVersion(VERSION_19);
+        assertNotEquals(wrapper, copiedPciWrapper);
+        copiedPciWrapper.setVersion(VERSION_19);
+        assertEquals(wrapper, copiedPciWrapper);
 
         wrapper.setCambriaPartition(null);
-        assertFalse(wrapper.equals(copiedPciWrapper));
+        assertNotEquals(wrapper, copiedPciWrapper);
         copiedPciWrapper.setCambriaPartition(null);
-        assertTrue(wrapper.equals(copiedPciWrapper));
-        wrapper.setCambriaPartition("The Emerald City");
-        assertFalse(wrapper.equals(copiedPciWrapper));
-        copiedPciWrapper.setCambriaPartition("The Emerald City");
-        assertTrue(wrapper.equals(copiedPciWrapper));
+        assertEquals(wrapper, copiedPciWrapper);
+        wrapper.setCambriaPartition(THE_EMERALD_CITY);
+        assertNotEquals(wrapper, copiedPciWrapper);
+        copiedPciWrapper.setCambriaPartition(THE_EMERALD_CITY);
+        assertEquals(wrapper, copiedPciWrapper);
 
         wrapper.setRpcName(null);
-        assertFalse(wrapper.equals(copiedPciWrapper));
+        assertNotEquals(wrapper, copiedPciWrapper);
         copiedPciWrapper.setRpcName(null);
-        assertTrue(wrapper.equals(copiedPciWrapper));
-        wrapper.setRpcName("Tornado");
-        assertFalse(wrapper.equals(copiedPciWrapper));
-        copiedPciWrapper.setRpcName("Tornado");
-        assertTrue(wrapper.equals(copiedPciWrapper));
+        assertEquals(wrapper, copiedPciWrapper);
+        wrapper.setRpcName(TORNADO);
+        assertNotEquals(wrapper, copiedPciWrapper);
+        copiedPciWrapper.setRpcName(TORNADO);
+        assertEquals(wrapper, copiedPciWrapper);
 
         wrapper.setCorrelationId(null);
-        assertFalse(wrapper.equals(copiedPciWrapper));
+        assertNotEquals(wrapper, copiedPciWrapper);
         copiedPciWrapper.setCorrelationId(null);
-        assertTrue(wrapper.equals(copiedPciWrapper));
-        wrapper.setCorrelationId("YellowBrickRoad");
-        assertFalse(wrapper.equals(copiedPciWrapper));
-        copiedPciWrapper.setCorrelationId("YellowBrickRoad");
-        assertTrue(wrapper.equals(copiedPciWrapper));
+        assertEquals(wrapper, copiedPciWrapper);
+        wrapper.setCorrelationId(YELLOW_BRICK_ROAD);
+        assertNotEquals(wrapper, copiedPciWrapper);
+        copiedPciWrapper.setCorrelationId(YELLOW_BRICK_ROAD);
+        assertEquals(wrapper, copiedPciWrapper);
 
         wrapper.setType(null);
-        assertFalse(wrapper.equals(copiedPciWrapper));
+        assertNotEquals(wrapper, copiedPciWrapper);
         copiedPciWrapper.setType(null);
-        assertTrue(wrapper.equals(copiedPciWrapper));
-        wrapper.setType("Munchkin");
-        assertFalse(wrapper.equals(copiedPciWrapper));
-        copiedPciWrapper.setType("Munchkin");
-        assertTrue(wrapper.equals(copiedPciWrapper));
+        assertEquals(wrapper, copiedPciWrapper);
+        wrapper.setType(MUNCHKIN);
+        assertNotEquals(wrapper, copiedPciWrapper);
+        copiedPciWrapper.setType(MUNCHKIN);
+        assertEquals(wrapper, copiedPciWrapper);
     }
 }