Removes hard-coded thread.sleep and adds awaitility

Author: FriedJannik

basyx.aasregistry/basyx.aasregistry-feature-search/pom.xml

@@ -54,6 +54,12 @@
             <groupId>org.eclipse.digitaltwin.basyx</groupId>
             <artifactId>basyx.aasregistry-service-mongodb-storage</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.3.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

basyx.aasregistry/basyx.aasregistry-feature-search/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/feature/search/TestSearchAasRegistry.java

@@ -53,11 +53,13 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import static org.awaitility.Awaitility.await;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 /**
  * Tests for {@link org.eclipse.digitaltwin.basyx.aasregistry.feature.search.SearchAasRegistryStorage} feature
  *
- * @author danish
+ * @author zielstor, fried
  */
 public class TestSearchAasRegistry {
 
@@ -73,7 +75,9 @@ public static void setUp() throws IOException, DeserializationException, Interru
 		storage = appContext.getBean(SearchAasRegistryStorage.class);
 		searchAPI = appContext.getBean(SearchAasRegistryApiHTTPController.class);
 		preloadAasdf();
-		Thread.sleep(2000);
+		await().atMost(10, SECONDS).until(() ->
+				!storage.getAllAasDescriptors(new PaginationInfo(0, ""), new DescriptorFilter(null, null)).getResult().isEmpty()
+		);
 	}
 
 	@AfterClass

basyx.aasrepository/basyx.aasrepository-feature-search/pom.xml

@@ -89,6 +89,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-actuator-autoconfigure</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.3.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

basyx.aasrepository/basyx.aasrepository-feature-search/src/test/java/org/eclipse/digitaltwin/basyx/aasrepository/feature/search/TestSearchAasRepository.java

@@ -45,19 +45,23 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.util.List;
+import static org.awaitility.Awaitility.await;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 public class TestSearchAasRepository {
     private static ConfigurableApplicationContext appContext;
     private static AasRepository searchBackend;
     private static SearchAasRepositoryApiHTTPController searchAPI;
 
     @BeforeClass
-    public static void startSmRepo() throws Exception {
+    public static void startAasRepo() throws Exception {
         appContext = new SpringApplicationBuilder(DummySearchAasRepositoryComponent.class).run(new String[] {});
         searchBackend = appContext.getBean(AasRepository.class);
         searchAPI = appContext.getBean(SearchAasRepositoryApiHTTPController.class);
         preloadShells();
-        Thread.sleep(2000);
+        await().atMost(10, SECONDS).until(() ->
+                !searchBackend.getAllAas(null, null, new PaginationInfo(0, "")).getResult().isEmpty()
+        );
     }
 
     @Test

basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-feature-search/pom.xml

@@ -70,6 +70,12 @@
             <version>1.3.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.3.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository-feature-search/src/test/java/org/eclipse/digitaltwin/basyx/conceptdescriptionrepository/feature/search/TestSearchCdRepository.java

@@ -46,6 +46,8 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.util.List;
+import static org.awaitility.Awaitility.await;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 public class TestSearchCdRepository {
     private static ConfigurableApplicationContext appContext;
@@ -58,7 +60,9 @@ public static void startCdRepo() throws Exception {
         searchBackend = appContext.getBean(ConceptDescriptionRepository.class);
         searchAPI = appContext.getBean(SearchCdRepositoryApiHTTPController.class);
         preloadCds();
-        waitForData();
+        await().atMost(10, SECONDS).until(() ->
+                !searchBackend.getAllConceptDescriptions(new PaginationInfo(0, "")).getResult().isEmpty()
+        );
     }
 
     @Test
@@ -106,8 +110,4 @@ private static void resetRepo() {
         });
     }
 
-    private static void waitForData() throws InterruptedException {
-        Thread.sleep(2000);
-    }
-
 }

basyx.submodelregistry/basyx.submodelregistry-feature-search/pom.xml

@@ -64,5 +64,11 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.3.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

basyx.submodelregistry/basyx.submodelregistry-feature-search/src/test/java/org/eclipse/digitaltwin/basyx/submodelregistry/feature/search/TestSearchSubmodelRegistry.java

@@ -53,7 +53,8 @@
 import java.util.Objects;
 
 import static org.junit.Assert.assertEquals;
-
+import static org.awaitility.Awaitility.await;
+import static java.util.concurrent.TimeUnit.SECONDS;
 /**
  * Tests for {@link SearchSubmodelRegistryStorage} feature
  *
@@ -74,7 +75,9 @@ public static void setUp() throws IOException, DeserializationException, Interru
 		storage = appContext.getBean(SearchSubmodelRegistryStorage.class);
 		searchAPI = appContext.getBean(SearchSubmodelRegistryApiHTTPController.class);
 		preloadSmds();
-		Thread.sleep(2000);
+		await().atMost(10, SECONDS).until(() ->
+				!storage.getAllSubmodelDescriptors(new PaginationInfo(0, "")).getResult().isEmpty()
+		);
 	}
 
 	@AfterClass

basyx.submodelrepository/basyx.submodelrepository-feature-search/pom.xml

@@ -93,6 +93,12 @@
             <groupId>org.eclipse.digitaltwin.basyx</groupId>
             <artifactId>basyx.submodelrepository-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.3.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

basyx.submodelrepository/basyx.submodelrepository-feature-search/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/search/TestSearchSubmodelRepository.java

@@ -47,6 +47,9 @@
 import java.io.FileNotFoundException;
 import java.util.List;
 
+import static org.awaitility.Awaitility.await;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 public class TestSearchSubmodelRepository {
     private static ConfigurableApplicationContext appContext;
     private static SubmodelRepository searchBackend;
@@ -58,7 +61,9 @@ public static void startSmRepo() throws Exception {
         searchBackend = appContext.getBean(SubmodelRepository.class);
         searchAPI = appContext.getBean(SearchSubmodelRepositoryApiHTTPController.class);
         preloadSubmodels();
-        Thread.sleep(2000);
+        await().atMost(10, SECONDS).until(() ->
+                !searchBackend.getAllSubmodels(new PaginationInfo(0, "")).getResult().isEmpty()
+        );
     }
 
     @Test