From 72cf248dced4e272e69a8c48f5ee24c9d345f41d Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Tue, 25 Aug 2020 17:05:37 -0400 Subject: Address more sonars in drools-pdp Addressed the following sonars: - either log or rethrow - call "remove()" for thread-local-storage - use assertEquals - only one method call in exception test - swap arguments in assertEquals - add assertion to assertThatThrownBy() - explain @Ignore Also addressed eclipse warnings: - unused fields and methods Issue-ID: POLICY-2616 Change-Id: I6590c0d2b103885bc933014d48bf5fd92401cd80 Signed-off-by: Jim Hahn --- .../drools/statemanagement/test/StateManagementTest.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'feature-state-management/src/test/java/org') diff --git a/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java b/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java index 347e8c90..33bfaedc 100644 --- a/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java +++ b/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java @@ -20,6 +20,7 @@ package org.onap.policy.drools.statemanagement.test; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.File; @@ -143,8 +144,8 @@ public class StateManagementTest { logger.debug("avail = {}", avail); logger.debug("standby = {}", standby); - assertTrue("Admin state not unlocked after initialization", admin.equals(StateManagement.UNLOCKED)); - assertTrue("Operational state not enabled after initialization", oper.equals(StateManagement.ENABLED)); + assertEquals("Admin state not unlocked after initialization", StateManagement.UNLOCKED, admin); + assertEquals("Operational state not enabled after initialization", StateManagement.ENABLED, oper); try { stateManagementFeature.disableFailed(); @@ -164,8 +165,8 @@ public class StateManagementTest { logger.debug("avail = {}", avail); logger.debug("standby = {}", standby); - assertTrue("Operational state not disabled after disableFailed()", oper.equals(StateManagement.DISABLED)); - assertTrue("Availability status not failed after disableFailed()", avail.equals(StateManagement.FAILED)); + assertEquals("Operational state not disabled after disableFailed()", StateManagement.DISABLED, oper); + assertEquals("Availability status not failed after disableFailed()", StateManagement.FAILED, avail); try { @@ -185,7 +186,7 @@ public class StateManagementTest { logger.debug("avail = {}", avail); logger.debug("standby = {}", standby); - assertTrue("Standby status not coldstandby after promote()", standby.equals(StateManagement.COLD_STANDBY)); + assertEquals("Standby status not coldstandby after promote()", StateManagement.COLD_STANDBY, standby); /* *************Repository Audit Test. ************* */ logger.debug("\n\ntestStateManagementOperation: Repository Audit\n\n"); -- cgit