Adapts test

Author: FriedJannik

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

@@ -36,10 +36,7 @@
 import org.eclipse.digitaltwin.basyx.http.pagination.Base64UrlEncodedCursor;
 import org.eclipse.digitaltwin.basyx.querycore.query.model.AASQuery;
 import org.eclipse.digitaltwin.basyx.querycore.query.model.QueryResponse;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.ResponseEntity;
@@ -70,22 +67,30 @@ public class TestSearchAasRegistry {
 
 
 	@BeforeClass
-	public static void setUp() throws IOException, DeserializationException, InterruptedException {
+	public static void setUp() {
 		appContext = new SpringApplication(DummySearchAasRegistryComponent.class).run();
 		storage = appContext.getBean(SearchAasRegistryStorage.class);
 		searchAPI = appContext.getBean(SearchAasRegistryApiHTTPController.class);
+	}
+
+	@AfterClass
+	public static void tearDown() {
+		appContext.close();
+	}
+
+	@Before
+	public void preloadData() throws FileNotFoundException, DeserializationException {
 		preloadAasdf();
 		await().atMost(10, SECONDS).until(() ->
 				!storage.getAllAasDescriptors(new PaginationInfo(1, ""), new DescriptorFilter(null, null)).getResult().isEmpty()
 		);
 	}
 
-	@AfterClass
-	public static void tearDown() {
+	@After
+	public void resetRepo(){
 		List<org.eclipse.digitaltwin.basyx.aasregistry.model.AssetAdministrationShellDescriptor> descriptors = storage.getAllAasDescriptors(PaginationInfo.NO_LIMIT, new DescriptorFilter(null, null)).getResult();
 
 		descriptors.forEach(descriptor -> storage.removeAasDescriptor(descriptor.getId()));
-		appContext.close();
 	}
 
 	@Test

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

@@ -33,10 +33,7 @@
 import org.eclipse.digitaltwin.basyx.http.pagination.Base64UrlEncodedCursor;
 import org.eclipse.digitaltwin.basyx.querycore.query.model.AASQuery;
 import org.eclipse.digitaltwin.basyx.querycore.query.model.QueryResponse;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.ResponseEntity;
@@ -54,16 +51,30 @@ public class TestSearchAasRepository {
     private static SearchAasRepositoryApiHTTPController searchAPI;
 
     @BeforeClass
-    public static void startAasRepo() throws Exception {
+    public static void startAasRepo() {
         appContext = new SpringApplicationBuilder(DummySearchAasRepositoryComponent.class).run(new String[] {});
         searchBackend = appContext.getBean(AasRepository.class);
         searchAPI = appContext.getBean(SearchAasRepositoryApiHTTPController.class);
+
+    }
+
+    @Before
+    public void preloadData() throws FileNotFoundException, DeserializationException {
         preloadShells();
         await().atMost(10, SECONDS).until(() ->
                 !searchBackend.getAllAas(null, null, new PaginationInfo(1, "")).getResult().isEmpty()
         );
     }
 
+    @After
+    public void resetRepo(){
+        searchBackend.getAllAas(null, null, new PaginationInfo(100, "")).getResult().forEach(aas -> {
+            try {
+                searchBackend.deleteAas(aas.getId());
+            } catch (Exception ignored) {}
+        });
+    }
+
     @Test
     public void testRepo() throws FileNotFoundException, DeserializationException {
         File file = new File(TestSearchAasRepository.class.getResource("/query.json").getFile());
@@ -95,13 +106,6 @@ private static void preloadShells() throws FileNotFoundException, Deserializatio
 
     @AfterClass
     public static void shutdownAasRepo() {
-        searchBackend.getAllAas(null, null, new PaginationInfo(0, "")).getResult().forEach(aas -> {
-            try {
-                searchBackend.deleteAas(aas.getId());
-            } catch (Exception e) {
-                // Ignore exceptions during cleanup
-            }
-        });
         appContext.close();
     }
 

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

@@ -34,10 +34,7 @@
 import org.eclipse.digitaltwin.basyx.http.pagination.Base64UrlEncodedCursor;
 import org.eclipse.digitaltwin.basyx.querycore.query.model.AASQuery;
 import org.eclipse.digitaltwin.basyx.querycore.query.model.QueryResponse;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.ResponseEntity;
@@ -55,16 +52,26 @@ public class TestSearchCdRepository {
     private static SearchCdRepositoryApiHTTPController searchAPI;
 
     @BeforeClass
-    public static void startCdRepo() throws Exception {
+    public static void startCdRepo() {
         appContext = new SpringApplicationBuilder(DummySearchCdRepositoryComponent.class).run(new String[] {});
         searchBackend = appContext.getBean(ConceptDescriptionRepository.class);
         searchAPI = appContext.getBean(SearchCdRepositoryApiHTTPController.class);
+
+    }
+
+    @Before
+    public void preloadData() throws FileNotFoundException, DeserializationException {
         preloadCds();
         await().atMost(10, SECONDS).until(() ->
                 !searchBackend.getAllConceptDescriptions(new PaginationInfo(1, "")).getResult().isEmpty()
         );
     }
 
+    @After
+    public void cleareRepo(){
+        resetRepo();
+    }
+
     @Test
     public void testRepo() throws FileNotFoundException, DeserializationException {
         File file = new File(TestSearchCdRepository.class.getResource("/query.json").getFile());
@@ -96,12 +103,11 @@ private static void preloadCds() throws FileNotFoundException, DeserializationEx
 
     @AfterClass
     public static void shutdownCdRepo() {
-        resetRepo();
         appContext.close();
     }
 
     private static void resetRepo() {
-        searchBackend.getAllConceptDescriptions(new PaginationInfo(0, "")).getResult().forEach(cd -> {
+        searchBackend.getAllConceptDescriptions(new PaginationInfo(100, "")).getResult().forEach(cd -> {
             try {
                 searchBackend.deleteConceptDescription(cd.getId());
             } catch (Exception e) {

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

@@ -70,22 +70,30 @@ public class TestSearchSubmodelRegistry {
 
 
 	@BeforeClass
-	public static void setUp() throws IOException, DeserializationException, InterruptedException {
+	public static void setUp() {
 		appContext = new SpringApplication(DummySearchSubmodelRegistryComponent.class).run(new String[] {});
 		storage = appContext.getBean(SearchSubmodelRegistryStorage.class);
 		searchAPI = appContext.getBean(SearchSubmodelRegistryApiHTTPController.class);
+	}
+
+	@AfterClass
+	public static void tearDown() {
+		appContext.close();
+	}
+
+	@Before
+	public void preloadData() throws FileNotFoundException, DeserializationException {
 		preloadSmds();
 		await().atMost(10, SECONDS).until(() ->
-				!storage.getAllSubmodelDescriptors(new PaginationInfo(1, "")).getResult().isEmpty()
+			!storage.getAllSubmodelDescriptors(new PaginationInfo(1, "")).getResult().isEmpty()
 		);
 	}
 
-	@AfterClass
-	public static void tearDown() {
+	@After
+	public void resetRepo(){
 		List<org.eclipse.digitaltwin.basyx.submodelregistry.model.SubmodelDescriptor> descriptors = storage.getAllSubmodelDescriptors(PaginationInfo.NO_LIMIT).getResult();
 
 		descriptors.forEach(descriptor -> storage.removeSubmodelDescriptor(descriptor.getId()));
-		appContext.close();
 	}
 
 	@Test