diff options
Diffstat (limited to 'common/src/test/java')
-rw-r--r-- | common/src/test/java/org/onap/so/logging/tasks/MDCSetupTest.java (renamed from common/src/test/java/org/onap/so/externaltasks/logging/AuditMDCSetupTest.java) | 27 | ||||
-rw-r--r-- | common/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java | 5 |
2 files changed, 18 insertions, 14 deletions
diff --git a/common/src/test/java/org/onap/so/externaltasks/logging/AuditMDCSetupTest.java b/common/src/test/java/org/onap/so/logging/tasks/MDCSetupTest.java index c4609f0336..929db79910 100644 --- a/common/src/test/java/org/onap/so/externaltasks/logging/AuditMDCSetupTest.java +++ b/common/src/test/java/org/onap/so/logging/tasks/MDCSetupTest.java @@ -1,4 +1,4 @@ -package org.onap.so.externaltasks.logging; +package org.onap.so.logging.tasks; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -11,28 +11,27 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; -import org.mockito.junit.MockitoJUnitRunner; -import org.onap.logging.filter.base.MDCSetup; import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.onap.so.logger.MdcConstants; import org.slf4j.MDC; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) -public class AuditMDCSetupTest { +public class MDCSetupTest { @Mock - private ExternalTask externalTask; + private org.onap.logging.filter.base.MDCSetup mdcSet; @Mock - private MDCSetup mdcSet; - - @Spy - @InjectMocks - private AuditMDCSetup mdcSetup; + private ExternalTask externalTask; private String requestId = "9bb86b8d-a02f-4a0b-81a9-2eb963850009"; private String serviceName = "testServiceName"; + @Spy + @InjectMocks + AuditMDCSetup setup = new AuditMDCSetup(); + @After public void tearDown() { MDC.clear(); @@ -43,7 +42,7 @@ public class AuditMDCSetupTest { doReturn(requestId).when(externalTask).getVariable("mso-request-id"); doReturn(serviceName).when(externalTask).getTopicName(); - mdcSetup.setupMDC(externalTask); + setup.setupMDC(externalTask); assertNotNull(MDC.get(ONAPLogConstants.MDCs.ENTRY_TIMESTAMP)); assertEquals(requestId, MDC.get(ONAPLogConstants.MDCs.REQUEST_ID)); @@ -57,14 +56,14 @@ public class AuditMDCSetupTest { public void setElapsedTimeTest() { MDC.put(ONAPLogConstants.MDCs.ENTRY_TIMESTAMP, "2019-06-18T02:09:06.024Z"); - mdcSetup.setElapsedTime(); + setup.setElapsedTime(); assertNotNull(MDC.get(ONAPLogConstants.MDCs.ELAPSED_TIME)); } @Test public void setResponseCodeTest() { - mdcSetup.setResponseCode(ONAPLogConstants.ResponseStatus.INPROGRESS.toString()); + setup.setResponseCode(ONAPLogConstants.ResponseStatus.INPROGRESS.toString()); assertEquals(ONAPLogConstants.ResponseStatus.INPROGRESS.toString(), MDC.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE)); @@ -80,7 +79,7 @@ public class AuditMDCSetupTest { MDC.put(ONAPLogConstants.MDCs.ELAPSED_TIME, "318"); MDC.put(ONAPLogConstants.MDCs.PARTNER_NAME, "SO.OPENSTACK_ADAPTER"); - mdcSetup.clearClientMDCs(); + setup.clearClientMDCs(); assertNull(MDC.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE)); assertNull(MDC.get(MdcConstants.OPENSTACK_STATUS_CODE)); diff --git a/common/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java b/common/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java index e27caa6458..6c2dbb666c 100644 --- a/common/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java +++ b/common/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java @@ -1,11 +1,13 @@ package org.onap.so.utils; import static org.junit.Assert.assertEquals; +import org.camunda.bpm.client.task.ExternalTask; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; +import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.core.env.Environment; @@ -13,6 +15,9 @@ import org.springframework.core.env.Environment; public class ExternalTaskUtilsTest { @Mock + private ExternalTask externalTask; + + @Mock private Environment mockenv; @InjectMocks |