7 files changed, 12 insertions, 52 deletions
diff --git a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/GeneralConvertImplTest.java b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/GeneralConvertImplTest.java
index 7aa16aad..271ce7ee 100644
--- a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/GeneralConvertImplTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/GeneralConvertImplTest.java
@@ -15,8 +15,6 @@
  */
 package org.onap.usecaseui.server.service.nsmf.impl;
 
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.onap.usecaseui.server.util.CallStub.failedCall;
@@ -27,7 +25,6 @@ import com.alibaba.fastjson.JSONArray;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.usecaseui.server.constant.nsmf.NsmfParamConstant;
diff --git a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvertTest.java b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvertTest.java
index 8dc8e834..ffd88fa3 100644
--- a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvertTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvertTest.java
@@ -15,6 +15,7 @@
  */
 package org.onap.usecaseui.server.service.nsmf.impl;
 
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.onap.usecaseui.server.util.CallStub.failedCall;
@@ -41,6 +42,7 @@ import org.onap.usecaseui.server.bean.nsmf.resource.SlicingBusinessList;
 import org.onap.usecaseui.server.bean.nsmf.task.BusinessDemandInfo;
 import org.onap.usecaseui.server.bean.nsmf.task.NstInfo;
 import org.onap.usecaseui.server.constant.nsmf.NsmfParamConstant;
+import org.onap.usecaseui.server.controller.IntentController;
 import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIService;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceAndInstance;
@@ -50,6 +52,7 @@ import org.onap.usecaseui.server.service.slicingdomain.aai.bean.AAIServiceRsp;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.Relationship;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.RelationshipData;
 import org.onap.usecaseui.server.service.slicingdomain.so.SOSliceService;
