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%2FAppManagerMockConfiguration.java;h=2dfb814989d74cd4cfe7a65dd85ac498db2984d4;hb=3340ea073fd56431b2d1231bda17cd98765fd8eb;hp=10517e88ca47bce277df5fb28f9cf63b3d8281ea;hpb=226fd436a085f717d4cbf81bf1719bdaf1468414;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java
index 10517e88..2dfb8149 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java
@@ -108,22 +108,21 @@ public class AppManagerMockConfiguration {
 
 		when(mockApi.getAllXappConfig()).thenReturn(allXappConfigs);
 
-		when(mockApi.createXappConfig(any(XAppConfig.class))).thenReturn(new XAppConfig());
+		when(mockApi.createXappConfig(any(XAppConfig.class))).thenReturn(allXappConfigs.get(0));
 
-		when(mockApi.modifyXappConfig(any(XAppConfig.class))).thenReturn(new XAppConfig());
+		when(mockApi.modifyXappConfig(any(XAppConfig.class))).thenReturn(allXappConfigs.get(0));
 
 		doAnswer(i -> {
 			return null;
 		}).when(mockApi).deleteXappConfig(any(ConfigMetadata.class));
 
-		when(mockApi.deployXapp(any(XAppInfo.class))).thenReturn(new Xapp());
+		when(mockApi.deployXapp(any(XAppInfo.class))).thenReturn(deployedXapps.get(0));
 
 		when(mockApi.listAllXapps()).thenReturn(availXapps);
 
 		when(mockApi.getAllXapps()).thenReturn(deployedXapps);
 
-		Xapp xappByName = new Xapp().name("name").status(StatusEnum.UNKNOWN).version("v1");
-		when(mockApi.getXappByName(any(String.class))).thenReturn(xappByName);
+		when(mockApi.getXappByName(any(String.class))).thenReturn(deployedXapps.get(0));
 
 		doAnswer(i -> {
 			return null;