Trying to fix OP-1370

informatici · Nov 29, 2024 · 790a80a · 790a80a
1 parent dfe86f2
commit 790a80a
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/test/java/org/isf/generaldata/configProvider/TestApiConfigProvider.java b/src/test/java/org/isf/generaldata/configProvider/TestApiConfigProvider.java
@@ -21,7 +21,9 @@
  */
 package org.isf.generaldata.configProvider;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;
@@ -67,12 +69,15 @@ public void stopServer() {
 	void testGetTestParamsDataDefaultVersion() throws Exception {
 		// Set up the mock server to respond with the desired JSON
 		mockServer.when(request().withMethod("GET").withPath("/test")).respond(response().withStatusCode(200)
-						.withContentType(MediaType.APPLICATION_JSON)
-						.withBody(CONFIG_JSON));
+			.withContentType(MediaType.APPLICATION_JSON)
+			.withBody(CONFIG_JSON));
+
+		// Await until the mock server has started
+		await().atMost(5, SECONDS).until(() -> mockServer.hasStarted());
 
 		// Use MockedStatic to mock GeneralData
 		try (MockedStatic<GeneralData> mockedGeneralData = mockStatic(GeneralData.class);
-						MockedStatic<Version> mockedVersion = Mockito.mockStatic(Version.class)) {
+			MockedStatic<Version> mockedVersion = Mockito.mockStatic(Version.class)) {
 
 			// Mock the Version.getVersion() method to return a specific version
 			Version mockVersion = mock(Version.class);
@@ -100,12 +105,15 @@ void testGetTestParamsDataDefaultVersion() throws Exception {
 	void testGetTestParamsDataWithVersion() throws Exception {
 		// Set up the mock server to respond with the desired JSON
 		mockServer.when(request().withMethod("GET").withPath("/test")).respond(response().withStatusCode(200)
-						.withContentType(MediaType.APPLICATION_JSON)
-						.withBody(CONFIG_JSON));
+			.withContentType(MediaType.APPLICATION_JSON)
+			.withBody(CONFIG_JSON));
+
+		// Await until the mock server has started
+		await().atMost(5, SECONDS).until(() -> mockServer.hasStarted());
 
 		// Use MockedStatic to mock GeneralData
 		try (MockedStatic<GeneralData> mockedGeneralData = mockStatic(GeneralData.class);
-						MockedStatic<Version> mockedVersion = Mockito.mockStatic(Version.class)) {
+			MockedStatic<Version> mockedVersion = Mockito.mockStatic(Version.class)) {
 
 			// Mock the Version.getVersion() method to return a specific version
 			Version mockVersion = mock(Version.class);