From c465f8fac8cc8be671319fca2100e98fc4a4c13f Mon Sep 17 00:00:00 2001 From: vasraz Date: Mon, 19 Jun 2023 17:51:23 +0100 Subject: Disable DMaaP if Kafka active DMaaP healthcheck cannot succeed when using Kafka, which in turn causes distribution to fail Signed-off-by: Vasyl Razinkov Change-Id: Ia6e1e35b9a2e819e38e62caeb797342948f34e92 Issue-ID: SDC-4542 --- .../components/BaseServiceBusinessLogicTest.java | 2 +- .../be/components/ServiceDistributionBLTest.java | 2 +- .../engine/DistributionEngineConfigTest.java | 70 ++-- .../engine/DistributionEngineTest.java | 437 +++++++++++---------- .../impl/ServiceBusinessLogicBaseTestSetup.java | 2 +- .../sdc/be/components/kafka/KafkaHandlerTest.java | 61 ++- .../path/ForwardingPathBusinessLogicTest.java | 16 +- .../src/test/resources/paths/path-context.xml | 41 +- 8 files changed, 320 insertions(+), 311 deletions(-) (limited to 'catalog-be/src/test') diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/BaseServiceBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/BaseServiceBusinessLogicTest.java index c3fc69895b..638eef6898 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/BaseServiceBusinessLogicTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/BaseServiceBusinessLogicTest.java @@ -187,7 +187,7 @@ public abstract class BaseServiceBusinessLogicTest extends ComponentBusinessLogi serviceDistributionValidation, forwardingPathValidator, uiComponentDataConverter, artifactToscaOperation, componentContactIdValidator, componentNameValidator, componentTagsValidator, componentValidator, componentIconValidator, componentProjectCodeValidator, componentDescriptionValidator, - modelOperation, null, null, null, null); + modelOperation, null, null, null, null, null); bl.setUserAdmin(mockUserAdmin); bl.setGraphLockOperation(graphLockOperation); bl.setJanusGraphDao(mockJanusGraphDao); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/ServiceDistributionBLTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/ServiceDistributionBLTest.java index e2d4e0ee78..602a3bb4ce 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/ServiceDistributionBLTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/ServiceDistributionBLTest.java @@ -77,7 +77,7 @@ class ServiceDistributionBLTest extends ComponentBusinessLogicMock { artifactToscaOperation, componentContactIdValidator, componentNameValidator, componentTagsValidator, componentValidator, componentIconValidator, componentProjectCodeValidator, componentDescriptionValidator, modelOperation, null, null, - null, null); + null, null, null); private Service serviceToActivate; private ActivationRequestInformation activationRequestInformation; diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineConfigTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineConfigTest.java index a8aa7478fa..21a9b198f1 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineConfigTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineConfigTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,8 +20,12 @@ package org.openecomp.sdc.be.components.distribution.engine; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.openecomp.sdc.be.components.kafka.KafkaHandler; import org.openecomp.sdc.be.config.ConfigurationManager; import org.openecomp.sdc.be.config.DistributionEngineConfiguration; import org.openecomp.sdc.be.config.DistributionEngineConfiguration.ComponentArtifactTypesConfig; @@ -35,24 +39,30 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; -public class DistributionEngineConfigTest { +class DistributionEngineConfigTest { - @Before + @Mock + private KafkaHandler kafkaHandler; + + @BeforeEach public void setup() { + MockitoAnnotations.openMocks(this); + ExternalConfiguration.setAppName("catalog-be"); ExternalConfiguration.setConfigDir("src/test/resources/config"); ExternalConfiguration.listenForChanges(); - ConfigurationSource configurationSource = new FSConfigurationSource(ExternalConfiguration.getChangeListener(), ExternalConfiguration.getConfigDir() + File.separator + ExternalConfiguration.getAppName()); - - ConfigurationManager configurationManager = new ConfigurationManager(configurationSource); + new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), ExternalConfiguration.getConfigDir() + File.separator + ExternalConfiguration.getAppName())); } @Test - public void validateMissingEnvironments() { + void validateMissingEnvironments() { + + when(kafkaHandler.isKafkaActive()).thenReturn(false); DistributionEngineConfiguration deConfiguration = new DistributionEngineConfiguration(); @@ -60,7 +70,7 @@ public class DistributionEngineConfigTest { String uebSecretKey = "uebSecretKey"; DistributionEngine distributionEngine = new DistributionEngine(); - + distributionEngine.setKafkaHandler(kafkaHandler); List environments = new ArrayList<>(); environments.add("PROD"); deConfiguration.setEnvironments(environments); @@ -97,71 +107,71 @@ public class DistributionEngineConfigTest { deConfiguration.setInitRetryIntervalSec(3); boolean isValid = distributionEngine.validateConfiguration(deConfiguration); - assertTrue("check empty configuration", isValid); + assertTrue(isValid, "check empty configuration"); deConfiguration.setUebServers(null); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertFalse("check empty configuration", isValid); + assertFalse(isValid, "check empty configuration"); deConfiguration.setUebServers(servers); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertTrue("check empty configuration", isValid); + assertTrue(isValid, "check empty configuration"); deConfiguration.setEnvironments(null); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertFalse("check empty configuration", isValid); + assertFalse(isValid, "check empty configuration"); deConfiguration.setEnvironments(environments); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertTrue("check empty configuration", isValid); + assertTrue(isValid, "check empty configuration"); deConfiguration.setUebPublicKey(null); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertFalse("check empty configuration", isValid); + assertFalse(isValid, "check empty configuration"); deConfiguration.setUebPublicKey(uebPublicKey); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertTrue("check empty configuration", isValid); + assertTrue(isValid, "check empty configuration"); deConfiguration.setUebSecretKey(null); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertFalse("check empty configuration", isValid); + assertFalse(isValid, "check empty configuration"); deConfiguration.setUebSecretKey(uebPublicKey); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertTrue("check empty configuration", isValid); + assertTrue(isValid, "check empty configuration"); deConfiguration.setDistributionNotifTopicName(null); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertFalse("check empty configuration", isValid); + assertFalse(isValid, "check empty configuration"); deConfiguration.setDistributionNotifTopicName(uebPublicKey); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertTrue("check empty configuration", isValid); + assertTrue(isValid, "check empty configuration"); deConfiguration.setDistributionStatusTopicName(null); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertFalse("check empty configuration", isValid); + assertFalse(isValid, "check empty configuration"); deConfiguration.setDistributionStatusTopicName(uebPublicKey); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertTrue("check empty configuration", isValid); + assertTrue(isValid, "check empty configuration"); deConfiguration.setInitMaxIntervalSec(null); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertFalse("check empty configuration", isValid); + assertFalse(isValid, "check empty configuration"); deConfiguration.setInitMaxIntervalSec(8); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertTrue("check empty configuration", isValid); + assertTrue(isValid, "check empty configuration"); deConfiguration.setInitRetryIntervalSec(null); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertFalse("check empty configuration", isValid); + assertFalse(isValid, "check empty configuration"); deConfiguration.setInitRetryIntervalSec(8); isValid = distributionEngine.validateConfiguration(deConfiguration); - assertTrue("check empty configuration", isValid); + assertTrue(isValid, "check empty configuration"); } diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineTest.java index 3e70a3229f..c5d8d37d39 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,17 +21,16 @@ package org.openecomp.sdc.be.components.distribution.engine; import mockit.Deencapsulation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.openecomp.sdc.be.components.kafka.KafkaHandler; import org.openecomp.sdc.be.components.utils.OperationalEnvironmentBuilder; import org.openecomp.sdc.be.config.Configuration; import org.openecomp.sdc.be.config.DistributionEngineConfiguration; -import org.openecomp.sdc.be.config.DistributionEngineConfiguration.DistributionStatusTopicConfig; import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.model.Service; import org.openecomp.sdc.be.model.User; @@ -46,68 +45,69 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; -public class DistributionEngineTest{ +public class DistributionEngineTest { - public static final String DISTRIBUTION_ID = "distId"; - public static final String ENV_ID = "envId"; - public static final String USER_ID = "userId"; - public static final String MODIFIER = "modifier"; + public static final String DISTRIBUTION_ID = "distId"; + public static final String ENV_ID = "envId"; + public static final String USER_ID = "userId"; + public static final String MODIFIER = "modifier"; - @InjectMocks - private DistributionEngine testInstance; + @InjectMocks + private DistributionEngine testInstance; - @Mock - private EnvironmentsEngine environmentsEngine; + @Mock + private EnvironmentsEngine environmentsEngine; + @Mock + private KafkaHandler kafkaHandler; + @Mock + private DistributionNotificationSender distributionNotificationSender; + @Mock + private ServiceDistributionArtifactsBuilder serviceDistributionArtifactsBuilder; - @Mock - private DistributionNotificationSender distributionNotificationSender; - - @Mock - private ServiceDistributionArtifactsBuilder serviceDistributionArtifactsBuilder; - - private DummyDistributionConfigurationManager distributionEngineConfigurationMock; + private DummyDistributionConfigurationManager distributionEngineConfigurationMock; - private Map envs; + private Map envs; private User modifier = new User(); private Configuration.EnvironmentContext environmentContext = mock(Configuration.EnvironmentContext.class); - @Before - public void setUpMock() throws Exception { - MockitoAnnotations.openMocks(this); - distributionEngineConfigurationMock = new DummyDistributionConfigurationManager(); - envs = getEnvs(ENV_ID); + @BeforeEach + public void setUpMock() throws Exception { + MockitoAnnotations.openMocks(this); + distributionEngineConfigurationMock = new DummyDistributionConfigurationManager(); + envs = getEnvs(ENV_ID); modifier.setUserId(USER_ID); modifier.setFirstName(MODIFIER); modifier.setLastName(MODIFIER); when(environmentContext.getDefaultValue()).thenReturn("General_Revenue-Bearing"); when(distributionEngineConfigurationMock.getConfiguration().getEnvironmentContext()) - .thenReturn(environmentContext); - } + .thenReturn(environmentContext); + } @Test - public void notifyService() throws Exception { + void notifyService() throws Exception { NotificationDataImpl notificationData = new NotificationDataImpl(); Service service = new Service(); when(environmentsEngine.getEnvironmentById(ENV_ID)).thenReturn(envs.get(ENV_ID)); when(distributionEngineConfigurationMock.getConfigurationMock().getDistributionNotifTopicName()).thenReturn("topic"); when(distributionNotificationSender.sendNotification(eq("topic-ENVID"), eq(DISTRIBUTION_ID), any(EnvironmentMessageBusData.class), any(NotificationDataImpl.class), any(Service.class), any(User.class))) - .thenReturn(ActionStatus.OK); + .thenReturn(ActionStatus.OK); ActionStatus actionStatus = testInstance.notifyService(DISTRIBUTION_ID, service, notificationData, ENV_ID, modifier); assertEquals(ActionStatus.OK, actionStatus); } @Test - public void notifyService_couldNotResolveEnvironment() throws Exception { + void notifyService_couldNotResolveEnvironment() throws Exception { when(environmentsEngine.getEnvironments()).thenReturn(envs); ActionStatus actionStatus = testInstance.notifyService(DISTRIBUTION_ID, new Service(), new NotificationDataImpl(), "someNonExisitngEnv", modifier); assertEquals(ActionStatus.DISTRIBUTION_ENVIRONMENT_NOT_AVAILABLE, actionStatus); @@ -115,7 +115,7 @@ public class DistributionEngineTest{ } @Test - public void notifyService_failedWhileSendingNotification() throws Exception { + void notifyService_failedWhileSendingNotification() throws Exception { NotificationDataImpl notificationData = new NotificationDataImpl(); Service service = new Service(); when(environmentsEngine.getEnvironmentById(ENV_ID)).thenReturn(envs.get(ENV_ID)); @@ -127,157 +127,160 @@ public class DistributionEngineTest{ assertEquals(ActionStatus.GENERAL_ERROR, actionStatus); } - private Map getEnvs(String... environmentIds) { - Set uebAddress = new HashSet<>(); - uebAddress.add("someAddress"); - return Stream.of(environmentIds) - .map(id -> new OperationalEnvironmentBuilder().setEnvId(id).setDmaapUebAddress(uebAddress).build()) - .collect(Collectors.toMap(OperationalEnvironmentEntry::getEnvironmentId, Function.identity())); - } + private Map getEnvs(String... environmentIds) { + Set uebAddress = new HashSet<>(); + uebAddress.add("someAddress"); + return Stream.of(environmentIds) + .map(id -> new OperationalEnvironmentBuilder().setEnvId(id).setDmaapUebAddress(uebAddress).build()) + .collect(Collectors.toMap(OperationalEnvironmentEntry::getEnvironmentId, Function.identity())); + } - private DistributionEngine createTestSubject() { - return new DistributionEngine(); - } + private DistributionEngine createTestSubject() { + return new DistributionEngine(); + } - @Test(expected=NullPointerException.class) - public void testInit() throws Exception { - DistributionEngine testSubject; + @Test + public void testInit() throws Exception { + DistributionEngine testSubject; - // default test - testSubject = createTestSubject(); - Deencapsulation.invoke(testSubject, "init"); - } + // default test + testSubject = createTestSubject(); + assertThrows(NullPointerException.class, () -> Deencapsulation.invoke(testSubject, "init")); + } - @Test - public void testShutdown() throws Exception { - DistributionEngine testSubject; + @Test + void testShutdown() throws Exception { + DistributionEngine testSubject; - // default test - testSubject = createTestSubject(); - testSubject.shutdown(); - } + // default test + testSubject = createTestSubject(); + testSubject.shutdown(); + } - @Test - public void testValidateConfiguration() throws Exception { - DistributionEngine testSubject; + @Test + void testValidateConfiguration() throws Exception { + when(kafkaHandler.isKafkaActive()).thenReturn(false); + + DistributionEngine testSubject; DistributionEngineConfiguration deConfiguration = new DistributionEngineConfiguration(); - deConfiguration.setDistributionStatusTopic((new DistributionStatusTopicConfig())); + deConfiguration.setDistributionStatusTopic((new DistributionEngineConfiguration.DistributionStatusTopicConfig())); boolean result; // default test testSubject = createTestSubject(); + testSubject.setKafkaHandler(kafkaHandler); result = Deencapsulation.invoke(testSubject, "validateConfiguration", deConfiguration); - } - - @Test - public void testIsValidServers() throws Exception { - DistributionEngine testSubject; - List uebServers = null; - String methodName = ""; - String paramName = ""; - boolean result; - - // test 1 - testSubject = createTestSubject(); - uebServers = null; - result = Deencapsulation.invoke(testSubject, "isValidServers", - new Object[] { List.class, methodName, paramName }); - Assert.assertEquals(false, result); - } - - @Test - public void testIsValidFqdn() throws Exception { - DistributionEngine testSubject; - String serverFqdn = ""; - boolean result; - - // default test - testSubject = createTestSubject(); - result = Deencapsulation.invoke(testSubject, "isValidFqdn", new Object[] { serverFqdn }); - } - - @Test - public void testIsValidParam() throws Exception { - DistributionEngine testSubject; - String paramValue = ""; - String methodName = ""; - String paramName = ""; - boolean result; - - // default test - testSubject = createTestSubject(); - result = Deencapsulation.invoke(testSubject, "isValidParam", - new Object[] { paramValue, methodName, paramName }); - } + } - @Test - public void testIsValidParam_1() throws Exception { - DistributionEngine testSubject; - List paramValue = null; - String methodName = ""; - String paramName = ""; - boolean result; + @Test + void testIsValidServers() throws Exception { + DistributionEngine testSubject; + List uebServers = null; + String methodName = ""; + String paramName = ""; + boolean result; + + // test 1 + testSubject = createTestSubject(); + uebServers = null; + result = Deencapsulation.invoke(testSubject, "isValidServers", + new Object[]{List.class, methodName, paramName}); + assertEquals(false, result); + } - // default test - testSubject = createTestSubject(); - result = Deencapsulation.invoke(testSubject, "isValidParam", - new Object[] { List.class, methodName, paramName }); - } + @Test + void testIsValidFqdn() throws Exception { + DistributionEngine testSubject; + String serverFqdn = ""; + boolean result; + + // default test + testSubject = createTestSubject(); + result = Deencapsulation.invoke(testSubject, "isValidFqdn", new Object[]{serverFqdn}); + } - @Test - public void testIsValidObject() throws Exception { - DistributionEngine testSubject; - Object paramValue = null; - String methodName = ""; - String paramName = ""; - boolean result; + @Test + void testIsValidParam() throws Exception { + DistributionEngine testSubject; + String paramValue = ""; + String methodName = ""; + String paramName = ""; + boolean result; + + // default test + testSubject = createTestSubject(); + result = Deencapsulation.invoke(testSubject, "isValidParam", + new Object[]{paramValue, methodName, paramName}); + } - // test 1 - testSubject = createTestSubject(); - paramValue = null; - result = Deencapsulation.invoke(testSubject, "isValidObject", - new Object[] { Object.class, methodName, paramName }); - Assert.assertEquals(false, result); - } - - @Test - public void testGetEnvironmentErrorDescription() throws Exception { - DistributionEngine testSubject; - StorageOperationStatus status = null; - String result; + @Test + void testIsValidParam_1() throws Exception { + DistributionEngine testSubject; + List paramValue = null; + String methodName = ""; + String paramName = ""; + boolean result; + + // default test + testSubject = createTestSubject(); + result = Deencapsulation.invoke(testSubject, "isValidParam", + new Object[]{List.class, methodName, paramName}); + } - // default test - testSubject = createTestSubject(); - result = Deencapsulation.invoke(testSubject, "getEnvironmentErrorDescription", - StorageOperationStatus.DISTR_ENVIRONMENT_NOT_AVAILABLE); - result = Deencapsulation.invoke(testSubject, "getEnvironmentErrorDescription", - StorageOperationStatus.DISTR_ENVIRONMENT_NOT_FOUND); - result = Deencapsulation.invoke(testSubject, "getEnvironmentErrorDescription", - StorageOperationStatus.DISTR_ENVIRONMENT_SENT_IS_INVALID); - result = Deencapsulation.invoke(testSubject, "getEnvironmentErrorDescription", - StorageOperationStatus.ARTIFACT_NOT_FOUND); - } - - @Test - public void testIsEnvironmentAvailable() throws Exception { - DistributionEngine testSubject; - String envName = ""; - StorageOperationStatus result; + @Test + void testIsValidObject() throws Exception { + DistributionEngine testSubject; + Object paramValue = null; + String methodName = ""; + String paramName = ""; + boolean result; + + // test 1 + testSubject = createTestSubject(); + paramValue = null; + result = Deencapsulation.invoke(testSubject, "isValidObject", + new Object[]{Object.class, methodName, paramName}); + assertEquals(false, result); + } - // test 1 - testSubject = createTestSubject(); - envName = null; - result = testSubject.isEnvironmentAvailable(envName); - Assert.assertEquals(StorageOperationStatus.DISTR_ENVIRONMENT_SENT_IS_INVALID, result); + @Test + void testGetEnvironmentErrorDescription() throws Exception { + DistributionEngine testSubject; + StorageOperationStatus status = null; + String result; + + // default test + testSubject = createTestSubject(); + result = Deencapsulation.invoke(testSubject, "getEnvironmentErrorDescription", + StorageOperationStatus.DISTR_ENVIRONMENT_NOT_AVAILABLE); + result = Deencapsulation.invoke(testSubject, "getEnvironmentErrorDescription", + StorageOperationStatus.DISTR_ENVIRONMENT_NOT_FOUND); + result = Deencapsulation.invoke(testSubject, "getEnvironmentErrorDescription", + StorageOperationStatus.DISTR_ENVIRONMENT_SENT_IS_INVALID); + result = Deencapsulation.invoke(testSubject, "getEnvironmentErrorDescription", + StorageOperationStatus.ARTIFACT_NOT_FOUND); + } - // test 2 - testSubject = createTestSubject(); - envName = "mock"; - result = testSubject.isEnvironmentAvailable(envName); - Assert.assertEquals(StorageOperationStatus.DISTR_ENVIRONMENT_NOT_FOUND, result); - } + @Test + void testIsEnvironmentAvailable() throws Exception { + DistributionEngine testSubject; + String envName = ""; + StorageOperationStatus result; + + // test 1 + testSubject = createTestSubject(); + envName = null; + result = testSubject.isEnvironmentAvailable(envName); + assertEquals(StorageOperationStatus.DISTR_ENVIRONMENT_SENT_IS_INVALID, result); + + // test 2 + testSubject = createTestSubject(); + envName = "mock"; + result = testSubject.isEnvironmentAvailable(envName); + assertEquals(StorageOperationStatus.DISTR_ENVIRONMENT_NOT_FOUND, result); + } - //TODO Create test coverage for this method + //TODO Create test coverage for this method /*@Test public void testIsEnvironmentAvailable_1() throws Exception { DistributionEngine testSubject; @@ -288,61 +291,61 @@ public class DistributionEngineTest{ result = testInstance.isEnvironmentAvailable(); }*/ - @Test(expected=NullPointerException.class) - public void testDisableEnvironment() throws Exception { - DistributionEngine testSubject; - String envName = ""; - - // default test - testSubject = createTestSubject(); - testSubject.disableEnvironment(envName); - } - - @Test - public void testBuildTopicName() throws Exception { - DistributionEngine testSubject; - String envName = ""; - String result; - - // default test - testSubject = createTestSubject(); - result = Deencapsulation.invoke(testSubject, "buildTopicName", new Object[] { envName }); - } - - @Test - public void testIsReadyForDistribution() throws Exception { - DistributionEngine testSubject; - Service service = null; - String envName = ""; - StorageOperationStatus result; + @Test + void testDisableEnvironment() throws Exception { + DistributionEngine testSubject; + String envName = ""; - // default test - testSubject = createTestSubject(); - result = testSubject.isReadyForDistribution(envName); - } + // default test + testSubject = createTestSubject(); + assertThrows(NullPointerException.class, () -> testSubject.disableEnvironment(envName)); + } + @Test + void testBuildTopicName() throws Exception { + DistributionEngine testSubject; + String envName = ""; + String result; + + // default test + testSubject = createTestSubject(); + result = Deencapsulation.invoke(testSubject, "buildTopicName", new Object[]{envName}); + } - @Test - public void testGetEnvironmentById() throws Exception { - DistributionEngine testSubject; - String opEnvId = ""; - OperationalEnvironmentEntry result; + @Test + void testIsReadyForDistribution() throws Exception { + DistributionEngine testSubject; + Service service = null; + String envName = ""; + StorageOperationStatus result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isReadyForDistribution(envName); + } - // default test - when(environmentsEngine.getEnvironmentById(ArgumentMatchers.anyString())).thenReturn(new OperationalEnvironmentEntry()); - result = testInstance.getEnvironmentById(opEnvId); - } - @Test - public void testBuildServiceForDistribution() throws Exception { - Service service = new Service(); - String distributionId = ""; - String workloadContext = ""; - INotificationData result; + @Test + void testGetEnvironmentById() throws Exception { + DistributionEngine testSubject; + String opEnvId = ""; + OperationalEnvironmentEntry result; + + // default test + when(environmentsEngine.getEnvironmentById(ArgumentMatchers.anyString())).thenReturn(new OperationalEnvironmentEntry()); + result = testInstance.getEnvironmentById(opEnvId); + } - // default test - //testSubject = createTestSubject(); - when(serviceDistributionArtifactsBuilder.buildResourceInstanceForDistribution(ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any())).thenReturn(new NotificationDataImpl()); - result = testInstance.buildServiceForDistribution(service, distributionId, workloadContext); - } + @Test + void testBuildServiceForDistribution() throws Exception { + Service service = new Service(); + String distributionId = ""; + String workloadContext = ""; + INotificationData result; + + // default test + //testSubject = createTestSubject(); + when(serviceDistributionArtifactsBuilder.buildResourceInstanceForDistribution(ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any())).thenReturn(new NotificationDataImpl()); + result = testInstance.buildServiceForDistribution(service, distributionId, workloadContext); + } } diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogicBaseTestSetup.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogicBaseTestSetup.java index cc6f676618..049f8a5541 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogicBaseTestSetup.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogicBaseTestSetup.java @@ -204,7 +204,7 @@ class ServiceBusinessLogicBaseTestSetup extends BaseBusinessLogicMock { interfaceLifecycleTypeOperation, artifactBl, distributionEngine, componentInstanceBusinessLogic, serviceDistributionValidation, forwardingPathValidator, uiComponentDataConverter, artifactToscaOperation, componentContactIdValidator, componentNameValidator, componentTagsValidator, componentValidator, componentIconValidator, componentProjectCodeValidator, componentDescriptionValidator, - modelOperation, serviceRoleValidator, serviceInstantiationTypeValidator, serviceCategoryValidator, serviceValidator); + modelOperation, serviceRoleValidator, serviceInstantiationTypeValidator, serviceCategoryValidator, serviceValidator, null); bl.setComponentContactIdValidator(componentContactIdValidator); bl.setComponentIconValidator(componentIconValidator); bl.setComponentTagsValidator(componentTagsValidator); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/kafka/KafkaHandlerTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/kafka/KafkaHandlerTest.java index 91ee0235ad..ecdd75092b 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/kafka/KafkaHandlerTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/kafka/KafkaHandlerTest.java @@ -19,33 +19,31 @@ */ package org.openecomp.sdc.be.components.kafka; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.when; - import com.google.gson.JsonSyntaxException; +import fj.data.Either; import org.apache.kafka.common.KafkaException; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.junit.jupiter.MockitoExtension; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; - -import java.util.ArrayList; -import fj.data.Either; -import java.util.List; - +import org.mockito.junit.jupiter.MockitoExtension; import org.openecomp.sdc.be.components.distribution.engine.CambriaErrorResponse; -import org.openecomp.sdc.be.components.distribution.engine.NotificationDataImpl; import org.openecomp.sdc.be.components.distribution.engine.INotificationData; +import org.openecomp.sdc.be.components.distribution.engine.NotificationDataImpl; import org.openecomp.sdc.be.distribution.api.client.CambriaOperationStatus; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) -public class KafkaHandlerTest { +class KafkaHandlerTest { @Mock private SdcKafkaConsumer mockSdcKafkaConsumer; @@ -55,26 +53,28 @@ public class KafkaHandlerTest { private KafkaHandler kafkaHandler; + @BeforeEach + void setup() { + kafkaHandler = new KafkaHandler(mockSdcKafkaConsumer, mockSdcKafkaProducer, true); + } + @Test - public void testIsKafkaActiveTrue(){ - KafkaHandler kafkaHandler = new KafkaHandler(mockSdcKafkaConsumer, mockSdcKafkaProducer, true); + void testIsKafkaActiveTrue() { assertTrue(kafkaHandler.isKafkaActive()); } @Test - public void testIsKafkaActiveFalse(){ - KafkaHandler kafkaHandler = new KafkaHandler(mockSdcKafkaConsumer, mockSdcKafkaProducer, true); + void testIsKafkaActiveFalse() { kafkaHandler.setKafkaActive(false); assertFalse(kafkaHandler.isKafkaActive()); } @Test - public void testFetchFromTopicSuccess(){ + void testFetchFromTopicSuccess() { String testTopic = "testTopic"; List mockedReturnedMessages = new ArrayList<>(); mockedReturnedMessages.add("message1"); mockedReturnedMessages.add("message2"); - KafkaHandler kafkaHandler = new KafkaHandler(mockSdcKafkaConsumer, mockSdcKafkaProducer, true); when(mockSdcKafkaConsumer.poll(any())).thenReturn(mockedReturnedMessages); Either, CambriaErrorResponse> response = kafkaHandler.fetchFromTopic(testTopic); Iterable actualReturnedMessages = response.left().value(); @@ -83,9 +83,8 @@ public class KafkaHandlerTest { } @Test - public void testFetchFromTopicFail(){ + void testFetchFromTopicFail() { String testTopic = "testTopic"; - KafkaHandler kafkaHandler = new KafkaHandler(mockSdcKafkaConsumer, mockSdcKafkaProducer, true); when(mockSdcKafkaConsumer.poll(any())).thenThrow(new KafkaException()); Either, CambriaErrorResponse> response = kafkaHandler.fetchFromTopic(testTopic); CambriaErrorResponse responseValue = response.right().value(); @@ -94,9 +93,8 @@ public class KafkaHandlerTest { } @Test - public void testSendNotificationSuccess(){ + void testSendNotificationSuccess() { String testTopic = "testTopic"; - KafkaHandler kafkaHandler = new KafkaHandler(mockSdcKafkaConsumer, mockSdcKafkaProducer, true); INotificationData testData = new NotificationDataImpl(); CambriaErrorResponse response = kafkaHandler.sendNotification(testTopic, testData); assertEquals(response.getOperationStatus(), CambriaOperationStatus.OK); @@ -104,9 +102,8 @@ public class KafkaHandlerTest { } @Test - public void testSendNotificationKafkaException(){ + void testSendNotificationKafkaException() { String testTopic = "testTopic"; - KafkaHandler kafkaHandler = new KafkaHandler(mockSdcKafkaConsumer, mockSdcKafkaProducer, true); INotificationData testData = new NotificationDataImpl(); doThrow(KafkaException.class).when(mockSdcKafkaProducer).send(any(), any()); CambriaErrorResponse response = kafkaHandler.sendNotification(testTopic, testData); @@ -115,9 +112,8 @@ public class KafkaHandlerTest { } @Test - public void testSendNotificationJsonSyntaxException(){ + void testSendNotificationJsonSyntaxException() { String testTopic = "testTopic"; - KafkaHandler kafkaHandler = new KafkaHandler(mockSdcKafkaConsumer, mockSdcKafkaProducer, true); INotificationData testData = new NotificationDataImpl(); doThrow(JsonSyntaxException.class).when(mockSdcKafkaProducer).send(any(), any()); CambriaErrorResponse response = kafkaHandler.sendNotification(testTopic, testData); @@ -126,9 +122,8 @@ public class KafkaHandlerTest { } @Test - public void testSendNotificationFlushException(){ + void testSendNotificationFlushException() { String testTopic = "testTopic"; - KafkaHandler kafkaHandler = new KafkaHandler(mockSdcKafkaConsumer, mockSdcKafkaProducer, true); INotificationData testData = new NotificationDataImpl(); doThrow(KafkaException.class).when(mockSdcKafkaProducer).flush(); CambriaErrorResponse response = kafkaHandler.sendNotification(testTopic, testData); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/ForwardingPathBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/ForwardingPathBusinessLogicTest.java index 926522ecdc..2b4e90ffe9 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/ForwardingPathBusinessLogicTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/ForwardingPathBusinessLogicTest.java @@ -43,16 +43,16 @@ import org.openecomp.sdc.exception.ResponseFormat; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @SpringJUnitConfig(locations = "classpath:paths/path-context.xml") -public class ForwardingPathBusinessLogicTest extends BaseForwardingPathTest { +class ForwardingPathBusinessLogicTest extends BaseForwardingPathTest { @BeforeAll static void setup() { configurationManager = - new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be")); + new ConfigurationManager(new FSConfigurationSource(ExternalConfiguration.getChangeListener(), "src/test/resources/config/catalog-be")); } @Test - public void shouldFailToUpdateForwardingPathSincePathDoesNotExist() { + void shouldFailToUpdateForwardingPathSincePathDoesNotExist() { Assertions.assertThrows(ComponentException.class, () -> { Service service = initForwardPath(); bl.updateForwardingPath(FORWARDING_PATH_ID, service, user, true); @@ -60,7 +60,7 @@ public class ForwardingPathBusinessLogicTest extends BaseForwardingPathTest { } @Test - public void shouldFailToDeleteForwardingPathSincePathDoesNotExist() { + void shouldFailToDeleteForwardingPathSincePathDoesNotExist() { Assertions.assertThrows(ComponentException.class, () -> { initForwardPath(); bl.deleteForwardingPaths("delete_forward_test", Sets.newHashSet(FORWARDING_PATH_ID), user, true); @@ -68,7 +68,7 @@ public class ForwardingPathBusinessLogicTest extends BaseForwardingPathTest { } @Test - public void shouldSucceedCreateAndDeleteForwardingPath() { + void shouldSucceedCreateAndDeleteForwardingPath() { Service createdService = createService(); Service service = initForwardPath(); assertNotNull(service); @@ -81,7 +81,7 @@ public class ForwardingPathBusinessLogicTest extends BaseForwardingPathTest { // should return the created path Either uiResaponse = bl.getComponentDataFilteredByParams(createdService.getUniqueId(), user, - Lists.newArrayList(ComponentFieldsEnum.FORWARDING_PATHS.getValue())); + Lists.newArrayList(ComponentFieldsEnum.FORWARDING_PATHS.getValue())); assertTrue(uiResaponse.isLeft()); UiServiceDataTransfer uiServiceDataTransfer = (UiServiceDataTransfer) uiResaponse.left().value(); Map forwardingPaths = uiServiceDataTransfer.getForwardingPaths(); @@ -104,7 +104,7 @@ public class ForwardingPathBusinessLogicTest extends BaseForwardingPathTest { // make sure changes were applied uiResaponse = bl.getComponentDataFilteredByParams(createdService.getUniqueId(), user, - Lists.newArrayList(ComponentFieldsEnum.FORWARDING_PATHS.getValue())); + Lists.newArrayList(ComponentFieldsEnum.FORWARDING_PATHS.getValue())); assertTrue(uiResaponse.isLeft()); uiServiceDataTransfer = (UiServiceDataTransfer) uiResaponse.left().value(); Map forwardingPathsUpdated = uiServiceDataTransfer.getForwardingPaths(); @@ -119,7 +119,7 @@ public class ForwardingPathBusinessLogicTest extends BaseForwardingPathTest { // nothing to return now uiResaponse = bl.getComponentDataFilteredByParams(createdService.getUniqueId(), user, - Lists.newArrayList(ComponentFieldsEnum.COMPONENT_INSTANCES.getValue(), ComponentFieldsEnum.FORWARDING_PATHS.getValue())); + Lists.newArrayList(ComponentFieldsEnum.COMPONENT_INSTANCES.getValue(), ComponentFieldsEnum.FORWARDING_PATHS.getValue())); assertTrue(uiResaponse.isLeft()); uiServiceDataTransfer = (UiServiceDataTransfer) uiResaponse.left().value(); forwardingPaths = uiServiceDataTransfer.getForwardingPaths(); diff --git a/catalog-be/src/test/resources/paths/path-context.xml b/catalog-be/src/test/resources/paths/path-context.xml index 53e8b8c74b..c32f32b365 100644 --- a/catalog-be/src/test/resources/paths/path-context.xml +++ b/catalog-be/src/test/resources/paths/path-context.xml @@ -21,49 +21,49 @@ Modifications copyright (c) 2018 Nokia ================================================================================ --> + id="tosca-operation-facade"/> + id="janusgraph-client"/> + id="artifact-cassandra-dao"/> + id="audit-cassandra-dao"/> + id="feature_toggle_dao"/> + id="operational-environment-dao"/> + id="sdc-schema-files-cassandra-dao"/> + id="tosca-model-import-cassandra-dao"/> + id="onboarding-client"/> + id="lifecycleBusinessLogic"/> + id="distributionEngine"/> + id="forwardingPathValidator"/> - + id="attributeDeclarationOrchestrator"/> + + -- cgit 1.2.3-korg