+import org.powermock.api.support.membermodification.MemberModifier;
 
 public class ResourceMgtServiceConvertTest {
 
@@ -57,11 +60,15 @@ public class ResourceMgtServiceConvertTest {
     SOSliceService soSliceService = null;
     AAISliceService aaiSliceService = null;
 
+    GeneralConvertImpl generalConvert;
+
     @Before
     public void before() throws Exception {
         aaiSliceService = mock(AAISliceService.class);
         soSliceService = mock(SOSliceService.class);
+        generalConvert = mock(GeneralConvertImpl.class);
         resourceMgtServiceConvert = new ResourceMgtServiceConvert(soSliceService, aaiSliceService);
+        MemberModifier.field(ResourceMgtServiceConvert.class, "generalConvert").set(resourceMgtServiceConvert , generalConvert);
     }
 
     @Test
@@ -92,6 +99,7 @@ public class ResourceMgtServiceConvertTest {
         SlicingBusinessDetails slicingBusinessDetails = new SlicingBusinessDetails();
         AAIServiceAndInstance aaiServiceAndInstance = new AAIServiceAndInstance();
         String businessId = "iu89-iu87-iu78-tr67";
+        when(generalConvert.getUseInterval(businessId)).thenReturn("businessId");
         try {
             resourceMgtServiceConvert.convertBusinessDetails(businessId, slicingBusinessDetails, aaiServiceAndInstance);
         } catch (InvocationTargetException e) {
@@ -226,6 +234,7 @@ public class ResourceMgtServiceConvertTest {
         when(aaiSliceService.getServiceProfiles(NsmfParamConstant.CUSTOM_5G,
             NsmfParamConstant.SERVICE_TYPE_5G, businessId))
             .thenReturn(successfulCall(object));
+        when(generalConvert.getUseInterval(eq(businessId))).thenReturn(businessId);
         try {
             resourceMgtServiceConvert
                 .convertBusinessProfileDetails(businessId, slicingBusinessDetails, aaiServiceAndInstance);
diff --git a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImplTest.java b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImplTest.java
index 2c80dc4a..3a258956 100644
--- a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImplTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImplTest.java
@@ -21,32 +21,18 @@ import static org.onap.usecaseui.server.util.CallStub.emptyBodyCall;
 import static org.onap.usecaseui.server.util.CallStub.failedCall;
 import static org.onap.usecaseui.server.util.CallStub.successfulCall;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.usecaseui.server.bean.nsmf.resource.NsiInfo;
-import org.onap.usecaseui.server.bean.nsmf.resource.SlicingBusinessInfo;
-import org.onap.usecaseui.server.bean.nsmf.resource.SlicingBusinessList;
 import org.onap.usecaseui.server.constant.nsmf.NsmfParamConstant;
-import org.onap.usecaseui.server.service.lcm.CustomerService;
-import org.onap.usecaseui.server.service.lcm.domain.aai.AAIService;
-import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAIServiceSubscription;
-import org.onap.usecaseui.server.service.lcm.domain.aai.bean.ServiceSubscriptionRsp;
-import org.onap.usecaseui.server.service.lcm.impl.DefaultCustomerService;
 import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.NetworkInfo;
 import org.onap.usecaseui.server.service.slicingdomain.so.SOSliceService;
 import org.onap.usecaseui.server.service.slicingdomain.so.bean.ActivateService;
 import org.onap.usecaseui.server.service.slicingdomain.so.bean.SOOperation;
 import retrofit2.Call;
-import retrofit2.Response;
 
 public class ResourceMgtServiceImplTest {
 
@@ -90,24 +76,6 @@ public class ResourceMgtServiceImplTest {
     }
 
     @Test
-    public void itCanAddBusinessProgress() {
-        SOOperation soOperation = new SOOperation();
-        SlicingBusinessList slicingBusinessList = new SlicingBusinessList();
-        List<SlicingBusinessInfo> slicingBusinessInfoList = new ArrayList<>();
-        SlicingBusinessInfo slicingBusinessInfo = new SlicingBusinessInfo();
-        slicingBusinessInfoList.add(slicingBusinessInfo);
-        slicingBusinessList.setSlicingBusinessInfoList(slicingBusinessInfoList);
-        String businessId = "test001";
-        String operationId = "test001";
-        when(soSliceService.queryOperationProgress(businessId, operationId))
-            .thenReturn(successfulCall(soOperation));
-        resourceMgtService.addBusinessProgress(slicingBusinessList);
-
-        SlicingBusinessList slicingBusinessListNull = new SlicingBusinessList();
-        resourceMgtService.addBusinessProgress(slicingBusinessListNull);
-    }
-
-    @Test
     public void itCanQuerySlicingBusinessByStatus() {
         JSONObject object = new JSONObject();
 
diff --git a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceConvertTest.java b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceConvertTest.java
index 41764c33..ba2446f9 100644
--- a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceConvertTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceConvertTest.java
@@ -62,6 +62,8 @@ public class ResourceMonitorServiceConvertTest {
 
         KpiTotalTraffic kpiTotalTraffic = new KpiTotalTraffic();
         List<TotalTraffic> totalTrafficList = new ArrayList<>();
+        TotalTraffic totalTraffic = new TotalTraffic();
+        totalTrafficList.add(totalTraffic);
         kpiTotalTraffic.setResult(totalTrafficList);
 
         TrafficReqInfo trafficReqInfo = new TrafficReqInfo();
diff --git a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceImplTest.java b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceImplTest.java
index 1352309f..d03ee6bb 100644
--- a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceImplTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceImplTest.java
@@ -20,7 +20,6 @@ import static org.mockito.Mockito.when;
 import static org.onap.usecaseui.server.util.CallStub.failedCall;
 import static org.onap.usecaseui.server.util.CallStub.successfulCall;
 
-import com.alibaba.fastjson.JSONObject;
 import java.util.ArrayList;
 import java.util.List;
 import okhttp3.RequestBody;
@@ -28,8 +27,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.onap.usecaseui.server.bean.nsmf.monitor.ServiceInfo;
 import org.onap.usecaseui.server.bean.nsmf.monitor.ServiceList;
-import org.onap.usecaseui.server.constant.nsmf.NsmfParamConstant;
-import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
 import org.onap.usecaseui.server.service.slicingdomain.kpi.KpiSliceService;
 import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.KpiTotalBandwidth;
 import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.KpiTotalTraffic;
diff --git a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceConvertTest.java b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceConvertTest.java
index 225dcce4..07e790bc 100644
--- a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceConvertTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceConvertTest.java
@@ -21,14 +21,12 @@ import static org.onap.usecaseui.server.service.nsmf.impl.TaskMgtServiceImplTest
 import static org.onap.usecaseui.server.util.CallStub.failedCall;
 import static org.onap.usecaseui.server.util.CallStub.successfulCall;
 
-import com.alibaba.fastjson.JSONObject;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.usecaseui.server.bean.nsmf.monitor.ServiceInfo;
 import org.onap.usecaseui.server.bean.nsmf.task.BusinessDemandInfo;
 import org.onap.usecaseui.server.bean.nsmf.task.NsiAndSubNssiInfo;
 import org.onap.usecaseui.server.bean.nsmf.task.NstInfo;
@@ -40,7 +38,6 @@ import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.ConnectionLink;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.ConnectionLinkList;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.RelationshipList;
-import org.onap.usecaseui.server.service.slicingdomain.so.SOSliceService;
 import org.onap.usecaseui.server.service.slicingdomain.so.bean.AnSliceTaskInfo;
 import org.onap.usecaseui.server.service.slicingdomain.so.bean.CnSliceTaskInfo;
 import org.onap.usecaseui.server.service.slicingdomain.so.bean.SOTask;
@@ -50,10 +47,6 @@ import org.onap.usecaseui.server.service.slicingdomain.so.bean.SliceProfile;
 import org.onap.usecaseui.server.service.slicingdomain.so.bean.SliceTaskParams;
 import org.onap.usecaseui.server.service.slicingdomain.so.bean.TnBHSliceTaskInfo;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
 public class TaskMgtServiceConvertTest {
 
     TaskMgtServiceConvert taskMgtServiceConvert = null;
diff --git a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceImplTest.java b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceImplTest.java
index 137392e7..220e8e97 100644
--- a/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceImplTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceImplTest.java
@@ -31,30 +31,24 @@ import java.io.Reader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import okhttp3.ResponseBody;
 import okio.BufferedSink;
 import okio.BufferedSource;
-import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.usecaseui.server.bean.nsmf.monitor.ServiceInfo;
-import org.onap.usecaseui.server.bean.nsmf.monitor.ServiceList;
 import org.onap.usecaseui.server.bean.nsmf.task.SlicingTaskAuditInfo;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.ConnectionLink;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.EndPointInfoList;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.Relationship;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.RelationshipData;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.RelationshipList;
-import org.onap.usecaseui.server.service.slicingdomain.kpi.KpiSliceService;
-import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.KpiTotalTraffic;
 import org.onap.usecaseui.server.service.slicingdomain.so.SOSliceService;
 import org.onap.usecaseui.server.service.slicingdomain.so.bean.SOTask;
 import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService;
 import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.ConnectionLinkList;
-import retrofit2.Response;
 
 public class TaskMgtServiceImplTest {