Fix sonars in apex-pdp #3

Fixed:
- use "var"
- use assertEquals instead of assertTrue(xxx.equals())
- separate assertions

Issue-ID: POLICY-3093
Change-Id: Id4db62626948681cd267e68a56dda65fa355c6f8
Signed-off-by: Jim Hahn <jrh3@att.com>

2 files changed, 4 insertions, 3 deletions

diff --git a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/MessagingUtilsTest.java b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/MessagingUtilsTest.java
index a3c7ea419..6d5915ce8 100644
--- a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/MessagingUtilsTest.java
+++ b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/MessagingUtilsTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (c) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2021 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.
@@ -40,7 +41,7 @@ public class MessagingUtilsTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testIllegalArgumentException() {
-        assertEquals(1, MessagingUtils.findPort(65536));
+        MessagingUtils.findPort(65536);
     }
 
     @Test
@@ -58,7 +59,7 @@ public class MessagingUtilsTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testInvalidAllocateAddress() {
-        assertEquals(1, MessagingUtils.allocateAddress(1));
+        MessagingUtils.allocateAddress(1);
     }
 
     @Test
diff --git a/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/SupportMessageTester.java b/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/SupportMessageTest.java
index 7bc352025..8b19059b5 100644
--- a/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/SupportMessageTester.java
+++ b/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/SupportMessageTest.java
@@ -33,7 +33,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 /**
  * Test of the abstract Message class.
  */
-public class SupportMessageTester {
+public class SupportMessageTest {
 
     @Test
     public void testMessage() {