From ce59f8d48ee369b81d67666601cb297f7688d683 Mon Sep 17 00:00:00 2001 From: xudan16 Date: Mon, 8 May 2023 16:15:05 +0800 Subject: Change all fulfilment/Fulfilment to fulfillment/Fulfillment In the previous patch, it has been changed to use fulfillment/Fulfillment. However there are still some missing. Change all to be the new word to keep it unify and avoid the confusion. Issue-ID: USECASEUI-785 Signed-off-by: xudan16 Change-Id: I5cf018248a6aba320e547c4a566ddbfab4781dae --- .../bean/models/ExpectationTargetTest.java | 4 +- .../bean/models/ExpectationTest.java | 4 +- .../bean/models/FulfillmentInfoTest.java | 50 ++++++++++++++++++++++ .../bean/models/FulfilmentInfoTest.java | 50 ---------------------- .../intentanalysis/bean/models/IntentTest.java | 4 +- .../CLLBusinessIntentManagementFunctionTest.java | 4 +- .../CLLBusinessDecisionModuleTest.java | 4 +- .../CLLDeliveryDecisionModuleTest.java | 4 +- .../FormatIntentInputManagementFunctionTest.java | 6 +-- .../FormatIntentInputDecisionModuleTest.java | 6 +-- .../FormatIntentInputKnowledgeModuleTest.java | 4 +- .../service/ExpectationServiceTest.java | 14 +++--- .../intentanalysis/service/IntentServiceTest.java | 18 ++++---- .../src/test/resources/intentdb-test-data.sql | 6 +-- .../src/test/resources/intentdb-test-init.sql | 8 ++-- 15 files changed, 93 insertions(+), 93 deletions(-) create mode 100644 intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/FulfillmentInfoTest.java delete mode 100644 intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/FulfilmentInfoTest.java (limited to 'intentanalysis/src/test') diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/ExpectationTargetTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/ExpectationTargetTest.java index e879b11..7a64302 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/ExpectationTargetTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/ExpectationTargetTest.java @@ -40,7 +40,7 @@ public class ExpectationTargetTest { test.getExpectationObject(); test.getExpectationTargets(); test.getExpectationContexts(); - test.getExpectationFulfilmentInfo(); + test.getExpectationFulfillmentInfo(); } @Test @@ -52,6 +52,6 @@ public class ExpectationTargetTest { test.setExpectationObject(new ExpectationObject()); test.setExpectationTargets(new ArrayList<>()); test.setExpectationContexts(new ArrayList<>()); - test.setExpectationFulfilmentInfo(new FulfilmentInfo()); + test.setExpectationFulfillmentInfo(new FulfillmentInfo()); } } diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/ExpectationTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/ExpectationTest.java index a3c2a09..5c87ac5 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/ExpectationTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/ExpectationTest.java @@ -38,7 +38,7 @@ public class ExpectationTest { test.getExpectationContexts(); test.getExpectationName(); test.getExpectationType(); - test.getExpectationFulfilmentInfo(); + test.getExpectationFulfillmentInfo(); test.getExpectationObject(); test.getExpectationTargets(); } @@ -51,7 +51,7 @@ public class ExpectationTest { test.setExpectationName(""); test.setExpectationTargets(new ArrayList()); test.setExpectationType(ExpectationType.ASSURANCE); - test.setExpectationFulfilmentInfo(new FulfilmentInfo()); + test.setExpectationFulfillmentInfo(new FulfillmentInfo()); test.setExpectationObject(new ExpectationObject()); } } diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/FulfillmentInfoTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/FulfillmentInfoTest.java new file mode 100644 index 0000000..307ea59 --- /dev/null +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/FulfillmentInfoTest.java @@ -0,0 +1,50 @@ +/* + * 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.bean.models; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.onap.usecaseui.intentanalysis.bean.enums.FulfillmentStatus; +import org.onap.usecaseui.intentanalysis.bean.enums.NotFulfilledState; + +public class FulfillmentInfoTest { + @Before + public void before() throws Exception { + } + + @After + public void after() throws Exception { + } + + @Test + public void testGetFulfillmentInfoTest() { + FulfillmentInfo test = new FulfillmentInfo(); + test.getFulfillmentStatus(); + test.getNotFulfilledState(); + test.getNotFulfilledReason(); + + } + + @Test + public void testSetFulfillmentInfoTest() { + FulfillmentInfo test = new FulfillmentInfo(); + test.setFulfillmentStatus(FulfillmentStatus.FULFILLED); + test.setNotFulfilledState(NotFulfilledState.ACKNOWLEDGED); + test.setNotFulfilledReason(""); + + } +} diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/FulfilmentInfoTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/FulfilmentInfoTest.java deleted file mode 100644 index 97dad76..0000000 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/FulfilmentInfoTest.java +++ /dev/null @@ -1,50 +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.bean.models; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.onap.usecaseui.intentanalysis.bean.enums.FulfilmentStatus; -import org.onap.usecaseui.intentanalysis.bean.enums.NotFulfilledState; - -public class FulfilmentInfoTest { - @Before - public void before() throws Exception { - } - - @After - public void after() throws Exception { - } - - @Test - public void testGetFulfilmentInfoTest() { - FulfilmentInfo test = new FulfilmentInfo(); - test.getFulfillmentStatus(); - test.getNotFulfilledState(); - test.getNotFulfilledReason(); - - } - - @Test - public void testSetFulfilmentInfoTest() { - FulfilmentInfo test = new FulfilmentInfo(); - test.setFulfillmentStatus(FulfilmentStatus.FULFILLED); - test.setNotFulfilledState(NotFulfilledState.ACKNOWLEDGED); - test.setNotFulfilledReason(""); - - } -} diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/IntentTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/IntentTest.java index 33609e9..65e29df 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/IntentTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/bean/models/IntentTest.java @@ -37,7 +37,7 @@ public class IntentTest { test.getIntentName(); test.getIntentExpectations(); test.getIntentContexts(); - test.getIntentFulfilmentInfo(); + test.getIntentFulfillmentInfo(); } @Test @@ -47,6 +47,6 @@ public class IntentTest { test.setIntentName(""); test.setIntentExpectations(new ArrayList()); test.setIntentContexts(new ArrayList()); - test.setIntentFulfilmentInfo(new FulfilmentInfo()); + test.setIntentFulfillmentInfo(new FulfillmentInfo()); } } 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 index 055ac2e..f8332fe 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/CLLBusinessIntentManagementFunctionTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/CLLBusinessIntentManagementFunctionTest.java @@ -92,7 +92,7 @@ public class CLLBusinessIntentManagementFunctionTest { delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); expectationObject.setObjectType(ObjectType.SLICING); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty delivery.setExpectationObject(expectationObject); expectationList.add(delivery); @@ -102,7 +102,7 @@ public class CLLBusinessIntentManagementFunctionTest { assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); expectationObject1.setObjectType(ObjectType.CCVPN); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty assurance.setExpectationObject(expectationObject1); expectationList.add(assurance); diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/cllBusinessModule/CLLBusinessDecisionModuleTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/cllBusinessModule/CLLBusinessDecisionModuleTest.java index a7a997b..d6bbe1f 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/cllBusinessModule/CLLBusinessDecisionModuleTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/cllBusinessModule/CLLBusinessDecisionModuleTest.java @@ -72,7 +72,7 @@ public class CLLBusinessDecisionModuleTest { delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); expectationObject.setObjectType(ObjectType.SLICING); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty delivery.setExpectationObject(expectationObject); expectationList.add(delivery); @@ -82,7 +82,7 @@ public class CLLBusinessDecisionModuleTest { assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); expectationObject1.setObjectType(ObjectType.CCVPN); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty assurance.setExpectationObject(expectationObject1); expectationList.add(assurance); diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryDecisionModuleTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryDecisionModuleTest.java index ce0823e..4b75322 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryDecisionModuleTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryDecisionModuleTest.java @@ -54,7 +54,7 @@ public class CLLDeliveryDecisionModuleTest { delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); expectationObject.setObjectType(ObjectType.SLICING); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty List expectationTargetList = new ArrayList<>(); ExpectationTarget expectationTarget = new ExpectationTarget(); @@ -80,7 +80,7 @@ public class CLLDeliveryDecisionModuleTest { assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); expectationObject1.setObjectType(ObjectType.CCVPN); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty assurance.setExpectationObject(expectationObject1); expectationList.add(assurance); 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 index 9aba940..483508a 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/FormatIntentInputManagementFunctionTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/FormatIntentInputManagementFunctionTest.java @@ -85,7 +85,7 @@ public class FormatIntentInputManagementFunctionTest { delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); expectationObject.setObjectType(ObjectType.SLICING); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty delivery.setExpectationObject(expectationObject); expectationList.add(delivery); @@ -95,7 +95,7 @@ public class FormatIntentInputManagementFunctionTest { assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); expectationObject1.setObjectType(ObjectType.CCVPN); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty assurance.setExpectationObject(expectationObject1); expectationList.add(assurance); @@ -156,7 +156,7 @@ public class FormatIntentInputManagementFunctionTest { delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); expectationObject.setObjectType(ObjectType.SLICING); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty delivery.setExpectationObject(expectationObject); expectationList.add(delivery); originalIntent.setIntentExpectations(expectationList); 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 f2be749..07e2835 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 @@ -59,7 +59,7 @@ public class FormatIntentInputDecisionModuleTest { delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); expectationObject.setObjectType(ObjectType.SLICING); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty delivery.setExpectationObject(expectationObject); expectationList.add(delivery); @@ -69,7 +69,7 @@ public class FormatIntentInputDecisionModuleTest { assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); expectationObject1.setObjectType(ObjectType.CCVPN); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty assurance.setExpectationObject(expectationObject1); expectationList.add(assurance); @@ -103,7 +103,7 @@ public class FormatIntentInputDecisionModuleTest { delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); expectationObject.setObjectType(ObjectType.SLICING); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty delivery.setExpectationObject(expectationObject); expectationList.add(delivery); originalIntent.setIntentExpectations(expectationList); 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 9b2a6c4..5f7ecbf 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 @@ -62,7 +62,7 @@ public class FormatIntentInputKnowledgeModuleTest { delivery.setExpectationType(ExpectationType.DELIVERY); ExpectationObject expectationObject = new ExpectationObject(); expectationObject.setObjectType(ObjectType.SLICING); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty delivery.setExpectationObject(expectationObject); List expectationTargets = new ArrayList<>(); ExpectationTarget expectationTarget = new ExpectationTarget(); @@ -77,7 +77,7 @@ public class FormatIntentInputKnowledgeModuleTest { assurance.setExpectationType(ExpectationType.ASSURANCE); ExpectationObject expectationObject1 = new ExpectationObject(); expectationObject1.setObjectType(ObjectType.CCVPN); - //expetationTarget Context FulfilmentInfo is empty + //expetationTarget Context FulfillmentInfo is empty assurance.setExpectationObject(expectationObject1); List expectationTarget2 = new ArrayList<>(); 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 6f10f10..7539b6c 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 @@ -25,7 +25,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.onap.usecaseui.intentanalysis.bean.enums.ExpectationType; -import org.onap.usecaseui.intentanalysis.bean.enums.FulfilmentStatus; +import org.onap.usecaseui.intentanalysis.bean.enums.FulfillmentStatus; import org.onap.usecaseui.intentanalysis.bean.enums.NotFulfilledState; import org.onap.usecaseui.intentanalysis.bean.enums.ObjectType; import org.onap.usecaseui.intentanalysis.bean.enums.OperatorType; @@ -33,7 +33,7 @@ import org.onap.usecaseui.intentanalysis.bean.models.Condition; import org.onap.usecaseui.intentanalysis.bean.models.Expectation; import org.onap.usecaseui.intentanalysis.bean.models.ExpectationObject; import org.onap.usecaseui.intentanalysis.bean.models.ExpectationTarget; -import org.onap.usecaseui.intentanalysis.bean.models.FulfilmentInfo; +import org.onap.usecaseui.intentanalysis.bean.models.FulfillmentInfo; import org.onap.usecaseui.intentanalysis.exception.DataBaseException; import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests; import org.onap.usecaseui.intentanalysis.util.SpringContextUtil; @@ -83,17 +83,17 @@ class ExpectationServiceTest extends AbstractJUnit4SpringContextTests { List expectationTargetList = new ArrayList<>(); expectationTargetList.add(target); - FulfilmentInfo expectationFulfilmentInfo = new FulfilmentInfo(); - expectationFulfilmentInfo.setFulfillmentStatus(FulfilmentStatus.valueOf("NOT_FULFILLED")); - expectationFulfilmentInfo.setNotFulfilledReason("NotFulfilledReason"); - expectationFulfilmentInfo.setNotFulfilledState(NotFulfilledState.valueOf("COMPLIANT")); + FulfillmentInfo expectationFulfillmentInfo = new FulfillmentInfo(); + expectationFulfillmentInfo.setFulfillmentStatus(FulfillmentStatus.valueOf("NOT_FULFILLED")); + expectationFulfillmentInfo.setNotFulfilledReason("NotFulfilledReason"); + expectationFulfillmentInfo.setNotFulfilledState(NotFulfilledState.valueOf("COMPLIANT")); expectation.setExpectationId(testName + "-expectationId"); expectation.setExpectationName(testName + "expectationName"); expectation.setExpectationType(ExpectationType.valueOf("DELIVERY")); expectation.setExpectationObject(object); expectation.setExpectationTargets(expectationTargetList); - expectation.setExpectationFulfilmentInfo(expectationFulfilmentInfo); + expectation.setExpectationFulfillmentInfo(expectationFulfillmentInfo); return expectation; } 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 310c8c9..f1003f0 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 @@ -25,7 +25,7 @@ import org.junit.runner.RunWith; import org.onap.usecaseui.intentanalysis.bean.enums.*; import org.onap.usecaseui.intentanalysis.bean.models.Intent; import org.onap.usecaseui.intentanalysis.bean.models.Condition; -import org.onap.usecaseui.intentanalysis.bean.models.FulfilmentInfo; +import org.onap.usecaseui.intentanalysis.bean.models.FulfillmentInfo; import org.onap.usecaseui.intentanalysis.bean.models.Context; import org.onap.usecaseui.intentanalysis.bean.models.Expectation; import org.onap.usecaseui.intentanalysis.bean.models.ExpectationTarget; @@ -63,7 +63,7 @@ public class IntentServiceTest extends AbstractJUnit4SpringContextTests { ExpectationTarget target1 = new ExpectationTarget(); ExpectationObject object1 = new ExpectationObject(); Context intentContext = new Context(); - FulfilmentInfo intentFulfilmentInfo = new FulfilmentInfo(); + FulfillmentInfo intentFulfillmentInfo = new FulfillmentInfo(); Condition targetCondition1 = new Condition(); targetCondition1.setConditionId("conditionId"); targetCondition1.setConditionName("conditionName"); @@ -89,14 +89,14 @@ public class IntentServiceTest extends AbstractJUnit4SpringContextTests { intentContext.setContextName("intentContextName"); List intentContextList = new ArrayList<>(); intentContextList.add(intentContext); - intentFulfilmentInfo.setFulfillmentStatus(FulfilmentStatus.valueOf("NOT_FULFILLED")); - intentFulfilmentInfo.setNotFulfilledReason("NotFulfilledReason"); - intentFulfilmentInfo.setNotFulfilledState(NotFulfilledState.valueOf("COMPLIANT")); + intentFulfillmentInfo.setFulfillmentStatus(FulfillmentStatus.valueOf("NOT_FULFILLED")); + intentFulfillmentInfo.setNotFulfilledReason("NotFulfilledReason"); + intentFulfillmentInfo.setNotFulfilledState(NotFulfilledState.valueOf("COMPLIANT")); intent.setIntentId("testIntentId"); intent.setIntentName("testIntentName"); intent.setIntentContexts(intentContextList); intent.setIntentExpectations(expectationList); - intent.setIntentFulfilmentInfo(intentFulfilmentInfo); + intent.setIntentFulfillmentInfo(intentFulfillmentInfo); Intent intentTmp = intentService.createIntent(intent); Assert.assertNotNull(intentTmp); @@ -130,9 +130,9 @@ public class IntentServiceTest extends AbstractJUnit4SpringContextTests { intentContext.setContextName("new context name"); contextList.set(0, intentContext); intent.setIntentContexts(contextList); - FulfilmentInfo intentFulfilmentInfo = intent.getIntentFulfilmentInfo(); - intentFulfilmentInfo.setNotFulfilledReason("new reason"); - intent.setIntentFulfilmentInfo(intentFulfilmentInfo); + FulfillmentInfo intentFulfillmentInfo = intent.getIntentFulfillmentInfo(); + intentFulfillmentInfo.setNotFulfilledReason("new reason"); + intent.setIntentFulfillmentInfo(intentFulfillmentInfo); List expectationList = intent.getIntentExpectations(); Expectation expectation = expectationList.get(0); expectation.setExpectationName("new expectation name"); diff --git a/intentanalysis/src/test/resources/intentdb-test-data.sql b/intentanalysis/src/test/resources/intentdb-test-data.sql index 4a1f120..1105411 100644 --- a/intentanalysis/src/test/resources/intentdb-test-data.sql +++ b/intentanalysis/src/test/resources/intentdb-test-data.sql @@ -94,11 +94,11 @@ MERGE INTO context (context_id, context_name, parent_id) KEY (context_id) values ('72f6c546-f234-4be5-a2fe-5740139e20cb', 'intentContextName', 'intentId2'); -- ---------------------------- --- Records of fulfilment_info +-- Records of fulfillment_info -- ---------------------------- -MERGE INTO fulfilment_info (fulfilment_info_id, fulfilment_info_status, not_fulfilled_state, not_fulfilled_reason) KEY (fulfilment_info_id) +MERGE INTO fulfillment_info (fulfillment_info_id, fulfillment_info_status, not_fulfilled_state, not_fulfilled_reason) KEY (fulfillment_info_id) values ('intentId1', 'NOT_FULFILLED', 'COMPLIANT', 'NotFulfilledReason'); -MERGE INTO fulfilment_info (fulfilment_info_id, fulfilment_info_status, not_fulfilled_state, not_fulfilled_reason) KEY (fulfilment_info_id) +MERGE INTO fulfillment_info (fulfillment_info_id, fulfillment_info_status, not_fulfilled_state, not_fulfilled_reason) KEY (fulfillment_info_id) values ('intentId2', 'NOT_FULFILLED', 'COMPLIANT', 'NotFulfilledReason'); diff --git a/intentanalysis/src/test/resources/intentdb-test-init.sql b/intentanalysis/src/test/resources/intentdb-test-init.sql index d53f04c..1741585 100644 --- a/intentanalysis/src/test/resources/intentdb-test-init.sql +++ b/intentanalysis/src/test/resources/intentdb-test-init.sql @@ -21,7 +21,7 @@ DROP TABLE IF EXISTS expectation; DROP TABLE IF EXISTS expectation_object; DROP TABLE IF EXISTS expectation_target; DROP TABLE IF EXISTS context; -DROP TABLE IF EXISTS fulfilment_info; +DROP TABLE IF EXISTS fulfillment_info; DROP TABLE IF EXISTS condition; create table if not exists intent @@ -62,10 +62,10 @@ create table if not exists context parent_id varchar(255) ); -create table if not exists fulfilment_info +create table if not exists fulfillment_info ( - fulfilment_info_id varchar(255) primary key, - fulfilment_info_status varchar(255), + fulfillment_info_id varchar(255) primary key, + fulfillment_info_status varchar(255), not_fulfilled_state varchar(255), not_fulfilled_reason varchar(255) ); -- cgit 1.2.3-korg