Add JUnit tests of backend controllers

[portal/ric-dashboard.git] / webapp-backend / src / main / java / org / oransc / ric / portal / dashboard / config / AppManagerMockConfiguration.java

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 10517e8..2dfb814 100644 (file)
--- 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;