From 11e0afc41aa47b9b5fe36c6c654c5b7493e4ba46 Mon Sep 17 00:00:00 2001 From: "Magnusen, Drew (dm741q)" Date: Thu, 24 Aug 2017 11:37:46 -0500 Subject: Removal of sys.out/err with logger messages Removed any use of System.out.println or System.err.println and replaced with relevant logger statements. Issue-ID: POLICY-176 Change-Id: I91513267635bfb2a34f2a9650c48f367d53fc842 Signed-off-by: Magnusen, Drew (dm741q) --- .../ControlLoopOperationManagerTest.java | 30 ++++++++++++---------- .../processor/ControlLoopProcessorTest.java | 17 +++++++----- 2 files changed, 26 insertions(+), 21 deletions(-) (limited to 'controlloop/common/eventmanager/src/test') diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java index fd7540ae7..6116d987e 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java @@ -42,9 +42,11 @@ import org.onap.policy.controlloop.Util; import org.onap.policy.controlloop.policy.ControlLoopPolicy; import org.onap.policy.controlloop.policy.PolicyResult; import org.onap.policy.controlloop.processor.ControlLoopProcessor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ControlLoopOperationManagerTest { - + private static final Logger logger = LoggerFactory.getLogger(ControlLoopOperationManagerTest.class); private static VirtualControlLoopEvent onset; static { onset = new VirtualControlLoopEvent(); @@ -77,7 +79,7 @@ public class ControlLoopOperationManagerTest { ControlLoopEventManager eventManager = new ControlLoopEventManager(onset.closedLoopControlName, onset.requestID); ControlLoopOperationManager manager = new ControlLoopOperationManager(onset, processor.getCurrentPolicy(), eventManager); - System.out.println(manager); + logger.debug("{}",manager); // // // @@ -87,7 +89,7 @@ public class ControlLoopOperationManagerTest { // Start // Object request = manager.startOperation(onset); - System.out.println(manager); + logger.debug("{}",manager); assertNotNull(request); assertTrue(request instanceof Request); assertTrue(((Request)request).CommonHeader.SubRequestID.contentEquals("1")); @@ -103,7 +105,7 @@ public class ControlLoopOperationManagerTest { // // PolicyResult result = manager.onResponse(response); - System.out.println(manager); + logger.debug("{}",manager); assertTrue(result == null); assertFalse(manager.isOperationComplete()); assertTrue(manager.isOperationRunning()); @@ -115,7 +117,7 @@ public class ControlLoopOperationManagerTest { response.Status.Value = ResponseValue.FAILURE.toString(); response.Status.Description = "AppC failed for some reason"; result = manager.onResponse(response); - System.out.println(manager); + logger.debug("{}",manager); assertTrue(result.equals(PolicyResult.FAILURE)); assertFalse(manager.isOperationComplete()); assertFalse(manager.isOperationRunning()); @@ -123,7 +125,7 @@ public class ControlLoopOperationManagerTest { // Retry it // request = manager.startOperation(onset); - System.out.println(manager); + logger.debug("{}",manager); assertNotNull(request); assertTrue(request instanceof Request); assertTrue(((Request)request).CommonHeader.SubRequestID.contentEquals("2")); @@ -133,14 +135,14 @@ public class ControlLoopOperationManagerTest { // // response = new Response((Request) request); - System.out.println(manager); + logger.debug("{}",manager); response.Status.Code = ResponseCode.ACCEPT.getValue(); response.Status.Value = ResponseValue.ACCEPT.toString(); // // // result = manager.onResponse(response); - System.out.println(manager); + logger.debug("{}",manager); assertTrue(result == null); assertFalse(manager.isOperationComplete()); assertTrue(manager.isOperationRunning()); @@ -152,7 +154,7 @@ public class ControlLoopOperationManagerTest { response.Status.Value = ResponseValue.FAILURE.toString(); response.Status.Description = "AppC failed for some reason"; result = manager.onResponse(response); - System.out.println(manager); + logger.debug("{}",manager); assertTrue(result.equals(PolicyResult.FAILURE)); // // Should be complete now @@ -188,14 +190,14 @@ public class ControlLoopOperationManagerTest { // // // - System.out.println(manager); + logger.debug("{}",manager); assertFalse(manager.isOperationComplete()); assertFalse(manager.isOperationRunning()); // // Start // Object request = manager.startOperation(onset); - System.out.println(manager); + logger.debug("{}",manager); assertNotNull(request); assertTrue(request instanceof Request); assertTrue(((Request)request).CommonHeader.SubRequestID.contentEquals("1")); @@ -211,7 +213,7 @@ public class ControlLoopOperationManagerTest { // // PolicyResult result = manager.onResponse(response); - System.out.println(manager); + logger.debug("{}",manager); assertTrue(result == null); assertFalse(manager.isOperationComplete()); assertTrue(manager.isOperationRunning()); @@ -219,7 +221,7 @@ public class ControlLoopOperationManagerTest { // Now we are going to simulate Timeout // manager.setOperationHasTimedOut(); - System.out.println(manager); + logger.debug("{}",manager); assertTrue(manager.isOperationComplete()); assertFalse(manager.isOperationRunning()); assertTrue(manager.getHistory().size() == 1); @@ -232,7 +234,7 @@ public class ControlLoopOperationManagerTest { response.Status.Value = ResponseValue.FAILURE.toString(); response.Status.Description = "AppC failed for some reason"; result = manager.onResponse(response); - System.out.println(manager); + logger.debug("{}",manager); // // // diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/processor/ControlLoopProcessorTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/processor/ControlLoopProcessorTest.java index 6000ca831..7bd18a3ff 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/processor/ControlLoopProcessorTest.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/processor/ControlLoopProcessorTest.java @@ -36,9 +36,12 @@ import org.onap.policy.controlloop.ControlLoopException; import org.onap.policy.controlloop.policy.FinalResult; import org.onap.policy.controlloop.policy.Policy; import org.onap.policy.controlloop.policy.PolicyResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ControlLoopProcessorTest { - + private static final Logger logger = LoggerFactory.getLogger(ControlLoopProcessorTest.class); + @Test public void test() { try (InputStream is = new FileInputStream(new File("src/test/resources/test.yaml"))) { @@ -59,32 +62,32 @@ public class ControlLoopProcessorTest { public void testSuccess(String yaml) throws ControlLoopException { ControlLoopProcessor processor = new ControlLoopProcessor(yaml); - System.out.println("testSuccess: " + processor.getControlLoop().toString()); + logger.debug("testSuccess: {}", processor.getControlLoop()); while (true) { FinalResult result = processor.checkIsCurrentPolicyFinal(); if (result != null) { - System.out.println(result); + logger.debug("{}", result); break; } Policy policy = processor.getCurrentPolicy(); assertNotNull(policy); - System.out.println("current policy is: " + policy.getId() + " " + policy.getName()); + logger.debug("current policy is: {} {}", policy.getId(), policy.getName()); processor.nextPolicyForResult(PolicyResult.SUCCESS); } } public void testFailure(String yaml) throws ControlLoopException { ControlLoopProcessor processor = new ControlLoopProcessor(yaml); - System.out.println("testFailure: " + processor.getControlLoop().toString()); + logger.debug("testFailure: {}", processor.getControlLoop()); while (true) { FinalResult result = processor.checkIsCurrentPolicyFinal(); if (result != null) { - System.out.println(result); + logger.debug("{}", result); break; } Policy policy = processor.getCurrentPolicy(); assertNotNull(policy); - System.out.println("current policy is: " + policy.getId() + " " + policy.getName()); + logger.debug("current policy is: {} {}", policy.getId(), policy.getName()); processor.nextPolicyForResult(PolicyResult.FAILURE); } } -- cgit 1.2.3-korg