re base code

[sdc.git] / catalog-be / src / test / java / org / openecomp / sdc / be / auditing / impl / ecompopenv / AuditEcompOpEnvEventTest.java

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/ecompopenv/AuditEcompOpEnvEventTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/ecompopenv/AuditEcompOpEnvEventTest.java
index 8dd6680..95beb9c 100644 (file)
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/ecompopenv/AuditEcompOpEnvEventTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/ecompopenv/AuditEcompOpEnvEventTest.java
@@ -1,23 +1,5 @@
 package org.openecomp.sdc.be.auditing.impl.ecompopenv;
 
-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.EXPECTED_CREATE_OP_ENV_LOG_STR;
-import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_UNKNOWN_NOTIFICATION_OP_ENV_LOG_STR;
-import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_UNSUPPORTED_TYPE_OP_ENV_LOG_STR;
-import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.OP_ENV_ACTION;
-import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.OP_ENV_ID;
-import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.OP_ENV_NAME;
-import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.OP_ENV_TYPE;
-import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.TENANT_CONTEXT;
-import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.init;
-
-import java.util.EnumMap;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,7 +18,13 @@ import org.openecomp.sdc.be.dao.impl.AuditingDao;
 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.EcompOperationalEnvironmentEvent;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
+
+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 AuditEcompOpEnvEventTest {
@@ -51,7 +39,7 @@ public class AuditEcompOpEnvEventTest {
     private static Configuration.ElasticSearchConfig esConfig;
 
     @Captor
-    private ArgumentCaptor<AuditingGenericEvent> eventCaptor;
+    private ArgumentCaptor<EcompOperationalEnvironmentEvent> eventCaptor;
 
     @Before
     public void setUp() {
@@ -60,7 +48,7 @@ public class AuditEcompOpEnvEventTest {
     }
 
     @Test
-    public void testNewCreateOpEnvEvent() {
+    public void testCreateOpEnvEvent() {
         AuditEventFactory factory = new AuditEcompOpEnvEventFactory(AuditingActionEnum.CREATE_ENVIRONMENT,
                 OP_ENV_ID, OP_ENV_NAME, OP_ENV_TYPE, OP_ENV_ACTION, TENANT_CONTEXT);
 
@@ -73,18 +61,7 @@ public class AuditEcompOpEnvEventTest {
     }
 
     @Test
-    public void testOldCreateOpEnvEvent() {
-        when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.CREATE_ENVIRONMENT.getAuditingEsType())))
-                .thenReturn(ActionStatus.OK);
-        when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK);
-
-        assertThat(auditingManager.auditEvent(fillMap(AuditingActionEnum.CREATE_ENVIRONMENT))).isEqualTo(EXPECTED_CREATE_OP_ENV_LOG_STR);
-        verifyEvent(AuditingActionEnum.CREATE_ENVIRONMENT.getName());
-
-    }
-
-    @Test
-    public void testNewUnsupportedTypeOpEnvEvent() {
+    public void testUnsupportedTypeOpEnvEvent() {
         AuditEventFactory factory = new AuditEcompOpEnvEventFactory(AuditingActionEnum.UNSUPPORTED_ENVIRONMENT_TYPE,
                 OP_ENV_ID, OP_ENV_NAME, OP_ENV_TYPE, OP_ENV_ACTION, TENANT_CONTEXT);
 
@@ -97,17 +74,7 @@ public class AuditEcompOpEnvEventTest {
     }
 
     @Test
-    public void testOldUnsupportedTypeOpEnvEvent() {
-        when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.UNSUPPORTED_ENVIRONMENT_TYPE.getAuditingEsType())))
-                .thenReturn(ActionStatus.OK);
-        when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK);
-
-        assertThat(auditingManager.auditEvent(fillMap(AuditingActionEnum.UNSUPPORTED_ENVIRONMENT_TYPE))).isEqualTo(EXPECTED_UNSUPPORTED_TYPE_OP_ENV_LOG_STR);
-        verifyEvent(AuditingActionEnum.UNSUPPORTED_ENVIRONMENT_TYPE.getName());
-    }
-
-    @Test
-    public void testNewUnknownNotificationOpEnvEvent() {
+    public void testUnknownNotificationOpEnvEvent() {
         AuditEventFactory factory = new AuditEcompOpEnvEventFactory(AuditingActionEnum.UNKNOWN_ENVIRONMENT_NOTIFICATION,
                 OP_ENV_ID, OP_ENV_NAME, OP_ENV_TYPE, OP_ENV_ACTION, TENANT_CONTEXT);
 
@@ -119,38 +86,14 @@ public class AuditEcompOpEnvEventTest {
         verifyEvent(AuditingActionEnum.UNKNOWN_ENVIRONMENT_NOTIFICATION.getName());
     }
 
-    @Test
-    public void testOldUnknownNotificationOpEnvEvent() {
-        when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.UNSUPPORTED_ENVIRONMENT_TYPE.getAuditingEsType())))
-                .thenReturn(ActionStatus.OK);
-        when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK);
-
-        assertThat(auditingManager.auditEvent(fillMap(AuditingActionEnum.UNKNOWN_ENVIRONMENT_NOTIFICATION))).isEqualTo(EXPECTED_UNKNOWN_NOTIFICATION_OP_ENV_LOG_STR);
-        verifyEvent(AuditingActionEnum.UNKNOWN_ENVIRONMENT_NOTIFICATION.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_OPERATIONAL_ENVIRONMENT_ID, OP_ENV_ID);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_TYPE, OP_ENV_TYPE);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_NAME, OP_ENV_NAME);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_ACTION, OP_ENV_ACTION);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_TENANT_CONTEXT, TENANT_CONTEXT);
-
-        return auditingFields;
-    }
-
     private void verifyEvent(String action) {
         verify(cassandraDao).saveRecord(eventCaptor.capture());
-        EcompOperationalEnvironmentEvent storedEvent = (EcompOperationalEnvironmentEvent) eventCaptor.getValue();
+        EcompOperationalEnvironmentEvent storedEvent = eventCaptor.getValue();
         assertThat(storedEvent.getAction()).isEqualTo(action);
         assertThat(storedEvent.getOperationalEnvironmentId()).isEqualTo(OP_ENV_ID);
         assertThat(storedEvent.getOperationalEnvironmentName()).isEqualTo(OP_ENV_NAME);
         assertThat(storedEvent.getOperationalEnvironmentType()).isEqualTo(OP_ENV_TYPE);
         assertThat(storedEvent.getTenantContext()).isEqualTo(TENANT_CONTEXT);
-
-
     }
 
 }