X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FA1MediatorMockConfiguration.java;h=d3ac7a7d344833cfba6012ac43758f8b80299a6c;hb=53f1fcf033e3a166d7203e0a1c5e0971f9c6bc16;hp=2d31c0eb15474042de4f5e490c1146238620e91a;hpb=44203c43bb16a87eb54cc97431a026e111842c97;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java
index 2d31c0eb..d3ac7a7d 100644
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java
@@ -42,10 +42,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 /**
- * Creates a mock implementation of the A1 mediator client API.
+ * Creates a mock implementation of the A1 mediator client builder.
  */
-@Profile("test")
 @Configuration
+@Profile("test")
 public class A1MediatorMockConfiguration {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -54,13 +54,14 @@ public class A1MediatorMockConfiguration {
 	public static final String AC_CONTROL_NAME = "admission_control_policy";
 
 	// Simulate remote method delay for UI testing
-	@Value("${mock.config.delay:0}")
-	private int delayMs;
+	private final int delayMs;
 
+	// Mock values
 	private final Map<String, String> appPolicyMap;
 
-	public A1MediatorMockConfiguration() {
-		logger.info("Configuring mock A1 Mediator");
+	public A1MediatorMockConfiguration(@Value("${mock.config.delay:0}") int delayMs) {
+		logger.info("ctor: mock A1 Mediator configured with delay {}", delayMs);
+		this.delayMs = delayMs;
 		appPolicyMap = new HashMap<>();
 		// Define a mock AC policy
 		ObjectMapper mapper = new ObjectMapper();
@@ -80,9 +81,7 @@ public class A1MediatorMockConfiguration {
 		return mockClient;
 	}
 
-	@Bean
-	// Use the same name as regular configuration
-	public A1MediatorApi a1MediatorApi() {
+	private A1MediatorApi a1MediatorApi() {
 		ApiClient apiClient = apiClient();
 		A1MediatorApi mockApi = mock(A1MediatorApi.class);
 		when(mockApi.getApiClient()).thenReturn(apiClient);
@@ -107,4 +106,13 @@ public class A1MediatorMockConfiguration {
 		return mockApi;
 	}
 
+	@Bean
+	// Must use the same name as the non-mock configuration
+	public A1MediatorApiBuilder a1MediatorApiBuilder() {
+		final A1MediatorApi mockApi = a1MediatorApi();
+		final A1MediatorApiBuilder mockBuilder = mock(A1MediatorApiBuilder.class);
+		when(mockBuilder.getA1MediatorApi(any(String.class))).thenReturn(mockApi);
+		return mockBuilder;
+	}
+
 }