X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FXappManagerMockConfiguration.java;h=27d713bc8ec124adbde529ee72ff0ad62d388793;hb=5577df1ec38f5810920100116ea0b4023f2649ef;hp=bbc1160cb63ce8d70d83ea4d4e2161458e70053b;hpb=f1b2fa6e4218b8ac188a66b113488dfc00cb1155;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java
index bbc1160c..27d713bc 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java
@@ -26,7 +26,8 @@ import static org.mockito.Mockito.when;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oransc.ric.xappmgr.client.api.DefaultApi;
+import org.oransc.ric.xappmgr.client.api.HealthApi;
+import org.oransc.ric.xappmgr.client.api.XappApi;
 import org.oransc.ric.xappmgr.client.invoker.ApiClient;
 import org.oransc.ric.xappmgr.client.model.AllXapps;
 import org.oransc.ric.xappmgr.client.model.SubscriptionRequest;
@@ -72,11 +73,23 @@ public class XappManagerMockConfiguration {
 	}
 
 	@Bean
-	public DefaultApi xappManagerMockClient() {
+	public HealthApi xappHealthMockApi() {
 		ApiClient mockClient = mock(ApiClient.class);
 		when(mockClient.getStatusCode()).thenReturn(HttpStatus.OK);
+		HealthApi mockApi = mock(HealthApi.class);
+		when(mockApi.getApiClient()).thenReturn(mockClient);
+		doAnswer(i -> {
+			return null;
+		}).when(mockApi).getHealth();
+		return mockApi;
+	}
 
-		DefaultApi mockApi = mock(DefaultApi.class);
+	@Bean
+	public XappApi xappMgrMockApi() {
+		ApiClient mockClient = mock(ApiClient.class);
+		when(mockClient.getStatusCode()).thenReturn(HttpStatus.OK);
+
+		XappApi mockApi = mock(XappApi.class);
 		when(mockApi.getApiClient()).thenReturn(mockClient);
 
 		SubscriptionResponse subRes = new SubscriptionResponse().eventType(SubscriptionResponse.EventTypeEnum.ALL)
@@ -91,9 +104,6 @@ public class XappManagerMockConfiguration {
 
 		when(mockApi.getAllXapps()).thenReturn(allXapps);
 
-		doAnswer(i -> {
-			return null;
-		}).when(mockApi).getHealth();
 
 		Xapp xappByName = new Xapp().name("name").status(StatusEnum.UNKNOWN).version("v1");
 		when(mockApi.getXappByName(any(String.class))).thenReturn(xappByName);