diff options
Diffstat (limited to 'intentanalysis/src/test/java/org')
12 files changed, 23 insertions, 27 deletions
diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/ExpectationObjectTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/ExpectationObjectTest.java index 52d8fbc..7f9ca6d 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/ExpectationObjectTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/ExpectationObjectTest.java @@ -42,7 +42,7 @@ public class ExpectationObjectTest { @Test public void testSetExpectationObjectTest() { ExpectationObject test = new ExpectationObject(); - test.setObjectType(ObjectType.OBJECT1); + test.setObjectType(ObjectType.SLICING); test.setObjectInstance(""); test.setObjectContexts(new ArrayList<>()); } diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/IntentManagementFunctionRegInfoTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/IntentManagementFunctionRegInfoTest.java index 2368077..3cc406d 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/IntentManagementFunctionRegInfoTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/IntentManagementFunctionRegInfoTest.java @@ -50,9 +50,9 @@ public class IntentManagementFunctionRegInfoTest { IntentManagementFunctionRegInfo test = new IntentManagementFunctionRegInfo(); test.setId(""); test.setDescription(""); - test.setSupportArea(new ArrayList<SupportArea>()); + test.setSupportArea(""); test.setSupportModel(""); - test.setSupportInterfaces(new ArrayList<>()); + test.setSupportInterfaces(""); test.setHandleName(""); test.setIntentFunctionType(IntentFunctionType.INTERNALFUNCTION); } diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputDecisionModuleTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputDecisionModuleTest.java index ea1717f..9050a6f 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputDecisionModuleTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputDecisionModuleTest.java @@ -58,7 +58,7 @@ public class FormatIntentInputDecisionModuleTest { delivery.setExpectationName("deliveryExpectation"); delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); - expectationObject.setObjectType(ObjectType.OBJECT1); + expectationObject.setObjectType(ObjectType.SLICING); //expetationTarget Context FulfilmentInfo is empty delivery.setExpectationObject(expectationObject); expectationList.add(delivery); @@ -68,7 +68,7 @@ public class FormatIntentInputDecisionModuleTest { assurance.setExpectationName("assuranceExpectation"); assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); - expectationObject1.setObjectType(ObjectType.OBJECT2); + expectationObject1.setObjectType(ObjectType.CCVPN); //expetationTarget Context FulfilmentInfo is empty assurance.setExpectationObject(expectationObject1); expectationList.add(assurance); diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputKnowledgeModuleTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputKnowledgeModuleTest.java index eae144e..9b2a6c4 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputKnowledgeModuleTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputKnowledgeModuleTest.java @@ -61,7 +61,7 @@ public class FormatIntentInputKnowledgeModuleTest { delivery.setExpectationName("deliveryExpectation"); delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); - expectationObject.setObjectType(ObjectType.OBJECT1); + expectationObject.setObjectType(ObjectType.SLICING); //expetationTarget Context FulfilmentInfo is empty delivery.setExpectationObject(expectationObject); List<ExpectationTarget> expectationTargets = new ArrayList<>(); @@ -76,7 +76,7 @@ public class FormatIntentInputKnowledgeModuleTest { assurance.setExpectationName("assuranceExpectation"); assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); - expectationObject1.setObjectType(ObjectType.OBJECT2); + expectationObject1.setObjectType(ObjectType.CCVPN); //expetationTarget Context FulfilmentInfo is empty assurance.setExpectationObject(expectationObject1); 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 index 1394f50..6aaeb02 100644 --- 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 @@ -65,7 +65,7 @@ public class IntentDefinitionServiceTest { delivery.setExpectationName("deliveryExpectation"); delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); - expectationObject.setObjectType(ObjectType.OBJECT1); + expectationObject.setObjectType(ObjectType.SLICING); //expetationTarget Context FulfilmentInfo is empty delivery.setExpectationObject(expectationObject); expectationList.add(delivery); @@ -75,7 +75,7 @@ public class IntentDefinitionServiceTest { assurance.setExpectationName("assuranceExpectation"); assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); - expectationObject1.setObjectType(ObjectType.OBJECT2); + expectationObject1.setObjectType(ObjectType.CCVPN); //expetationTarget Context FulfilmentInfo is empty assurance.setExpectationObject(expectationObject1); expectationList.add(assurance); 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 index fa67cf2..1957c63 100644 --- 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 @@ -60,7 +60,7 @@ public class IntentDetectionServiceTest { delivery.setExpectationName("deliveryExpectation"); delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); - expectationObject.setObjectType(ObjectType.OBJECT1); + expectationObject.setObjectType(ObjectType.SLICING); //expetationTarget Context FulfilmentInfo is empty delivery.setExpectationObject(expectationObject); expectationList.add(delivery); @@ -70,7 +70,7 @@ public class IntentDetectionServiceTest { assurance.setExpectationName("assuranceExpectation"); assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); - expectationObject1.setObjectType(ObjectType.OBJECT2); + expectationObject1.setObjectType(ObjectType.CCVPN); //expetationTarget Context FulfilmentInfo is empty assurance.setExpectationObject(expectationObject1); expectationList.add(assurance); 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 index 882770c..6453048 100644 --- 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 @@ -63,7 +63,7 @@ public class IntentDistributionServiceTest { delivery.setExpectationName("deliveryExpectation"); delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); - expectationObject.setObjectType(ObjectType.OBJECT1); + expectationObject.setObjectType(ObjectType.SLICING); //expetationTarget Context FulfilmentInfo is empty delivery.setExpectationObject(expectationObject); expectationList.add(delivery); @@ -73,7 +73,7 @@ public class IntentDistributionServiceTest { assurance.setExpectationName("assuranceExpectation"); assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); - expectationObject1.setObjectType(ObjectType.OBJECT2); + expectationObject1.setObjectType(ObjectType.CCVPN); //expetationTarget Context FulfilmentInfo is empty assurance.setExpectationObject(expectationObject1); expectationList.add(assurance); 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 index ea0bf7a..774325e 100644 --- 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 @@ -64,7 +64,7 @@ public class IntentInvestigationServiceTest { delivery.setExpectationName("deliveryExpectation"); delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); - expectationObject.setObjectType(ObjectType.OBJECT1); + expectationObject.setObjectType(ObjectType.SLICING); //expetationTarget Context FulfilmentInfo is empty delivery.setExpectationObject(expectationObject); expectationList.add(delivery); @@ -74,7 +74,7 @@ public class IntentInvestigationServiceTest { assurance.setExpectationName("assuranceExpectation"); assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); - expectationObject1.setObjectType(ObjectType.OBJECT2); + expectationObject1.setObjectType(ObjectType.CCVPN); //expetationTarget Context FulfilmentInfo is empty assurance.setExpectationObject(expectationObject1); expectationList.add(assurance); 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 index a806fb3..f52cfa3 100644 --- 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 @@ -61,7 +61,7 @@ public class IntentOperationServiceTest { delivery.setExpectationName("deliveryExpectation"); delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); - expectationObject.setObjectType(ObjectType.OBJECT1); + expectationObject.setObjectType(ObjectType.SLICING); //expetationTarget Context FulfilmentInfo is empty delivery.setExpectationObject(expectationObject); expectationList.add(delivery); @@ -71,7 +71,7 @@ public class IntentOperationServiceTest { assurance.setExpectationName("assuranceExpectation"); assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); - expectationObject1.setObjectType(ObjectType.OBJECT2); + expectationObject1.setObjectType(ObjectType.CCVPN); //expetationTarget Context FulfilmentInfo is empty assurance.setExpectationObject(expectationObject1); expectationList.add(assurance); 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 index d58652c..c9a42d7 100644 --- 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 @@ -79,7 +79,7 @@ public class IntentProcessServiceTest { delivery.setExpectationName("deliveryExpectation"); delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); - expectationObject.setObjectType(ObjectType.OBJECT1); + expectationObject.setObjectType(ObjectType.SLICING); //expetationTarget Context FulfilmentInfo is empty delivery.setExpectationObject(expectationObject); expectationList.add(delivery); @@ -89,7 +89,7 @@ public class IntentProcessServiceTest { assurance.setExpectationName("assuranceExpectation"); assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); - expectationObject1.setObjectType(ObjectType.OBJECT2); + expectationObject1.setObjectType(ObjectType.CCVPN); //expetationTarget Context FulfilmentInfo is empty assurance.setExpectationObject(expectationObject1); expectationList.add(assurance); 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 c7dcee1..41f96cb 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 @@ -32,7 +32,7 @@ class ExpectationObjectServiceTest extends AbstractJUnit4SpringContextTests { public ExpectationObject createTestObject(String testName) { ExpectationObject expectationObject = new ExpectationObject(); - expectationObject.setObjectType(ObjectType.OBJECT1); + expectationObject.setObjectType(ObjectType.SLICING); expectationObject.setObjectInstance("true"); List<Context> contextList = new ArrayList<>(); @@ -99,7 +99,7 @@ class ExpectationObjectServiceTest extends AbstractJUnit4SpringContextTests { @Test void testUpdateExpectationObjectToNullSuccess() { ExpectationObject expectationObject = new ExpectationObject(); - expectationObject.setObjectType(ObjectType.OBJECT2); + expectationObject.setObjectType(ObjectType.CCVPN); try { expectationObjectService.updateExpectationObject(expectationObject, TEST_EXPECTATION_ID_2); diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/impl/ImfRegInfoServiceImplTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/impl/ImfRegInfoServiceImplTest.java index 3606eea..4067b4f 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/impl/ImfRegInfoServiceImplTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/impl/ImfRegInfoServiceImplTest.java @@ -73,13 +73,9 @@ public class ImfRegInfoServiceImplTest { public void itCanGetImfRegInfoListWithIntentGoalBean() { List<IntentManagementFunctionRegInfo> list = new ArrayList<>(); IntentManagementFunctionRegInfo info = new IntentManagementFunctionRegInfo(); - List<SupportArea> areas = new ArrayList<>(); - areas.add(SupportArea.CLLBUSINESS); - info.setSupportArea(areas); + info.setSupportArea("CLLBUSINESS"); - List<SupportInterface> interList = new ArrayList<>(); - interList.add(SupportInterface.CREATE); - info.setSupportInterfaces(interList); + info.setSupportInterfaces("CREATE"); list.add(info); |