aboutsummaryrefslogtreecommitdiffstats
path: root/runtime-acm/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'runtime-acm/src/test')
-rw-r--r--runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java12
-rw-r--r--runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/main/utils/EncryptionUtilTest.java37
-rw-r--r--runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionAcHandlerTest.java42
-rw-r--r--runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandlerTest.java33
-rw-r--r--runtime-acm/src/test/resources/providers/AcInstantiateEncryptTest.json8
5 files changed, 83 insertions, 49 deletions
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java
index d53f700f6..a3d11b5f3 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProviderTest.java
@@ -187,6 +187,7 @@ class AutomationCompositionInstantiationProviderTest {
var instantiationProvider = new AutomationCompositionInstantiationProvider(acProvider, acDefinitionProvider,
new AcInstanceStateResolver(), supervisionAcHandler, participantProvider,
CommonTestData.getTestParamaterGroup(), encryptionUtils);
+
var instantiationResponse = instantiationProvider.updateAutomationComposition(
automationCompositionUpdate.getCompositionId(), automationCompositionUpdate);
@@ -200,9 +201,12 @@ class AutomationCompositionInstantiationProviderTest {
element.setId(UUID.randomUUID());
automationCompositionUpdate.getElements().put(element.getId(), element);
}
+ acmFromDb.getElements().values().forEach(element -> element.setDeployState(DeployState.DEPLOYED));
+ acmFromDb.setDeployState(DeployState.DEPLOYED);
assertThatThrownBy(
- () -> instantiationProvider.updateAutomationComposition(compositionId, automationCompositionUpdate))
- .hasMessageStartingWith("Element id not present ");
+ () -> instantiationProvider.updateAutomationComposition(compositionId, automationCompositionUpdate))
+ .hasMessageStartingWith("Element id not present ");
+
}
@Test
@@ -302,7 +306,7 @@ class AutomationCompositionInstantiationProviderTest {
var instantiationResponse = instantiationProvider.updateAutomationComposition(compositionId,
automationCompositionTarget);
- verify(supervisionAcHandler).migrate(any(), any());
+ verify(supervisionAcHandler).migrate(any());
InstantiationUtils.assertInstantiationResponse(instantiationResponse, automationCompositionTarget);
}
@@ -373,7 +377,7 @@ class AutomationCompositionInstantiationProviderTest {
var instantiationResponse = instantiationProvider
.updateAutomationComposition(automationComposition.getCompositionId(), automationComposition);
- verify(supervisionAcHandler).migrate(any(), any());
+ verify(supervisionAcHandler).migrate(any());
verify(acProvider).updateAutomationComposition(automationComposition);
InstantiationUtils.assertInstantiationResponse(instantiationResponse, automationComposition);
}
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/main/utils/EncryptionUtilTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/main/utils/EncryptionUtilTest.java
index 7ad8b7169..f4fffdb4d 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/main/utils/EncryptionUtilTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/main/utils/EncryptionUtilTest.java
@@ -21,12 +21,17 @@
package org.onap.policy.clamp.acm.runtime.main.utils;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.security.InvalidAlgorithmParameterException;
+import javax.crypto.Cipher;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.onap.policy.clamp.acm.runtime.instantiation.InstantiationUtils;
import org.onap.policy.clamp.acm.runtime.util.CommonTestData;
+import org.onap.policy.clamp.common.acm.exception.AutomationCompositionRuntimeException;
import org.onap.policy.clamp.models.acm.concepts.AcTypeState;
import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionDefinition;
import org.onap.policy.clamp.models.acm.persistence.provider.ProviderUtils;
@@ -61,11 +66,41 @@ class EncryptionUtilTest {
encryptionUtils.findAndEncryptSensitiveData(acDefinition, automationComposition);
});
+ assert automationComposition != null;
+ automationComposition.getElements().values().forEach(element -> {
+ assertTrue(element.getProperties().get("secret").toString().startsWith("ENCRYPTED:"));
+ assertTrue(element.getProperties().get("password").toString().startsWith("ENCRYPTED:"));
+ });
+
var encryptionUtil2 = new EncryptionUtils(CommonTestData.getEncryptionParameterGroup());
assertDoesNotThrow(() -> {
- assert automationComposition != null;
encryptionUtil2.findAndDecryptSensitiveData(automationComposition);
});
+ automationComposition.getElements().values().forEach(element -> {
+ assertEquals("mysecret", element.getProperties().get("secret").toString());
+ assertEquals("mypass", element.getProperties().get("password").toString());
+ });
+ }
+
+ @Test
+ void testErrorScenario() {
+ var encryptionUtils = new EncryptionUtils(CommonTestData.getEncryptionParameterGroup()) {
+ @Override
+ protected Cipher getCipher(byte[] iv, int mode) throws InvalidAlgorithmParameterException {
+ throw new InvalidAlgorithmParameterException();
+ }
+ };
+ var automationComposition =
+ InstantiationUtils.getAutomationCompositionFromResource(INSTANTIATE_JSON, "Crud");
+ assertDoesNotThrow(() -> encryptionUtils.findAndEncryptSensitiveData(acDefinition, null));
+
+ var encryptionUtils2 = new EncryptionUtils(CommonTestData.getEncryptionParameterGroup());
+ encryptionUtils2.findAndEncryptSensitiveData(acDefinition, automationComposition);
+
+ assert automationComposition != null;
+ assertThrows(AutomationCompositionRuntimeException.class,
+ () -> encryptionUtils.findAndDecryptSensitiveData(automationComposition));
+
}
}
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionAcHandlerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionAcHandlerTest.java
index 448a96b21..e3baa6f63 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionAcHandlerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionAcHandlerTest.java
@@ -35,6 +35,7 @@ import java.util.Optional;
import java.util.UUID;
import org.junit.jupiter.api.Test;
import org.onap.policy.clamp.acm.runtime.instantiation.InstantiationUtils;
+import org.onap.policy.clamp.acm.runtime.main.utils.EncryptionUtils;
import org.onap.policy.clamp.acm.runtime.supervision.comm.AcElementPropertiesPublisher;
import org.onap.policy.clamp.acm.runtime.supervision.comm.AcPreparePublisher;
import org.onap.policy.clamp.acm.runtime.supervision.comm.AutomationCompositionDeployPublisher;
@@ -63,7 +64,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), mock(AutomationCompositionStateChangePublisher.class),
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), messageProvider);
+ mock(AcPreparePublisher.class), messageProvider, mock(EncryptionUtils.class));
var automationComposition =
InstantiationUtils.getAutomationCompositionFromResource(AC_INSTANTIATION_CREATE_JSON, "Crud");
@@ -111,7 +112,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), mock(AutomationCompositionStateChangePublisher.class),
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), messageProvider);
+ mock(AcPreparePublisher.class), messageProvider, mock(EncryptionUtils.class));
var automationCompositionAckMessage =
getAutomationCompositionDeployAck(ParticipantMessageType.AUTOMATION_COMPOSITION_STATECHANGE_ACK,
@@ -135,7 +136,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), mock(AutomationCompositionStateChangePublisher.class),
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), messageProvider);
+ mock(AcPreparePublisher.class), messageProvider, mock(EncryptionUtils.class));
var automationCompositionAckMessage =
getAutomationCompositionDeployAck(ParticipantMessageType.AUTOMATION_COMPOSITION_STATECHANGE_ACK,
@@ -177,7 +178,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), mock(AutomationCompositionStateChangePublisher.class),
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), messageProvider);
+ mock(AcPreparePublisher.class), messageProvider, mock(EncryptionUtils.class));
handler.handleAutomationCompositionUpdateAckMessage(automationCompositionAckMessage);
@@ -216,7 +217,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), automationCompositionStateChangePublisher,
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), messageProvider);
+ mock(AcPreparePublisher.class), messageProvider, mock(EncryptionUtils.class));
handler.handleAutomationCompositionUpdateAckMessage(automationCompositionAckMessage);
@@ -230,7 +231,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
automationCompositionDeployPublisher, mock(AutomationCompositionStateChangePublisher.class),
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), mock(MessageProvider.class));
+ mock(AcPreparePublisher.class), mock(MessageProvider.class), mock(EncryptionUtils.class));
var serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML);
var acDefinition = CommonTestData.createAcDefinition(serviceTemplate, AcTypeState.PRIMED);
@@ -249,7 +250,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), acStateChangePublisher,
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), mock(MessageProvider.class));
+ mock(AcPreparePublisher.class), mock(MessageProvider.class), mock(EncryptionUtils.class));
var serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML);
var acDefinition = CommonTestData.createAcDefinition(serviceTemplate, AcTypeState.PRIMED);
var automationComposition =
@@ -267,7 +268,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), acStateChangePublisher,
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), mock(MessageProvider.class));
+ mock(AcPreparePublisher.class), mock(MessageProvider.class), mock(EncryptionUtils.class));
var serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML);
var acDefinition = CommonTestData.createAcDefinition(serviceTemplate, AcTypeState.PRIMED);
@@ -288,7 +289,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), acStateChangePublisher,
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), mock(MessageProvider.class));
+ mock(AcPreparePublisher.class), mock(MessageProvider.class), mock(EncryptionUtils.class));
var serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML);
var acDefinition = CommonTestData.createAcDefinition(serviceTemplate, AcTypeState.PRIMED);
var automationComposition =
@@ -306,7 +307,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), acStateChangePublisher,
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), mock(MessageProvider.class));
+ mock(AcPreparePublisher.class), mock(MessageProvider.class), mock(EncryptionUtils.class));
var serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML);
var acDefinition = CommonTestData.createAcDefinition(serviceTemplate, AcTypeState.PRIMED);
var automationComposition =
@@ -326,7 +327,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), acStateChangePublisher,
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), mock(MessageProvider.class));
+ mock(AcPreparePublisher.class), mock(MessageProvider.class), mock(EncryptionUtils.class));
var serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML);
var acDefinition = CommonTestData.createAcDefinition(serviceTemplate, AcTypeState.PRIMED);
var automationComposition =
@@ -344,7 +345,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), acStateChangePublisher,
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), mock(MessageProvider.class));
+ mock(AcPreparePublisher.class), mock(MessageProvider.class), mock(EncryptionUtils.class));
var serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML);
var acDefinition = CommonTestData.createAcDefinition(serviceTemplate, AcTypeState.PRIMED);
var automationComposition =
@@ -377,7 +378,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), mock(AutomationCompositionStateChangePublisher.class),
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), messageProvider);
+ mock(AcPreparePublisher.class), messageProvider, mock(EncryptionUtils.class));
handler.handleAutomationCompositionUpdateAckMessage(automationCompositionAckMessage);
@@ -391,7 +392,7 @@ class SupervisionAcHandlerTest {
mock(AutomationCompositionDeployPublisher.class),
mock(AutomationCompositionStateChangePublisher.class), acElementPropertiesPublisher,
mock(AutomationCompositionMigrationPublisher.class),
- mock(AcPreparePublisher.class), mock(MessageProvider.class));
+ mock(AcPreparePublisher.class), mock(MessageProvider.class), mock(EncryptionUtils.class));
var automationComposition =
InstantiationUtils.getAutomationCompositionFromResource(AC_INSTANTIATION_CREATE_JSON, "Lock");
handler.update(automationComposition);
@@ -405,11 +406,12 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), mock(AutomationCompositionStateChangePublisher.class),
mock(AcElementPropertiesPublisher.class), acCompositionMigrationPublisher,
- mock(AcPreparePublisher.class), mock(MessageProvider.class));
+ mock(AcPreparePublisher.class), mock(MessageProvider.class), mock(EncryptionUtils.class));
var automationComposition =
InstantiationUtils.getAutomationCompositionFromResource(AC_INSTANTIATION_CREATE_JSON, "Migrate");
- var serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML);
- handler.migrate(automationComposition, serviceTemplate);
+ assert automationComposition != null;
+ automationComposition.setPhase(0);
+ handler.migrate(automationComposition);
verify(acCompositionMigrationPublisher, timeout(1000)).send(any(AutomationComposition.class), anyInt());
}
@@ -420,7 +422,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), mock(AutomationCompositionStateChangePublisher.class),
mock(AcElementPropertiesPublisher.class), acCompositionMigrationPublisher,
- mock(AcPreparePublisher.class), mock(MessageProvider.class));
+ mock(AcPreparePublisher.class), mock(MessageProvider.class), mock(EncryptionUtils.class));
var automationComposition =
InstantiationUtils.getAutomationCompositionFromResource(AC_INSTANTIATION_CREATE_JSON, "Migrate");
handler.migratePrecheck(automationComposition);
@@ -434,7 +436,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), mock(AutomationCompositionStateChangePublisher.class),
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- acPreparePublisher, mock(MessageProvider.class));
+ acPreparePublisher, mock(MessageProvider.class), mock(EncryptionUtils.class));
var automationComposition =
InstantiationUtils.getAutomationCompositionFromResource(AC_INSTANTIATION_CREATE_JSON, "Migrate");
handler.prepare(automationComposition);
@@ -448,7 +450,7 @@ class SupervisionAcHandlerTest {
var handler = new SupervisionAcHandler(automationCompositionProvider,
mock(AutomationCompositionDeployPublisher.class), mock(AutomationCompositionStateChangePublisher.class),
mock(AcElementPropertiesPublisher.class), mock(AutomationCompositionMigrationPublisher.class),
- acPreparePublisher, mock(MessageProvider.class));
+ acPreparePublisher, mock(MessageProvider.class), mock(EncryptionUtils.class));
var automationComposition =
InstantiationUtils.getAutomationCompositionFromResource(AC_INSTANTIATION_CREATE_JSON, "Migrate");
handler.review(automationComposition);
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandlerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandlerTest.java
index 315fb8c48..2cdcf210a 100644
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandlerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandlerTest.java
@@ -169,16 +169,11 @@ class SupervisionParticipantHandlerTest {
}
@Test
- void testHandleParticipantStatus() {
+ void testHandleParticipantStatusWithInstanceOutProperties() {
var participantStatusMessage = createParticipantStatus();
participantStatusMessage.setAutomationCompositionInfoList(List.of(new AutomationCompositionInfo()));
participantStatusMessage.setCompositionId(UUID.randomUUID());
- var acDefinitionProvider = mock(AcDefinitionProvider.class);
- var acDefinition = new AutomationCompositionDefinition();
- acDefinition.setCompositionId(participantStatusMessage.getCompositionId());
- when(acDefinitionProvider.getAcDefinition(acDefinition.getCompositionId())).thenReturn(acDefinition);
-
var participantProvider = mock(ParticipantProvider.class);
var participant = CommonTestData.createParticipant(CommonTestData.getParticipantId());
when(participantProvider.findParticipant(CommonTestData.getParticipantId()))
@@ -190,17 +185,18 @@ class SupervisionParticipantHandlerTest {
var automationCompositionProvider = mock(AutomationCompositionProvider.class);
var messageProvider = mock(MessageProvider.class);
+ var acDefinitionProvider = mock(AcDefinitionProvider.class);
var handler =
new SupervisionParticipantHandler(participantProvider, mock(ParticipantRegisterAckPublisher.class),
mock(ParticipantDeregisterAckPublisher.class), automationCompositionProvider,
acDefinitionProvider, mock(ParticipantSyncPublisher.class), messageProvider);
handler.handleParticipantMessage(participantStatusMessage);
- verify(messageProvider).save(any(ParticipantStatus.class));
+ verify(messageProvider).saveInstanceOutProperties(any(ParticipantStatus.class));
}
@Test
- void testAcDefinitionOutProperties() {
+ void testHandleParticipantStatusWithCompositionOutProperties() {
var participantStatusMessage = createParticipantStatus();
var participantDefinition = new ParticipantDefinition();
participantStatusMessage.setParticipantDefinitionUpdates(List.of(participantDefinition));
@@ -228,31 +224,30 @@ class SupervisionParticipantHandlerTest {
mock(ParticipantDeregisterAckPublisher.class), mock(AutomationCompositionProvider.class),
acDefinitionProvider, mock(ParticipantSyncPublisher.class), messageProvider);
handler.handleParticipantMessage(participantStatusMessage);
- verify(messageProvider).save(participantStatusMessage);
+ verify(messageProvider).saveCompositionOutProperties(any(), any());
}
@Test
- void testAcOutProperties() {
+ void testAcOutPropertiesNotValid() {
var participantStatusMessage = createParticipantStatus();
- participantStatusMessage.setAutomationCompositionInfoList(List.of(new AutomationCompositionInfo()));
+ var participantDefinition = new ParticipantDefinition();
+ participantStatusMessage.setParticipantDefinitionUpdates(List.of(participantDefinition));
+ participantDefinition.setParticipantId(participantStatusMessage.getParticipantId());
+ var acElementDefinition = new AutomationCompositionElementDefinition();
+ acElementDefinition.setAcElementDefinitionId(new ToscaConceptIdentifier("code", "1.0.0"));
+ participantDefinition.setAutomationCompositionElementDefinitionList(List.of(acElementDefinition));
var compositionId = UUID.randomUUID();
participantStatusMessage.setCompositionId(compositionId);
- var acDefinition = new AutomationCompositionDefinition();
- acDefinition.setState(AcTypeState.COMMISSIONED);
- acDefinition.setCompositionId(compositionId);
var acDefinitionProvider = mock(AcDefinitionProvider.class);
var messageProvider = mock(MessageProvider.class);
- when(acDefinitionProvider.findAcDefinition(compositionId)).thenReturn(Optional.of(acDefinition));
- when(acDefinitionProvider.getAcDefinition(compositionId)).thenReturn(acDefinition);
-
var participantProvider = mock(ParticipantProvider.class);
var handler =
new SupervisionParticipantHandler(participantProvider, mock(ParticipantRegisterAckPublisher.class),
mock(ParticipantDeregisterAckPublisher.class), mock(AutomationCompositionProvider.class),
acDefinitionProvider, mock(ParticipantSyncPublisher.class), messageProvider);
handler.handleParticipantMessage(participantStatusMessage);
- verify(messageProvider).save(participantStatusMessage);
+ verify(messageProvider, times(0)).saveCompositionOutProperties(any(), any());
}
@Test
@@ -275,7 +270,6 @@ class SupervisionParticipantHandlerTest {
@Test
void testHandleParticipantStatusCheckOnline() {
var participantStatusMessage = createParticipantStatus();
- participantStatusMessage.setAutomationCompositionInfoList(List.of(new AutomationCompositionInfo()));
participantStatusMessage.setCompositionId(UUID.randomUUID());
var acDefinitionProvider = mock(AcDefinitionProvider.class);
@@ -296,7 +290,6 @@ class SupervisionParticipantHandlerTest {
handler.handleParticipantMessage(participantStatusMessage);
verify(participantProvider).saveParticipant(any());
- verify(messageProvider).save(any(ParticipantStatus.class));
}
private ParticipantStatus createParticipantStatus() {
diff --git a/runtime-acm/src/test/resources/providers/AcInstantiateEncryptTest.json b/runtime-acm/src/test/resources/providers/AcInstantiateEncryptTest.json
index 896a8b6c9..4a0de52ba 100644
--- a/runtime-acm/src/test/resources/providers/AcInstantiateEncryptTest.json
+++ b/runtime-acm/src/test/resources/providers/AcInstantiateEncryptTest.json
@@ -12,8 +12,8 @@
},
"description": "Starter Automation Composition Element for the Demo",
"properties": {
- "secret": "mysecret1",
- "password": "mypass1",
+ "secret": "mysecret",
+ "password": "mypass",
"baseUrl": "http://address:30800",
"httpHeaders": {
"Content-Type": "application/json",
@@ -57,8 +57,8 @@
"description": "Bridge Automation Composition Element for the Demo",
"properties": {
"baseUrl": "http://address:30801",
- "password": "mypass2",
- "secret": "secret2",
+ "password": "mypass",
+ "secret": "mysecret",
"httpHeaders": {
"Content-Type": "application/json",
"Authorization": "Basic YWNtVXNlcjp6YiFYenRHMzQ="