update intent process code

Issue-ID: USECASEUI-785
Signed-off-by: kaixiliu <liukaixi@chinamobile.com>
Change-Id: Idb6eec6142a0d7e57ecaf04659ce9a42a33aaa94

8 files changed, 317 insertions, 577 deletions

diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/CLLBusinessIntentManagementFunctionTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/CLLBusinessIntentManagementFunctionTest.java
new file mode 100644
index 0000000..2f91691
--- /dev/null
+++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/CLLBusinessIntentManagementFunctionTest.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2023 CMCC, Inc. and others. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onap.usecaseui.intentanalysis.cllBusinessIntentMgt;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests;
+import org.onap.usecaseui.intentanalysis.bean.enums.ExpectationType;
+import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType;
+import org.onap.usecaseui.intentanalysis.bean.enums.ObjectType;
+import org.onap.usecaseui.intentanalysis.bean.models.*;
+import org.onap.usecaseui.intentanalysis.cllBusinessIntentMgt.cllBusinessModule.CLLBusinessActuationModule;
+import org.onap.usecaseui.intentanalysis.cllBusinessIntentMgt.cllBusinessModule.CLLBusinessDecisionModule;
+import org.onap.usecaseui.intentanalysis.cllBusinessIntentMgt.cllBusinessModule.CLLBusinessKnowledgeModule;
+import org.onap.usecaseui.intentanalysis.clldeliveryIntentmgt.CLLDeliveryIntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.formatintentinputMgt.formatintentinputModule.FormatIntentInputActuationModule;
+import org.onap.usecaseui.intentanalysis.formatintentinputMgt.formatintentinputModule.FormatIntentInputDecisionModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.intentBaseService.contextService.IntentContextService;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentEventRecord.IntentEventRecordService;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.KnowledgeModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentinterfaceservice.IntentInterfaceService;
+import org.onap.usecaseui.intentanalysis.service.ContextService;
+import org.onap.usecaseui.intentanalysis.service.IntentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+
+@SpringBootTest(classes = IntentAnalysisApplicationTests.class)
+@RunWith(SpringRunner.class)
+public class CLLBusinessIntentManagementFunctionTest {
+    @InjectMocks
+    CLLBusinessIntentManagementFunction cllBusinessIntentManagementFunction;
+    KnowledgeModule knowledgeModule = mock(CLLBusinessKnowledgeModule.class);
+    DecisionModule decisionModule = mock(CLLBusinessDecisionModule.class);
+    ActuationModule actuationModule = mock(CLLBusinessActuationModule.class);
+    @Mock
+    CLLDeliveryIntentManagementFunction cllDeliveryIntentManagementFunction;
+    @Mock
+    public IntentContextService intentContextService;
+    @Mock
+    IntentInterfaceService intentInterfaceService;
+    @Mock
+    ApplicationContext applicationContext;
+    @Mock
+    ContextService contextService;
+    @Mock
+    IntentService intentService;
+    @Mock
+    IntentEventRecordService intentEventRecordService;
+
+    Intent intent = new Intent();
+    IntentGoalBean intentGoalBean = new IntentGoalBean();
+
+    @Before
+    public void before() throws Exception {
+        intent.setIntentName("cllIntent");
+        intent.setIntentId("12345");
+        List<Expectation> expectationList = new ArrayList<>();
+
+        Expectation delivery = new Expectation();
+        delivery.setExpectationId("12345-delivery");
+        delivery.setExpectationName("deliveryExpectation");
+        delivery.setExpectationType(ExpectationType.DELIVERY);
+        ExpectationObject expectationObject = new ExpectationObject();
+        expectationObject.setObjectType(ObjectType.SLICING);
+        //expetationTarget  Context  FulfilmentInfo is empty
+        delivery.setExpectationObject(expectationObject);
+        expectationList.add(delivery);
+
+        Expectation assurance = new Expectation();
+        assurance.setExpectationId("12345-assurance");
+        assurance.setExpectationName("assuranceExpectation");
+        assurance.setExpectationType(ExpectationType.ASSURANCE);
+        ExpectationObject expectationObject1 = new ExpectationObject();
+        expectationObject1.setObjectType(ObjectType.CCVPN);
+        //expetationTarget  Context  FulfilmentInfo  is empty
+        assurance.setExpectationObject(expectationObject1);
+        expectationList.add(assurance);
+
+        intent.setIntentExpectations(expectationList);
+        intentGoalBean.setIntent(intent);
+        intentGoalBean.setIntentGoalType(IntentGoalType.CREATE);
+    }
+
+    @Test
+    public void testDetection() {
+        cllBusinessIntentManagementFunction.detection(intentGoalBean);
+        Assert.assertTrue(true);
+    }
+    @Test
+    public void testInvestigation() {
+        cllBusinessIntentManagementFunction.investigation(intentGoalBean);
+        Assert.assertTrue(true);
+    }
+    @Test
+    public void testImplementIntentCreate() { // TODO: 2023/3/30  
+        LinkedHashMap<IntentGoalBean, IntentManagementFunction> map = new LinkedHashMap<>();
+        map.put(intentGoalBean, cllDeliveryIntentManagementFunction);
+        Mockito.when(decisionModule.intentObjectDefine(any(),any())).thenReturn(intent);
+        cllBusinessIntentManagementFunction.implementIntent(intent, map);
+        Assert.assertTrue(true);
+    }
+    @Test
+    public void testImplementIntentUpdate() {
+        LinkedHashMap<IntentGoalBean, IntentManagementFunction> map = new LinkedHashMap<>();
+        intentGoalBean.setIntentGoalType(IntentGoalType.UPDATE);
+        map.put(intentGoalBean, cllDeliveryIntentManagementFunction);
+        cllBusinessIntentManagementFunction.implementIntent(intent, map);
+        Assert.assertTrue(true);
+    }
+
+    @Test
+    public void testImplementIntentDelete() {
+        LinkedHashMap<IntentGoalBean, IntentManagementFunction> map = new LinkedHashMap<>();
+        intentGoalBean.setIntentGoalType(IntentGoalType.DELETE);
+        map.put(intentGoalBean, cllDeliveryIntentManagementFunction);
+        cllBusinessIntentManagementFunction.implementIntent(intent, map);
+        Assert.assertTrue(true);
+    }
+
+}
\ No newline at end of file
diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/FormatIntentInputManagementFunctionTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/FormatIntentInputManagementFunctionTest.java
new file mode 100644
index 0000000..9aba940
--- /dev/null
+++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/FormatIntentInputManagementFunctionTest.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2023 CMCC, Inc. and others. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onap.usecaseui.intentanalysis.formatintentinputMgt;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests;
+import org.onap.usecaseui.intentanalysis.bean.enums.ExpectationType;
+import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType;
+import org.onap.usecaseui.intentanalysis.bean.enums.ObjectType;
+import org.onap.usecaseui.intentanalysis.bean.models.Expectation;
+import org.onap.usecaseui.intentanalysis.bean.models.ExpectationObject;
+import org.onap.usecaseui.intentanalysis.bean.models.Intent;
+import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean;
+import org.onap.usecaseui.intentanalysis.cllBusinessIntentMgt.CLLBusinessIntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.formatintentinputMgt.formatintentinputModule.FormatIntentInputActuationModule;
+import org.onap.usecaseui.intentanalysis.formatintentinputMgt.formatintentinputModule.FormatIntentInputDecisionModule;
+import org.onap.usecaseui.intentanalysis.formatintentinputMgt.formatintentinputModule.FormatIntentInputKnowledgeModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.intentBaseService.contextService.IntentContextService;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.KnowledgeModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentinterfaceservice.IntentInterfaceService;
+import org.onap.usecaseui.intentanalysis.service.IntentService;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import static org.mockito.Mockito.mock;
+
+@SpringBootTest(classes = IntentAnalysisApplicationTests.class)
+@RunWith(SpringRunner.class)
+public class FormatIntentInputManagementFunctionTest {
+    @InjectMocks
+    FormatIntentInputManagementFunction formatIntentInputManagementFunction;
+    KnowledgeModule knowledgeModule = mock(FormatIntentInputKnowledgeModule.class);
+    DecisionModule decisionModule = mock(FormatIntentInputDecisionModule.class);
+    ActuationModule actuationModule = mock(FormatIntentInputActuationModule.class);
+    @Mock
+    CLLBusinessIntentManagementFunction cllBusinessIntentManagementFunction;
+    @Mock
+    IntentInterfaceService intentInterfaceService;
+    @Mock
+    ApplicationContext applicationContext;
+    @Mock
+    IntentService intentService;
+    @Mock
+    IntentContextService intentContextService;
+
+
+    Intent intent = new Intent();
+    IntentGoalBean intentGoalBean = new IntentGoalBean();
+
+    @Before
+    public void before() throws Exception {
+        intent.setIntentName("cllIntent");
+        intent.setIntentId("12345");
+        List<Expectation> expectationList = new ArrayList<>();
+
+        Expectation delivery = new Expectation();
+        delivery.setExpectationId("12345-delivery");
+        delivery.setExpectationName("deliveryExpectation");
+        delivery.setExpectationType(ExpectationType.DELIVERY);
+        ExpectationObject expectationObject = new ExpectationObject();
+        expectationObject.setObjectType(ObjectType.SLICING);
+        //expetationTarget  Context  FulfilmentInfo is empty
+        delivery.setExpectationObject(expectationObject);
+        expectationList.add(delivery);
+
+        Expectation assurance = new Expectation();
+        assurance.setExpectationId("12345-assurance");
+        assurance.setExpectationName("assuranceExpectation");
+        assurance.setExpectationType(ExpectationType.ASSURANCE);
+        ExpectationObject expectationObject1 = new ExpectationObject();
+        expectationObject1.setObjectType(ObjectType.CCVPN);
+        //expetationTarget  Context  FulfilmentInfo  is empty
+        assurance.setExpectationObject(expectationObject1);
+        expectationList.add(assurance);
+
+        intent.setIntentExpectations(expectationList);
+        intentGoalBean.setIntent(intent);
+        intentGoalBean.setIntentGoalType(IntentGoalType.CREATE);
+    }
+
+    @Test
+    public void testDetection() {
+        formatIntentInputManagementFunction.detection(intentGoalBean);
+        Assert.assertTrue(true);
+    }
+
+    @Test
+    public void testInvestigation() {
+        formatIntentInputManagementFunction.investigation(intentGoalBean);
+        Assert.assertTrue(true);
+    }
+
+    @Test
+    public void testImplementIntentCreate() {
+        LinkedHashMap<IntentGoalBean, IntentManagementFunction> map = new LinkedHashMap<>();
+        map.put(intentGoalBean, cllBusinessIntentManagementFunction);
+        formatIntentInputManagementFunction.implementIntent(intent, map);
+        Assert.assertTrue(true);
+    }
+
+    @Test
+    public void testImplementIntentUpdate() {
+        LinkedHashMap<IntentGoalBean, IntentManagementFunction> map = new LinkedHashMap<>();
+        intentGoalBean.setIntentGoalType(IntentGoalType.UPDATE);
+        map.put(intentGoalBean, cllBusinessIntentManagementFunction);
+        formatIntentInputManagementFunction.implementIntent(intent, map);
+        Assert.assertTrue(true);
+    }
+
+    @Test
+    public void testImplementIntentDelete() {
+        LinkedHashMap<IntentGoalBean, IntentManagementFunction> map = new LinkedHashMap<>();
+        intentGoalBean.setIntentGoalType(IntentGoalType.DELETE);
+        map.put(intentGoalBean, cllBusinessIntentManagementFunction);
+        formatIntentInputManagementFunction.implementIntent(intent, map);
+        Assert.assertTrue(true);
+    }
+
+    @Test
+    public void testUpdateIntentInfo() {
+        Intent originalIntent = new Intent();
+
+        originalIntent.setIntentName("cllIntent");
+        originalIntent.setIntentId("12345");
+        List<Expectation> expectationList = new ArrayList<>();
+
+        Expectation delivery = new Expectation();
+        delivery.setExpectationId("12345-delivery");
+        delivery.setExpectationName("deliveryExpectation");
+        delivery.setExpectationType(ExpectationType.DELIVERY);
+        ExpectationObject expectationObject = new ExpectationObject();
+        expectationObject.setObjectType(ObjectType.SLICING);
+        //expetationTarget  Context  FulfilmentInfo is empty
+        delivery.setExpectationObject(expectationObject);
+        expectationList.add(delivery);
+        originalIntent.setIntentExpectations(expectationList);
+
+        formatIntentInputManagementFunction.updateIntentInfo(originalIntent, intent);
+        Assert.assertTrue(true);
+    }
+}
\ No newline at end of file
diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDefinitionServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDefinitionServiceTest.java
deleted file mode 100644
index cc5830a..0000000
--- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDefinitionServiceTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2022 CMCC, Inc. and others. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests;
-import org.onap.usecaseui.intentanalysis.bean.enums.ExpectationType;
-import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType;
-import org.onap.usecaseui.intentanalysis.bean.enums.ObjectType;
-import org.onap.usecaseui.intentanalysis.bean.models.Expectation;
-import org.onap.usecaseui.intentanalysis.bean.models.ExpectationObject;
-import org.onap.usecaseui.intentanalysis.bean.models.Intent;
-import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean;
-import org.onap.usecaseui.intentanalysis.cllBusinessIntentMgt.CLLBusinessIntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.contextService.IntentContextService;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-@SpringBootTest(classes = IntentAnalysisApplicationTests.class)
-@RunWith(SpringRunner.class)
-public class IntentDefinitionServiceTest {
-
-    @InjectMocks
-    IntentDefinitionService intentDefinitionService;
-
-    @Resource(name = "formatIntentInputManagementFunction")
-    private IntentManagementFunction intentOwner;
-    @Resource(name = "CLLBusinessIntentManagementFunction")
-    private CLLBusinessIntentManagementFunction cllBusinessIntentManagementFunction;
-    @Mock
-    IntentContextService intentContextService;
-    Intent intent = new Intent();
-
-    @Before
-    public void before() throws Exception {
-
-        intent.setIntentName("cllIntent");
-        intent.setIntentId("12345");
-        List<Expectation> expectationList = new ArrayList<>();
-
-        Expectation delivery = new Expectation();
-        delivery.setExpectationId("12345-delivery");
-        delivery.setExpectationName("deliveryExpectation");
-        delivery.setExpectationType(ExpectationType.DELIVERY);
-        ExpectationObject expectationObject = new ExpectationObject();
-        expectationObject.setObjectType(ObjectType.SLICING);
-        //expetationTarget  Context  FulfilmentInfo is empty
-        delivery.setExpectationObject(expectationObject);
-        expectationList.add(delivery);
-
-        Expectation assurance = new Expectation();
-        assurance.setExpectationId("12345-assurance");
-        assurance.setExpectationName("assuranceExpectation");
-        assurance.setExpectationType(ExpectationType.ASSURANCE);
-        ExpectationObject expectationObject1 = new ExpectationObject();
-        expectationObject1.setObjectType(ObjectType.CCVPN);
-        //expetationTarget  Context  FulfilmentInfo  is empty
-        assurance.setExpectationObject(expectationObject1);
-        expectationList.add(assurance);
-
-        intent.setIntentExpectations(expectationList);
-    }
-
-    @Test
-    public void testDefinitionPorcess() {
-        intentDefinitionService.setIntentRole(intentOwner, cllBusinessIntentManagementFunction);
-        LinkedHashMap<IntentGoalBean, IntentManagementFunction> map = new LinkedHashMap<>();
-        IntentGoalBean gb = new IntentGoalBean(intent, IntentGoalType.CREATE);
-        map.put(gb, new IntentManagementFunction());
-        intentDefinitionService.definitionPorcess(intent, map.entrySet().iterator().next());
-        Assert.assertTrue(true);
-    }
-}
\ No newline at end of file
diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDetectionServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDetectionServiceTest.java
deleted file mode 100644
index 95e319e..0000000
--- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDetectionServiceTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-
-/*
- * Copyright (C) 2022 CMCC, Inc. and others. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests;
-import org.onap.usecaseui.intentanalysis.bean.enums.ExpectationType;
-import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType;
-import org.onap.usecaseui.intentanalysis.bean.enums.ObjectType;
-import org.onap.usecaseui.intentanalysis.bean.models.Expectation;
-import org.onap.usecaseui.intentanalysis.bean.models.ExpectationObject;
-import org.onap.usecaseui.intentanalysis.bean.models.Intent;
-import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean;
-import org.onap.usecaseui.intentanalysis.cllBusinessIntentMgt.CLLBusinessIntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-@SpringBootTest(classes = IntentAnalysisApplicationTests.class)
-@RunWith(SpringRunner.class)
-public class IntentDetectionServiceTest {
-    @InjectMocks
-    IntentDetectionService intentDetectionService;
-    @Resource(name = "formatIntentInputManagementFunction")
-    private IntentManagementFunction intentOwner;
-    @Resource(name = "CLLBusinessIntentManagementFunction")
-    private CLLBusinessIntentManagementFunction cllBusinessIntentManagementFunction;
-    Intent intent = new Intent();
-
-    @Before
-    public void before() throws Exception {
-        intent.setIntentName("cllIntent");
-        intent.setIntentId("12345");
-        List<Expectation> expectationList = new ArrayList<>();
-
-        Expectation delivery = new Expectation();
-        delivery.setExpectationId("12345-delivery");
-        delivery.setExpectationName("deliveryExpectation");
-        delivery.setExpectationType(ExpectationType.DELIVERY);
-        ExpectationObject expectationObject = new ExpectationObject();
-        expectationObject.setObjectType(ObjectType.SLICING);
-        //expetationTarget  Context  FulfilmentInfo is empty
-        delivery.setExpectationObject(expectationObject);
-        expectationList.add(delivery);
-
-        Expectation assurance = new Expectation();
-        assurance.setExpectationId("12345-assurance");
-        assurance.setExpectationName("assuranceExpectation");
-        assurance.setExpectationType(ExpectationType.ASSURANCE);
-        ExpectationObject expectationObject1 = new ExpectationObject();
-        expectationObject1.setObjectType(ObjectType.CCVPN);
-        //expetationTarget  Context  FulfilmentInfo  is empty
-        assurance.setExpectationObject(expectationObject1);
-        expectationList.add(assurance);
-
-        intent.setIntentExpectations(expectationList);
-    }
-
-    @Test
-    public void testDetectionProcess() {
-        intentDetectionService.setIntentRole(intentOwner, null);
-        IntentGoalBean intentGoalBean = new IntentGoalBean(intent, IntentGoalType.CREATE);
-        intentDetectionService.detectionProcess(intentGoalBean);
-        Assert.assertTrue(true);
-
-    }
-}
\ No newline at end of file
diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDistributionServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDistributionServiceTest.java
deleted file mode 100644
index 6453048..0000000
--- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDistributionServiceTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2022 CMCC, Inc. and others. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests;
-import org.onap.usecaseui.intentanalysis.bean.enums.ExpectationType;
-import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType;
-import org.onap.usecaseui.intentanalysis.bean.enums.ObjectType;
-import org.onap.usecaseui.intentanalysis.bean.models.Expectation;
-import org.onap.usecaseui.intentanalysis.bean.models.ExpectationObject;
-import org.onap.usecaseui.intentanalysis.bean.models.Intent;
-import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean;
-import org.onap.usecaseui.intentanalysis.cllBusinessIntentMgt.CLLBusinessIntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-@SpringBootTest(classes = IntentAnalysisApplicationTests.class)
-@RunWith(SpringRunner.class)
-public class IntentDistributionServiceTest {
-    @InjectMocks
-    IntentDistributionService IntentDistributionService;
-    @Resource(name = "formatIntentInputManagementFunction")
-    private IntentManagementFunction intentOwner;
-    @Resource(name = "CLLBusinessIntentManagementFunction")
-    private CLLBusinessIntentManagementFunction cllBusinessIntentManagementFunction;
-    Intent intent = new Intent();
-    IntentGoalBean intentGoalBean = new IntentGoalBean();
-
-    @Before
-    public void before() throws Exception {
-        intent.setIntentName("cllIntent");
-        intent.setIntentId("12345");
-        List<Expectation> expectationList = new ArrayList<>();
-
-        Expectation delivery = new Expectation();
-        delivery.setExpectationId("12345-delivery");
-        delivery.setExpectationName("deliveryExpectation");
-        delivery.setExpectationType(ExpectationType.DELIVERY);
-        ExpectationObject expectationObject = new ExpectationObject();
-        expectationObject.setObjectType(ObjectType.SLICING);
-        //expetationTarget  Context  FulfilmentInfo is empty
-        delivery.setExpectationObject(expectationObject);
-        expectationList.add(delivery);
-
-        Expectation assurance = new Expectation();
-        assurance.setExpectationId("12345-assurance");
-        assurance.setExpectationName("assuranceExpectation");
-        assurance.setExpectationType(ExpectationType.ASSURANCE);
-        ExpectationObject expectationObject1 = new ExpectationObject();
-        expectationObject1.setObjectType(ObjectType.CCVPN);
-        //expetationTarget  Context  FulfilmentInfo  is empty
-        assurance.setExpectationObject(expectationObject1);
-        expectationList.add(assurance);
-
-        intent.setIntentExpectations(expectationList);
-        intentGoalBean.setIntent(intent);
-        intentGoalBean.setIntentGoalType(IntentGoalType.CREATE);
-    }
-    @Test
-    public void testIntentDistribution() {
-        IntentDistributionService.setIntentRole(intentOwner, cllBusinessIntentManagementFunction);
-        LinkedHashMap<IntentGoalBean, IntentManagementFunction> map = new LinkedHashMap<>();
-        map.put(intentGoalBean,cllBusinessIntentManagementFunction);
-        IntentDistributionService.distributionProcess(map.entrySet().iterator().next());
-        Assert.assertTrue(true);
-    }
-}
diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentInvestigationServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentInvestigationServiceTest.java
deleted file mode 100644
index 774325e..0000000
--- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentInvestigationServiceTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-
-/*
- * Copyright (C) 2022 CMCC, Inc. and others. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests;
-import org.onap.usecaseui.intentanalysis.bean.enums.ExpectationType;
-import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType;
-import org.onap.usecaseui.intentanalysis.bean.enums.ObjectType;
-import org.onap.usecaseui.intentanalysis.bean.models.Expectation;
-import org.onap.usecaseui.intentanalysis.bean.models.ExpectationObject;
-import org.onap.usecaseui.intentanalysis.bean.models.Intent;
-import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean;
-import org.onap.usecaseui.intentanalysis.cllBusinessIntentMgt.CLLBusinessIntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-@SpringBootTest(classes = IntentAnalysisApplicationTests.class)
-@RunWith(SpringRunner.class)
-public class IntentInvestigationServiceTest {
-    @InjectMocks
-    IntentInvestigationService intentInvestigationService;
-
-    @Resource(name = "formatIntentInputManagementFunction")
-    private IntentManagementFunction intentOwner;
-    @Resource(name = "CLLBusinessIntentManagementFunction")
-    private CLLBusinessIntentManagementFunction cllBusinessIntentManagementFunction;
-    Intent intent = new Intent();
-    IntentGoalBean intentGoalBean = new IntentGoalBean();
-
-    @Before
-    public void before() throws Exception {
-        intent.setIntentName("cllIntent");
-        intent.setIntentId("12345");
-        List<Expectation> expectationList = new ArrayList<>();
-
-        Expectation delivery = new Expectation();
-        delivery.setExpectationId("12345-delivery");
-        delivery.setExpectationName("deliveryExpectation");
-        delivery.setExpectationType(ExpectationType.DELIVERY);
-        ExpectationObject expectationObject = new ExpectationObject();
-        expectationObject.setObjectType(ObjectType.SLICING);
-        //expetationTarget  Context  FulfilmentInfo is empty
-        delivery.setExpectationObject(expectationObject);
-        expectationList.add(delivery);
-
-        Expectation assurance = new Expectation();
-        assurance.setExpectationId("12345-assurance");
-        assurance.setExpectationName("assuranceExpectation");
-        assurance.setExpectationType(ExpectationType.ASSURANCE);
-        ExpectationObject expectationObject1 = new ExpectationObject();
-        expectationObject1.setObjectType(ObjectType.CCVPN);
-        //expetationTarget  Context  FulfilmentInfo  is empty
-        assurance.setExpectationObject(expectationObject1);
-        expectationList.add(assurance);
-
-        intent.setIntentExpectations(expectationList);
-        intent.setIntentExpectations(expectationList);
-        intentGoalBean.setIntent(intent);
-        intentGoalBean.setIntentGoalType(IntentGoalType.CREATE);
-    }
-    @Test
-    public void testDetectionProcess() {
-        intentInvestigationService.setIntentRole(intentOwner, null);
-        intentInvestigationService.investigationProcess(intentGoalBean);
-        Assert.assertTrue(true);
-    }
-}
diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentOperationServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentOperationServiceTest.java
deleted file mode 100644
index 65e425c..0000000
--- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentOperationServiceTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2022 CMCC, Inc. and others. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests;
-import org.onap.usecaseui.intentanalysis.bean.enums.ExpectationType;
-import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType;
-import org.onap.usecaseui.intentanalysis.bean.enums.ObjectType;
-import org.onap.usecaseui.intentanalysis.bean.models.Expectation;
-import org.onap.usecaseui.intentanalysis.bean.models.ExpectationObject;
-import org.onap.usecaseui.intentanalysis.bean.models.Intent;
-import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean;
-import org.onap.usecaseui.intentanalysis.formatintentinputMgt.FormatIntentInputManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-@SpringBootTest(classes = IntentAnalysisApplicationTests.class)
-@RunWith(SpringRunner.class)
-public class IntentOperationServiceTest {
-    @InjectMocks
-    IntentOperationService intentOperationService;
-
-    @Resource(name = "formatIntentInputManagementFunction")
-    private IntentManagementFunction intentOwner;
-    @Resource(name = "formatIntentInputManagementFunction")
-    private FormatIntentInputManagementFunction formatIntentInputManagementFunction;
-    IntentGoalBean intentGoalBean = new IntentGoalBean();
-    Intent intent = new Intent();
-    @Before
-    public void before() throws Exception {
-        intent.setIntentName("cllIntent");
-        intent.setIntentId("12345");
-        List<Expectation> expectationList = new ArrayList<>();
-
-        Expectation delivery = new Expectation();
-        delivery.setExpectationId("12345-delivery");
-        delivery.setExpectationName("deliveryExpectation");
-        delivery.setExpectationType(ExpectationType.DELIVERY);
-        ExpectationObject expectationObject = new ExpectationObject();
-        expectationObject.setObjectType(ObjectType.SLICING);
-        //expetationTarget  Context  FulfilmentInfo is empty
-        delivery.setExpectationObject(expectationObject);
-        expectationList.add(delivery);
-
-        Expectation assurance = new Expectation();
-        assurance.setExpectationId("12345-assurance");
-        assurance.setExpectationName("assuranceExpectation");
-        assurance.setExpectationType(ExpectationType.ASSURANCE);
-        ExpectationObject expectationObject1 = new ExpectationObject();
-        expectationObject1.setObjectType(ObjectType.CCVPN);
-        //expetationTarget  Context  FulfilmentInfo  is empty
-        assurance.setExpectationObject(expectationObject1);
-        expectationList.add(assurance);
-
-        intent.setIntentExpectations(expectationList);
-        intentGoalBean.setIntent(intent);
-        intentGoalBean.setIntentGoalType(IntentGoalType.CREATE);
-    }
-    @Test
-    public void testIntentOperation() {
-        intentOperationService.setIntentRole(intentOwner, formatIntentInputManagementFunction);
-        IntentGoalBean intentGoalBean = new IntentGoalBean(intent,IntentGoalType.CREATE);
-        intentOperationService.operationProcess(intent, intentGoalBean);
-        Assert.assertTrue(true);
-    }
-}
\ No newline at end of file
diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentProcessServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentProcessServiceTest.java
deleted file mode 100644
index e961371..0000000
--- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentProcessServiceTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2022 CMCC, Inc. and others. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests;
-import org.onap.usecaseui.intentanalysis.bean.enums.ExpectationType;
-import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType;
-import org.onap.usecaseui.intentanalysis.bean.enums.ObjectType;
-import org.onap.usecaseui.intentanalysis.bean.models.Expectation;
-import org.onap.usecaseui.intentanalysis.bean.models.ExpectationObject;
-import org.onap.usecaseui.intentanalysis.bean.models.Intent;
-import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean;
-import org.onap.usecaseui.intentanalysis.cllBusinessIntentMgt.CLLBusinessIntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.service.IntentService;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
-@SpringBootTest(classes = IntentAnalysisApplicationTests.class)
-@RunWith(SpringRunner.class)
-public class IntentProcessServiceTest {
-    @InjectMocks
-    IntentProcessService intentProcessService;
-    @Resource(name = "formatIntentInputManagementFunction")
-    private IntentManagementFunction intentOwner;
-    @Resource(name = "CLLBusinessIntentManagementFunction")
-    private CLLBusinessIntentManagementFunction cllBusinessIntentManagementFunction;
-    Intent intent = new Intent();
-    IntentGoalBean intentGoalBean = new IntentGoalBean();
-    @Mock
-    IntentDetectionService intentDetectionService;
-    @Mock
-    IntentInvestigationService intentInvestigationService;
-    @Mock
-    IntentDefinitionService intentDefinitionService;
-    @Mock
-    IntentDistributionService intentDistributionService;
-    @Mock
-    IntentOperationService intentOperationService;
-    @Mock
-    IntentService intentService;
-
-
-    @Before
-    public void before() throws Exception {
-        intent.setIntentName("cllIntent");
-        intent.setIntentId("12345");
-        List<Expectation> expectationList = new ArrayList<>();
-
-        Expectation delivery = new Expectation();
-        delivery.setExpectationId("12345-delivery");
-        delivery.setExpectationName("deliveryExpectation");
-        delivery.setExpectationType(ExpectationType.DELIVERY);
-        ExpectationObject expectationObject = new ExpectationObject();
-        expectationObject.setObjectType(ObjectType.SLICING);
-        //expetationTarget  Context  FulfilmentInfo is empty
-        delivery.setExpectationObject(expectationObject);
-        expectationList.add(delivery);
-
-        Expectation assurance = new Expectation();
-        assurance.setExpectationId("12345-assurance");
-        assurance.setExpectationName("assuranceExpectation");
-        assurance.setExpectationType(ExpectationType.ASSURANCE);
-        ExpectationObject expectationObject1 = new ExpectationObject();
-        expectationObject1.setObjectType(ObjectType.CCVPN);
-        //expetationTarget  Context  FulfilmentInfo  is empty
-        assurance.setExpectationObject(expectationObject1);
-        expectationList.add(assurance);
-
-        intent.setIntentExpectations(expectationList);
-        intentGoalBean.setIntent(intent);
-        intentGoalBean.setIntentGoalType(IntentGoalType.CREATE);
-    }
-    @Test
-    public void testIntentProcess() {
-        intentProcessService.setIntentRole(intentOwner,cllBusinessIntentManagementFunction);
-        LinkedHashMap<IntentGoalBean, IntentManagementFunction> intentMap = new LinkedHashMap<>();
-        intentMap.put(intentGoalBean,cllBusinessIntentManagementFunction);
-        when(intentInvestigationService.investigationProcess(any())).thenReturn(intentMap);
-        IntentGoalBean intentGoalBean = new IntentGoalBean(intent, IntentGoalType.CREATE);
-        intentProcessService.intentProcess(intentGoalBean);
-        Assert.assertTrue(true);
-    }
-}
\ No newline at end of file