Merge pull request #256 from eclipse-basyx/development-propagation-wait

Waits for Message propagation in tests

Author: FrankSchnicke

basyx.components/basyx.components.docker/basyx.components.AASServer/src/test/java/org/eclipse/basyx/regression/AASServer/MqttAASServerSuite.java

@@ -27,7 +27,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+
 import java.io.IOException;
+
 import org.eclipse.basyx.aas.metamodel.map.AssetAdministrationShell;
 import org.eclipse.basyx.aas.metamodel.map.descriptor.CustomId;
 import org.eclipse.basyx.components.aas.AASServerComponent;
@@ -47,6 +49,7 @@
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
+
 import io.moquette.broker.Server;
 import io.moquette.broker.config.ClasspathResourceLoader;
 import io.moquette.broker.config.IConfig;
@@ -113,7 +116,7 @@ public void shellLifeCycle() {
 	}
 
 	@Test
-	public void submodelLifeCycle() {
+	public void submodelLifeCycle() throws InterruptedException {
 		IIdentifier shellIdentifierForSubmodel = new CustomId("shellSubmodelId");
 		AssetAdministrationShell shell = createShell(shellIdentifierForSubmodel.getId(), shellIdentifierForSubmodel);
 		manager.createAAS(shell, getURL());
@@ -128,6 +131,8 @@ public void submodelLifeCycle() {
 
 		manager.deleteSubmodel(shellIdentifierForSubmodel, submodelIdentifier);
 
+		waitForPropagation();
+
 		assertTrue(listener.getTopics().stream().anyMatch(t -> t.equals(MqttAASAPIHelper.TOPIC_REMOVESUBMODEL)));
 		assertTrue(listener.getTopics().stream().anyMatch(t -> t.equals(MqttSubmodelAggregatorHelper.TOPIC_DELETESUBMODEL)));
 		try {
@@ -139,6 +144,10 @@ public void submodelLifeCycle() {
 		manager.deleteAAS(shellIdentifierForSubmodel);
 	}
 
+	private void waitForPropagation() throws InterruptedException {
+		Thread.sleep(1000);
+	}
+
 	protected static BaSyxContextConfiguration createBaSyxContextConfiguration() {
 		BaSyxContextConfiguration config = new BaSyxContextConfiguration();
 		config.loadFromResource(BaSyxContextConfiguration.DEFAULT_CONFIG_PATH);

basyx.components/basyx.components.docker/basyx.components.AASServer/src/test/java/org/eclipse/basyx/regression/AASServer/MqttV2AASServerSuite.java

@@ -97,18 +97,23 @@ protected static void genericSetupClass(BaSyxAASServerConfiguration serverConfig
 	}
 
 	@Test
-	public void shellLifeCycle() {
+	public void shellLifeCycle() throws InterruptedException {
 		MqttV2AASAggregatorTopicFactory aasAggregatorFactory = new MqttV2AASAggregatorTopicFactory(new Base64URLEncoder());
 
 		AssetAdministrationShell shell = createShell(shellIdentifier.getId(), shellIdentifier);
 
 		manager.createAAS(shell, getURL());
 
+		waitForPropagation();
+
 		assertEquals(aasAggregatorFactory.createCreateAASTopic(AAS_SERVER_ID), listener.lastTopic);
 
 		assertEquals(shell.getIdShort(), manager.retrieveAAS(shellIdentifier).getIdShort());
 
 		manager.deleteAAS(shellIdentifier);
+
+		waitForPropagation();
+
 		assertEquals(aasAggregatorFactory.createDeleteAASTopic(AAS_SERVER_ID), listener.lastTopic);
 		try {
 			manager.retrieveAAS(shellIdentifier);
@@ -119,7 +124,7 @@ public void shellLifeCycle() {
 	}
 
 	@Test
-	public void submodelLifeCycle() {
+	public void submodelLifeCycle() throws InterruptedException {
 		MqttV2SubmodelAggregatorTopicFactory submodelAggregatorFactory = new MqttV2SubmodelAggregatorTopicFactory(new Base64URLEncoder());
 		IIdentifier shellIdentifierForSubmodel = new CustomId("shellSubmodelId");
 		AssetAdministrationShell shell = createShell(shellIdentifierForSubmodel.getId(), shellIdentifierForSubmodel);
@@ -128,12 +133,16 @@ public void submodelLifeCycle() {
 		Submodel submodel = createSubmodel(submodelIdentifier.getId(), submodelIdentifier);
 		manager.createSubmodel(shellIdentifierForSubmodel, submodel);
 
+		waitForPropagation();
+
 		assertTrue(listener.getTopics().stream().anyMatch(t -> t.equals(submodelAggregatorFactory.createCreateSubmodelTopic(shell.getIdentification().getId(), AAS_SERVER_ID))));
 
 		assertEquals(submodel.getIdShort(), manager.retrieveSubmodel(shellIdentifierForSubmodel, submodelIdentifier).getIdShort());
 
 		manager.deleteSubmodel(shellIdentifierForSubmodel, submodelIdentifier);
 
+		waitForPropagation();
+
 		assertTrue(listener.getTopics().stream().anyMatch(t -> t.equals(submodelAggregatorFactory.createDeleteSubmodelTopic(shell.getIdentification().getId(), AAS_SERVER_ID))));
 
 		try {
@@ -145,6 +154,10 @@ public void submodelLifeCycle() {
 		manager.deleteAAS(shellIdentifierForSubmodel);
 	}
 
+	private void waitForPropagation() throws InterruptedException {
+		Thread.sleep(1000);
+	}
+
 	protected static BaSyxContextConfiguration createBaSyxContextConfiguration() {
 		BaSyxContextConfiguration config = new BaSyxContextConfiguration();
 		config.loadFromResource(BaSyxContextConfiguration.DEFAULT_CONFIG_PATH);