diff options
Diffstat (limited to 'src/test/java/org/onap/sdc/common/onaplog/OnapLoggerAuditTest.java')
| -rw-r--r-- | src/test/java/org/onap/sdc/common/onaplog/OnapLoggerAuditTest.java | 70 |
1 files changed, 42 insertions, 28 deletions
diff --git a/src/test/java/org/onap/sdc/common/onaplog/OnapLoggerAuditTest.java b/src/test/java/org/onap/sdc/common/onaplog/OnapLoggerAuditTest.java index 49ca61a..8fe3b72 100644 --- a/src/test/java/org/onap/sdc/common/onaplog/OnapLoggerAuditTest.java +++ b/src/test/java/org/onap/sdc/common/onaplog/OnapLoggerAuditTest.java @@ -26,8 +26,8 @@ import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor; import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.when; @@ -45,16 +45,17 @@ import org.onap.sdc.common.onaplog.Enums.Severity; import org.slf4j.MDC; import uk.org.lidalia.slf4jtest.LoggingEvent; -import uk.org.lidalia.slf4jtest.TestLogger; -import uk.org.lidalia.slf4jtest.TestLoggerFactory; @RunWith(MockitoJUnitRunner.class) public class OnapLoggerAuditTest { - private static final String SERVER_FQDN = "onap.test.com"; - private static final String AUTO_SERVER_IP_ADDRESS = "127.0.0.2"; + private static OnapMDCWrapper onapMDCWrapper = OnapMDCWrapper.getInstance(); + + private static final String DUMMY_SERVER_FQDN = "onap.test.com"; + private static final String DUMMY_AUTO_SERVER_IP_ADDRESS = "127.0.0.2"; + private static final String INSTANCE_UUID = "testUUID"; - private static final String TEST_CLASS_NAME = OnapLoggerAudit.class.getName(); + private static final String TEST_CLASS_NAME = OnapLoggerAudit.class.getName(); private static final String PROCESS_KEY = "testKey"; private static final String CUSTOM_FIELD1 = "testField1"; private static final String CUSTOM_FIELD2 = "testField2"; @@ -97,21 +98,22 @@ public class OnapLoggerAuditTest { } @Test - public void testLoggerAuditTestFullFlow() { + public void testLoggerAuditFullFlow() { // given - OnapLoggerAudit audit = new OnapLoggerAudit(new OnapMDCWrapper(new Stopwatch())); + OnapLoggerAudit audit = OnapLoggerFactory.getLogger(OnapLoggerAudit.class); + assertNotNull(audit); LoggerAdapter adapter = new LoggerAdapter(OnapLoggerAudit.class); when(loggerErrorCode.getErrorCode()).thenReturn(RESPONSE_CODE); when(severity.getSeverityType()).thenReturn(ALERT_SEVERITY); - audit.initializeMandatoryFields(); setupMDC(audit); validateMDC(); // when audit.startTimer(); + audit.stopTimer(); audit.log(LogLevel.ERROR, TEST_CLASS_NAME, LOG_MESSAGE); audit.log(LogLevel.WARN, TEST_CLASS_NAME, LOG_MESSAGE); audit.log(LogLevel.INFO, TEST_CLASS_NAME, LOG_MESSAGE); @@ -127,9 +129,31 @@ public class OnapLoggerAuditTest { MDC.clear(); } + @Test + public void testCleanLogger() { + // given + OnapLoggerAudit audit = OnapLoggerFactory.getLogger(OnapLoggerAudit.class); + assertNotNull(audit); + + audit.onapMDCWrapper.setMandatoryField(OnapLogConfiguration.MDC_KEY_REQUEST_ID); + audit.onapMDCWrapper.setMandatoryField(OnapLogConfiguration.MDC_REMOTE_HOST); + audit.onapMDCWrapper.setMandatoryField(OnapLogConfiguration.MDC_INSTANCE_UUID); + audit.setKeyRequestId(KEY_REQUEST_ID); + audit.setRemoteHost(REMOTE_HOST); + audit.setInstanceUUID(INSTANCE_UUID); + + // when + audit.clear(); + + // then + assertNull(MDC.get(OnapLogConfiguration.MDC_KEY_REQUEST_ID)); + assertNull(MDC.get(OnapLogConfiguration.MDC_REMOTE_HOST)); + assertNull(MDC.get(OnapLogConfiguration.MDC_INSTANCE_UUID)); + } + private void setupMDC(OnapLoggerAudit audit) { - audit.setAutoServerFQDN(SERVER_FQDN) - .setAutoServerIPAddress(AUTO_SERVER_IP_ADDRESS) + audit.setAutoServerFQDN(DUMMY_SERVER_FQDN) + .setAutoServerIPAddress(DUMMY_AUTO_SERVER_IP_ADDRESS) .setInstanceUUID(INSTANCE_UUID) .setOptClassName(TEST_CLASS_NAME) .setOptProcessKey(PROCESS_KEY) @@ -148,8 +172,9 @@ public class OnapLoggerAuditTest { } private void validateMDC() { - assertEquals(SERVER_FQDN, MDC.get(OnapLogConfiguration.MDC_SERVER_FQDN)); - assertEquals(AUTO_SERVER_IP_ADDRESS, MDC.get(OnapLogConfiguration.MDC_SERVER_IP_ADDRESS)); + assertEquals(DUMMY_SERVER_FQDN, MDC.get(OnapLogConfiguration.MDC_SERVER_FQDN)); + assertEquals(DUMMY_AUTO_SERVER_IP_ADDRESS, MDC.get(OnapLogConfiguration.MDC_SERVER_IP_ADDRESS)); + assertEquals(INSTANCE_UUID, MDC.get(OnapLogConfiguration.MDC_INSTANCE_UUID)); assertEquals(TEST_CLASS_NAME, MDC.get(OnapLogConfiguration.MDC_CLASS_NAME)); assertEquals(PROCESS_KEY, MDC.get(OnapLogConfiguration.MDC_PROCESS_KEY)); @@ -172,8 +197,8 @@ public class OnapLoggerAuditTest { assertNotNull(log.getTimestamp()); ImmutableMap<String, String> mdc = log.getMdc(); - assertNotEquals(SERVER_FQDN, mdc.get(OnapLogConfiguration.MDC_SERVER_FQDN)); - assertNotEquals(AUTO_SERVER_IP_ADDRESS, mdc.get(OnapLogConfiguration.MDC_SERVER_IP_ADDRESS)); + assertEquals(onapMDCWrapper.getFqdn(), mdc.get(OnapLogConfiguration.MDC_SERVER_FQDN)); + assertEquals(onapMDCWrapper.getHostAddress(), mdc.get(OnapLogConfiguration.MDC_SERVER_IP_ADDRESS)); assertEquals(INSTANCE_UUID, mdc.get(OnapLogConfiguration.MDC_INSTANCE_UUID)); assertEquals(TEST_CLASS_NAME, mdc.get(OnapLogConfiguration.MDC_CLASS_NAME)); @@ -191,18 +216,7 @@ public class OnapLoggerAuditTest { assertEquals(KEY_REQUEST_ID, mdc.get(OnapLogConfiguration.MDC_KEY_REQUEST_ID)); assertNotNull(mdc.get(OnapLogConfiguration.MDC_BEGIN_TIMESTAMP)); - } - - class LoggerAdapter { - - TestLogger logger; - - LoggerAdapter(Class clazz) { - this.logger = TestLoggerFactory.getTestLogger(clazz); - } - - private ImmutableList<LoggingEvent> getLoggingEvents() { - return logger.getLoggingEvents(); - } + assertNotNull(MDC.get(OnapLogConfiguration.MDC_END_TIMESTAMP)); + assertNotNull(MDC.get(OnapLogConfiguration.MDC_ELAPSED_TIME)); } }
\ No newline at end of file |