diff options
Diffstat (limited to 'intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service')
4 files changed, 10 insertions, 7 deletions
diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/ExpectationObjectServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/ExpectationObjectServiceTest.java index eb530d5..70ea564 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/ExpectationObjectServiceTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/ExpectationObjectServiceTest.java @@ -19,6 +19,7 @@ package org.onap.usecaseui.intentanalysis.service; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.junit.Assert; import org.junit.jupiter.api.BeforeEach; @@ -51,7 +52,7 @@ class ExpectationObjectServiceTest extends AbstractJUnit4SpringContextTests { public ExpectationObject createTestObject(String testName) { ExpectationObject expectationObject = new ExpectationObject(); expectationObject.setObjectType(ObjectType.SLICING); - expectationObject.setObjectInstance("true"); + expectationObject.setObjectInstance(Collections.singletonList("true")); List<Context> contextList = new ArrayList<>(); Context context = new Context(); diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/ExpectationServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/ExpectationServiceTest.java index 7539b6c..c4e77e8 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/ExpectationServiceTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/ExpectationServiceTest.java @@ -19,6 +19,7 @@ package org.onap.usecaseui.intentanalysis.service; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.junit.Assert; import org.junit.jupiter.api.BeforeEach; @@ -66,7 +67,7 @@ class ExpectationServiceTest extends AbstractJUnit4SpringContextTests { ExpectationObject object = new ExpectationObject(); object.setObjectType(ObjectType.valueOf("SLICING")); - object.setObjectInstance("objectInstance"); + object.setObjectInstance(Collections.singletonList("objectInstance")); Condition targetCondition = new Condition(); targetCondition.setConditionId(testName + "-conditionId"); diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/IntentServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/IntentServiceTest.java index f1003f0..908e7d8 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/IntentServiceTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/IntentServiceTest.java @@ -16,6 +16,7 @@ package org.onap.usecaseui.intentanalysis.service; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.junit.Assert; @@ -77,7 +78,7 @@ public class IntentServiceTest extends AbstractJUnit4SpringContextTests { List<ExpectationTarget> expectationTargetList = new ArrayList<>(); expectationTargetList.add(target1); object1.setObjectType(ObjectType.valueOf("SLICING")); - object1.setObjectInstance("objectInstance"); + object1.setObjectInstance(Collections.singletonList("objectInstance")); expectation1.setExpectationId("expectationId"); expectation1.setExpectationName("expectationName"); expectation1.setExpectationType(ExpectationType.valueOf("DELIVERY")); @@ -137,7 +138,7 @@ public class IntentServiceTest extends AbstractJUnit4SpringContextTests { Expectation expectation = expectationList.get(0); expectation.setExpectationName("new expectation name"); ExpectationObject expectationObject = expectation.getExpectationObject(); - expectationObject.setObjectInstance("new object instance"); + expectationObject.setObjectInstance(Collections.singletonList("new object instance")); expectation.setExpectationObject(expectationObject); List<ExpectationTarget> expectationTargetList = expectation.getExpectationTargets(); ExpectationTarget expectationTarget = expectationTargetList.get(0); diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/impl/IntentReportServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/impl/IntentReportServiceTest.java index da9c794..d195d7f 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/impl/IntentReportServiceTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/impl/IntentReportServiceTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests; import org.onap.usecaseui.intentanalysis.bean.models.*; -import org.onap.usecaseui.intentanalysis.mapper.ExpectationObjectMapper; +import org.onap.usecaseui.intentanalysis.mapper.ObjectInstanceMapper; import org.onap.usecaseui.intentanalysis.service.IntentReportService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -41,11 +41,11 @@ public class IntentReportServiceTest { ComponentNotificationServiceImpl componentNotificationService; @Autowired - private ExpectationObjectMapper expectationObjectMapper; + private ObjectInstanceMapper objectInstanceMapper; @Test public void getIntentReportByIntentIdTest() { - List<String> allObjectInstances = expectationObjectMapper.getAllObjectInstances(); + List<String> allObjectInstances = objectInstanceMapper.queryAllObjectInstances(); List<String> cll = new ArrayList<>(); for (String target : allObjectInstances) { if (target != null && target.contains("cll")) { |