diff options
Diffstat (limited to 'catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFuncTest.java')
-rw-r--r-- | catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFuncTest.java | 207 |
1 files changed, 41 insertions, 166 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFuncTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFuncTest.java index 8478803f16..781702c4a4 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFuncTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFuncTest.java @@ -1,41 +1,5 @@ package org.openecomp.sdc.be.auditing.impl.resourceadmin; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyMap; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.ARTIFACT_DATA; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.ARTIFACT_UUID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.COMMENT; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.CURRENT_STATE; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.CURRENT_VERSION; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DCURR_STATUS; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DESCRIPTION; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DIST_ID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DPREV_STATUS; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_ARTIFACT_UPLOAD_LOG_STR; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_CHECK_IN_RESOURCE_LOG_STR; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_CREATE_RESOURCE_LOG_STR; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_DIST_STATE_CHANGE_APPROV; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_DIST_STATE_CHANGE_REQUEST; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_IMPORT_RESOURCE_LOG_STR; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.INVARIANT_UUID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.MODIFIER_UID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.PREV_RESOURCE_STATE; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.PREV_RESOURCE_VERSION; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.REQUEST_ID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.RESOURCE_NAME; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.RESOURCE_TYPE_VFC; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.SERVICE_INSTANCE_ID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.STATUS_OK; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.TOSCA_NODE_TYPE; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.init; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.modifier; - -import java.util.EnumMap; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -56,12 +20,18 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; import org.openecomp.sdc.be.resources.data.auditing.ResourceAdminEvent; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; -import org.openecomp.sdc.common.api.ConfigurationSource; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo; import org.openecomp.sdc.common.api.Constants; -import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; import org.openecomp.sdc.common.util.ThreadLocalsHolder; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.*; + @RunWith(MockitoJUnitRunner.class) public class AuditResourceAdminEventFuncTest { private AuditingManager auditingManager; @@ -69,14 +39,12 @@ public class AuditResourceAdminEventFuncTest { @Mock private static AuditCassandraDao cassandraDao; @Mock - private static ConfigurationSource configurationSource; - @Mock private static AuditingDao auditingDao; @Mock private static Configuration.ElasticSearchConfig esConfig; @Captor - private ArgumentCaptor<AuditingGenericEvent> eventCaptor; + private ArgumentCaptor<ResourceAdminEvent> eventCaptor; @Before public void setUp() { @@ -86,7 +54,7 @@ public class AuditResourceAdminEventFuncTest { } @Test - public void testNewCheckInResourceAdminEvent() { + public void testCheckInResourceAdminEvent() { Resource resource = new Resource(); resource.setName(RESOURCE_NAME); resource.setUUID(SERVICE_INSTANCE_ID); @@ -102,19 +70,20 @@ public class AuditResourceAdminEventFuncTest { .requestId(REQUEST_ID) .serviceInstanceId(SERVICE_INSTANCE_ID) .build(), - ResourceAuditData.newBuilder() + new ResourceCommonInfo(RESOURCE_NAME, RESOURCE_TYPE_VFC), + ResourceVersionInfo.newBuilder() .artifactUuid(ARTIFACT_UUID) .state(PREV_RESOURCE_STATE) .version(PREV_RESOURCE_VERSION) .distributionStatus(DPREV_STATUS) .build(), - ResourceAuditData.newBuilder() + ResourceVersionInfo.newBuilder() .artifactUuid(ARTIFACT_UUID) .state(CURRENT_STATE) .version(CURRENT_VERSION) .distributionStatus(DCURR_STATUS) .build(), - RESOURCE_TYPE_VFC, RESOURCE_NAME, INVARIANT_UUID, modifier, + INVARIANT_UUID, modifier, ARTIFACT_DATA, COMMENT, DIST_ID); when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.CHECKIN_RESOURCE.getAuditingEsType()))) @@ -126,52 +95,7 @@ public class AuditResourceAdminEventFuncTest { } @Test - public void testOldCheckInResourceAdminEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.CHECKIN_RESOURCE.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillMap(AuditingActionEnum.CHECKIN_RESOURCE))).isEqualTo(EXPECTED_CHECK_IN_RESOURCE_LOG_STR + " "); - verifyResourceAdminEvent(AuditingActionEnum.CHECKIN_RESOURCE.getName()); - - } - - private EnumMap<AuditingFieldsKeysEnum, Object> fillMap(AuditingActionEnum action) { - EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<>(AuditingFieldsKeysEnum.class); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, action.getName()); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, modifier.getFirstName() + " " + modifier.getLastName()); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifier.getUserId()); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, STATUS_OK); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, DESCRIPTION); - - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, RESOURCE_TYPE_VFC); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION, PREV_RESOURCE_VERSION); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE, PREV_RESOURCE_STATE); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, RESOURCE_NAME); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, CURRENT_VERSION); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, CURRENT_STATE); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, SERVICE_INSTANCE_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, INVARIANT_UUID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ARTIFACT_DATA, ARTIFACT_DATA); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID, ARTIFACT_UUID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID, ARTIFACT_UUID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID, DIST_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_COMMENT, COMMENT); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_DCURR_STATUS, DCURR_STATUS); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_DPREV_STATUS, DPREV_STATUS); - - if (action == AuditingActionEnum.IMPORT_RESOURCE) { - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TOSCA_NODE_TYPE, TOSCA_NODE_TYPE); - } - else { - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TOSCA_NODE_TYPE, Constants.EMPTY_STRING); - } - - return auditingFields; - } - - @Test - public void testNewCreateResourceAdminEvent() { + public void testCreateResourceAdminEvent() { AuditEventFactory factory = new AuditCreateUpdateResourceAdminEventFactory( AuditingActionEnum.CREATE_RESOURCE, @@ -181,19 +105,20 @@ public class AuditResourceAdminEventFuncTest { .requestId(REQUEST_ID) .serviceInstanceId(SERVICE_INSTANCE_ID) .build(), - ResourceAuditData.newBuilder() + new ResourceCommonInfo(RESOURCE_NAME, RESOURCE_TYPE_VFC), + ResourceVersionInfo.newBuilder() .artifactUuid(ARTIFACT_UUID) .state(PREV_RESOURCE_STATE) .version(PREV_RESOURCE_VERSION) .distributionStatus(DPREV_STATUS) .build(), - ResourceAuditData.newBuilder() + ResourceVersionInfo.newBuilder() .artifactUuid(ARTIFACT_UUID) .state(CURRENT_STATE) .version(CURRENT_VERSION) .distributionStatus(DCURR_STATUS) .build(), - RESOURCE_TYPE_VFC, RESOURCE_NAME, INVARIANT_UUID, modifier, + INVARIANT_UUID, modifier, ARTIFACT_DATA, COMMENT, DIST_ID, Constants.EMPTY_STRING); when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.CREATE_RESOURCE.getAuditingEsType()))) @@ -205,18 +130,7 @@ public class AuditResourceAdminEventFuncTest { } @Test - public void testOldCreateResourceAdminEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.CREATE_RESOURCE.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillMap(AuditingActionEnum.CREATE_RESOURCE))).isEqualTo(EXPECTED_CREATE_RESOURCE_LOG_STR + " "); - verifyResourceAdminEvent(AuditingActionEnum.CREATE_RESOURCE.getName()); - - } - - @Test - public void testNewImportResourceAdminEvent() { + public void testImportResourceAdminEvent() { Resource resource = new Resource(); resource.setName(RESOURCE_NAME); @@ -233,19 +147,20 @@ public class AuditResourceAdminEventFuncTest { .requestId(REQUEST_ID) .serviceInstanceId(SERVICE_INSTANCE_ID) .build(), - ResourceAuditData.newBuilder() + new ResourceCommonInfo(RESOURCE_NAME, RESOURCE_TYPE_VFC), + ResourceVersionInfo.newBuilder() .artifactUuid(ARTIFACT_UUID) .state(PREV_RESOURCE_STATE) .version(PREV_RESOURCE_VERSION) .distributionStatus(DPREV_STATUS) .build(), - ResourceAuditData.newBuilder() + ResourceVersionInfo.newBuilder() .artifactUuid(ARTIFACT_UUID) .state(CURRENT_STATE) .version(CURRENT_VERSION) .distributionStatus(DCURR_STATUS) .build(), - RESOURCE_TYPE_VFC, RESOURCE_NAME, INVARIANT_UUID, modifier, + INVARIANT_UUID, modifier, ARTIFACT_DATA, COMMENT, DIST_ID, TOSCA_NODE_TYPE); when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.IMPORT_RESOURCE.getAuditingEsType()))) @@ -257,18 +172,7 @@ public class AuditResourceAdminEventFuncTest { } @Test - public void testOldImportResourceAdminEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.IMPORT_RESOURCE.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillMap(AuditingActionEnum.IMPORT_RESOURCE))).isEqualTo(EXPECTED_IMPORT_RESOURCE_LOG_STR + " "); - verifyResourceAdminEvent(AuditingActionEnum.IMPORT_RESOURCE.getName()); - - } - - @Test - public void testNewArtifactUploadResourceAdminEvent() { + public void testArtifactUploadResourceAdminEvent() { AuditEventFactory factory = new AuditArtifactResourceAdminEventFactory( AuditingActionEnum.ARTIFACT_UPLOAD, @@ -278,19 +182,20 @@ public class AuditResourceAdminEventFuncTest { .requestId(REQUEST_ID) .serviceInstanceId(SERVICE_INSTANCE_ID) .build(), - ResourceAuditData.newBuilder() + new ResourceCommonInfo(RESOURCE_NAME, RESOURCE_TYPE_VFC), + ResourceVersionInfo.newBuilder() .artifactUuid(ARTIFACT_UUID) .state(PREV_RESOURCE_STATE) .version(PREV_RESOURCE_VERSION) .distributionStatus(DPREV_STATUS) .build(), - ResourceAuditData.newBuilder() + ResourceVersionInfo.newBuilder() .artifactUuid(ARTIFACT_UUID) .state(CURRENT_STATE) .version(CURRENT_VERSION) .distributionStatus(DCURR_STATUS) .build(), - RESOURCE_TYPE_VFC, RESOURCE_NAME, INVARIANT_UUID, modifier, + INVARIANT_UUID, modifier, ARTIFACT_DATA, COMMENT, DIST_ID); when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.ARTIFACT_UPLOAD.getAuditingEsType()))) @@ -302,18 +207,7 @@ public class AuditResourceAdminEventFuncTest { } @Test - public void testOldArtifactUploadResourceAdminEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.IMPORT_RESOURCE.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillMap(AuditingActionEnum.ARTIFACT_UPLOAD))).isEqualTo(EXPECTED_ARTIFACT_UPLOAD_LOG_STR + " "); - verifyResourceAdminEvent(AuditingActionEnum.ARTIFACT_UPLOAD.getName()); - - } - - @Test - public void testNewDistStateChangeRequestResourceAdminEvent() { + public void testDistStateChangeRequestResourceAdminEvent() { AuditEventFactory factory = new AuditDistStateChangeRequestResourceAdminEventFactory( CommonAuditData.newBuilder() @@ -322,19 +216,20 @@ public class AuditResourceAdminEventFuncTest { .requestId(REQUEST_ID) .serviceInstanceId(SERVICE_INSTANCE_ID) .build(), - ResourceAuditData.newBuilder() + new ResourceCommonInfo(RESOURCE_NAME, RESOURCE_TYPE_VFC), + ResourceVersionInfo.newBuilder() .artifactUuid(ARTIFACT_UUID) .state(PREV_RESOURCE_STATE) .version(PREV_RESOURCE_VERSION) .distributionStatus(DPREV_STATUS) .build(), - ResourceAuditData.newBuilder() + ResourceVersionInfo.newBuilder() .artifactUuid(ARTIFACT_UUID) .state(CURRENT_STATE) .version(CURRENT_VERSION) .distributionStatus(DCURR_STATUS) .build(), - RESOURCE_TYPE_VFC, RESOURCE_NAME, INVARIANT_UUID, modifier, + INVARIANT_UUID, modifier, ARTIFACT_DATA, COMMENT, DIST_ID); when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST.getAuditingEsType()))) @@ -346,17 +241,7 @@ public class AuditResourceAdminEventFuncTest { } @Test - public void testOldDistStateChangeRequestResourceAdminEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillMap(AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST))).isEqualTo(EXPECTED_DIST_STATE_CHANGE_REQUEST); - verifyResourceAdminEvent(AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST.getName()); - } - - @Test - public void testNewDistStateChangeApprovResourceAdminEvent() { + public void testDistStateChangeApprovResourceAdminEvent() { AuditEventFactory factory = new AuditDistStateChangeResourceAdminEventFactory( AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_APPROV, @@ -366,19 +251,20 @@ public class AuditResourceAdminEventFuncTest { .requestId(REQUEST_ID) .serviceInstanceId(SERVICE_INSTANCE_ID) .build(), - ResourceAuditData.newBuilder() + new ResourceCommonInfo(RESOURCE_NAME, RESOURCE_TYPE_VFC), + ResourceVersionInfo.newBuilder() .artifactUuid(ARTIFACT_UUID) .state(PREV_RESOURCE_STATE) .version(PREV_RESOURCE_VERSION) .distributionStatus(DPREV_STATUS) .build(), - ResourceAuditData.newBuilder() + ResourceVersionInfo.newBuilder() .artifactUuid(ARTIFACT_UUID) .state(CURRENT_STATE) .version(CURRENT_VERSION) .distributionStatus(DCURR_STATUS) .build(), - RESOURCE_TYPE_VFC, RESOURCE_NAME, INVARIANT_UUID, modifier, + INVARIANT_UUID, modifier, ARTIFACT_DATA, COMMENT, DIST_ID); when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST.getAuditingEsType()))) @@ -389,20 +275,9 @@ public class AuditResourceAdminEventFuncTest { verifyResourceAdminEvent(AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_APPROV.getName()); } - @Test - public void testOldDistStateChangeApprovResourceAdminEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_APPROV.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillMap(AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_APPROV))).isEqualTo(EXPECTED_DIST_STATE_CHANGE_APPROV); - verifyResourceAdminEvent(AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_APPROV.getName()); - } - - private void verifyResourceAdminEvent(String action) { verify(cassandraDao).saveRecord(eventCaptor.capture()); - ResourceAdminEvent storedEvent = (ResourceAdminEvent) eventCaptor.getValue(); + ResourceAdminEvent storedEvent = eventCaptor.getValue(); assertThat(storedEvent.getModifier()).isEqualTo(MODIFIER_UID); assertThat(storedEvent.getDesc()).isEqualTo(DESCRIPTION); assertThat(storedEvent.getRequestId()).isEqualTo(REQUEST_ID); |