diff options
7 files changed, 496 insertions, 15 deletions
diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutor.java b/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutor.java index 5086259a8..bdf6b1363 100644 --- a/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutor.java +++ b/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutor.java @@ -98,11 +98,7 @@ public class MvelStateFinalizerExecutor extends StateFinalizerExecutor { executePost(returnValue); // Send back the return event - if (returnValue) { - return getOutgoing(); - } else { - return null; - } + return getOutgoing(); } /** diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutor.java b/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutor.java index 457539411..1a3611854 100644 --- a/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutor.java +++ b/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutor.java @@ -97,11 +97,7 @@ public class MvelTaskExecutor extends TaskExecutor { executePost(returnValue); // Send back the return event - if (returnValue) { - return getOutgoing(); - } else { - return null; - } + return getOutgoing(); } /** diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutor.java b/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutor.java index b07c5e260..f17f1b9ad 100644 --- a/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutor.java +++ b/plugins/plugins-executor/plugins-executor-mvel/src/main/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutor.java @@ -99,11 +99,7 @@ public class MvelTaskSelectExecutor extends TaskSelectExecutor { executePost(returnValue); // Send back the return event - if (returnValue) { - return getOutgoing(); - } else { - return null; - } + return getOutgoing(); } /** diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelExecutorParametersTest.java b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelExecutorParametersTest.java new file mode 100644 index 000000000..987af43a4 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelExecutorParametersTest.java @@ -0,0 +1,36 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Ericsson. 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.plugins.executor.mvel; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; + +/** + * Test the MvelExecutorParameters class. + */ +public class MvelExecutorParametersTest { + + @Test + public void testJavaExecutorParameters() { + assertNotNull(new MvelExecutorParameters()); + } +} diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutorTest.java b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutorTest.java new file mode 100644 index 000000000..ac2503182 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelStateFinalizerExecutorTest.java @@ -0,0 +1,177 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Ericsson. 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.plugins.executor.mvel; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.onap.policy.apex.context.ContextException; +import org.onap.policy.apex.context.parameters.ContextParameterConstants; +import org.onap.policy.apex.context.parameters.DistributorParameters; +import org.onap.policy.apex.context.parameters.LockManagerParameters; +import org.onap.policy.apex.context.parameters.PersistorParameters; +import org.onap.policy.apex.core.engine.EngineParameterConstants; +import org.onap.policy.apex.core.engine.EngineParameters; +import org.onap.policy.apex.core.engine.context.ApexInternalContext; +import org.onap.policy.apex.core.engine.event.EnEvent; +import org.onap.policy.apex.core.engine.executor.StateExecutor; +import org.onap.policy.apex.core.engine.executor.exception.StateMachineException; +import org.onap.policy.apex.core.engine.executor.impl.ExecutorFactoryImpl; +import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; +import org.onap.policy.apex.model.eventmodel.concepts.AxEvent; +import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; +import org.onap.policy.apex.model.policymodel.concepts.AxState; +import org.onap.policy.apex.model.policymodel.concepts.AxStateFinalizerLogic; +import org.onap.policy.common.parameters.ParameterService; +import org.slf4j.ext.XLogger; +import org.slf4j.ext.XLoggerFactory; + +/** + * Test the MvelStateFinalizerExecutor class. + * + */ +public class MvelStateFinalizerExecutorTest { + + private static final XLogger LOGGER = XLoggerFactory.getXLogger(MvelStateFinalizerExecutorTest.class); + /** + * Initiate Parameters. + */ + @Before + public void initiateParameters() { + ParameterService.register(new DistributorParameters()); + ParameterService.register(new LockManagerParameters()); + ParameterService.register(new PersistorParameters()); + ParameterService.register(new EngineParameters()); + } + + /** + * Clear down Parameters. + */ + @After + public void clearParameters() { + ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.PERSISTENCE_GROUP_NAME); + ParameterService.deregister(EngineParameterConstants.MAIN_GROUP_NAME); + } + + @Test + public void testJavaStateFinalizerExecutor() { + MvelStateFinalizerExecutor msfe = new MvelStateFinalizerExecutor(); + assertNotNull(msfe); + + try { + msfe.prepare(); + fail("test should throw an exception here"); + } catch (Exception msfeException) { + assertEquals(java.lang.NullPointerException.class, msfeException.getClass()); + } + + ApexInternalContext internalContext = null; + try { + internalContext = new ApexInternalContext(new AxPolicyModel()); + } catch (ContextException e) { + fail("test should not throw an exception here"); + } + + StateExecutor parentStateExcutor = null; + try { + parentStateExcutor = new StateExecutor(new ExecutorFactoryImpl()); + } catch (StateMachineException e) { + fail("test should not throw an exception here"); + } + + AxState state = new AxState(); + parentStateExcutor.setContext(null, state, internalContext); + AxStateFinalizerLogic stateFinalizerLogic = new AxStateFinalizerLogic(); + msfe.setContext(parentStateExcutor, stateFinalizerLogic, internalContext); + + stateFinalizerLogic.setLogic("x > 1 2 ()"); + try { + msfe.prepare(); + fail("test should throw an exception here"); + } catch (Exception msfeException) { + assertEquals("failed to compile MVEL code for state NULL:0.0.0:NULL:NULL", msfeException.getMessage()); + } + + stateFinalizerLogic.setLogic("java.lang.String"); + + try { + msfe.prepare(); + } catch (Exception msfeException) { + fail("test should not throw an exception here"); + } + + try { + msfe.execute(-1, null); + fail("test should throw an exception here"); + } catch (Exception msfeException) { + assertEquals("failed to execute MVEL code for state NULL:0.0.0:NULL:NULL", + msfeException.getMessage()); + } + + AxEvent axEvent = new AxEvent(new AxArtifactKey("Event", "0.0.1")); + EnEvent event = new EnEvent(axEvent); + try { + msfe.execute(-1, event); + fail("test should throw an exception here"); + } catch (Exception msfeException) { + assertEquals("failed to execute MVEL code for state NULL:0.0.0:NULL:NULL", + msfeException.getMessage()); + } + + stateFinalizerLogic.setLogic("executionId !=-1"); + try { + msfe.prepare(); + msfe.execute(-1, event); + fail("test should throw an exception here"); + } catch (Exception msfeException) { + assertEquals( + "execute-post: state finalizer logic execution failure on state \"NULL:0.0.0:NULL:NULL\" " + + "on finalizer logic NULL:0.0.0:NULL:NULL", + msfeException.getMessage()); + } + + stateFinalizerLogic.setLogic( + "if (executionId == -1) {return false;}setSelectedStateOutputName(\"SelectedOutputIsMe\");" + + "return true;"); + state.getStateOutputs().put("SelectedOutputIsMe", null); + try { + msfe.prepare(); + String stateOutput = msfe.execute(0, event); + assertEquals("SelectedOutputIsMe", stateOutput); + } catch (Exception msfeException) { + LOGGER.warn("Unexpected exception happened here.", msfeException); + fail("test should not throw an exception here"); + } finally { + try { + msfe.cleanUp(); + } catch (StateMachineException msfeException) { + LOGGER.warn("Unexpected exception happened here.", msfeException); + fail("test should not throw an exception here"); + } + } + } +} diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutorTest.java b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutorTest.java new file mode 100644 index 000000000..5d65a4bb8 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskExecutorTest.java @@ -0,0 +1,139 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Ericsson. 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.plugins.executor.mvel; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import java.util.HashMap; +import java.util.Map; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.onap.policy.apex.context.ContextException; +import org.onap.policy.apex.context.parameters.ContextParameterConstants; +import org.onap.policy.apex.context.parameters.DistributorParameters; +import org.onap.policy.apex.context.parameters.LockManagerParameters; +import org.onap.policy.apex.context.parameters.PersistorParameters; +import org.onap.policy.apex.core.engine.context.ApexInternalContext; +import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; +import org.onap.policy.apex.model.policymodel.concepts.AxTask; +import org.onap.policy.common.parameters.ParameterService; + +/** + * Test the MvelTaskExecutor class. + * + */ +public class MvelTaskExecutorTest { + /** + * Initiate Parameters. + */ + @Before + public void initiateParameters() { + ParameterService.register(new DistributorParameters()); + ParameterService.register(new LockManagerParameters()); + ParameterService.register(new PersistorParameters()); + } + + /** + * Clear Parameters. + */ + @After + public void clearParameters() { + ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.PERSISTENCE_GROUP_NAME); + } + + @Test + public void testMvelTaskExecutor() { + MvelTaskExecutor mte = new MvelTaskExecutor(); + assertNotNull(mte); + + try { + mte.prepare(); + fail("test should throw an exception here"); + } catch (Exception mteException) { + assertEquals(java.lang.NullPointerException.class, mteException.getClass()); + } + + AxTask task = new AxTask(); + ApexInternalContext internalContext = null; + try { + internalContext = new ApexInternalContext(new AxPolicyModel()); + } catch (ContextException e) { + fail("test should not throw an exception here"); + } + mte.setContext(null, task, internalContext); + + task.getTaskLogic().setLogic("x > 1 2 ()"); + try { + mte.prepare(); + fail("test should throw an exception here"); + } catch (Exception mteException) { + assertEquals("failed to compile MVEL code for task NULL:0.0.0", mteException.getMessage()); + } + + task.getTaskLogic().setLogic("x"); + + try { + mte.prepare(); + } catch (Exception mteException) { + fail("test should not throw an exception here"); + } + + try { + mte.execute(-1, null); + fail("test should throw an exception here"); + } catch (Exception mteException) { + assertEquals(java.lang.NullPointerException.class, mteException.getClass()); + } + + Map<String, Object> incomingParameters = new HashMap<>(); + try { + mte.execute(-1, incomingParameters); + fail("test should throw an exception here"); + } catch (Exception mteException) { + assertEquals("failed to execute MVEL code for task NULL:0.0.0", mteException.getMessage()); + } + + task.getTaskLogic().setLogic("executionId != -1"); + try { + mte.prepare(); + mte.execute(-1, incomingParameters); + fail("test should throw an exception here"); + } catch (Exception mteException) { + assertEquals("execute-post: task logic execution failure on task \"NULL\" in model NULL:0.0.0", + mteException.getMessage()); + } + + try { + mte.prepare(); + Map<String, Object> returnMap = mte.execute(0, incomingParameters); + assertEquals(0, returnMap.size()); + mte.cleanUp(); + } catch (Exception mteException) { + fail("test should not throw an exception here"); + } + } +} diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutorTest.java b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutorTest.java new file mode 100644 index 000000000..7c585ee2f --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-mvel/src/test/java/org/onap/policy/apex/plugins/executor/mvel/MvelTaskSelectExecutorTest.java @@ -0,0 +1,141 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Ericsson. 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.plugins.executor.mvel; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.onap.policy.apex.context.ContextException; +import org.onap.policy.apex.context.parameters.ContextParameterConstants; +import org.onap.policy.apex.context.parameters.DistributorParameters; +import org.onap.policy.apex.context.parameters.LockManagerParameters; +import org.onap.policy.apex.context.parameters.PersistorParameters; +import org.onap.policy.apex.core.engine.context.ApexInternalContext; +import org.onap.policy.apex.core.engine.event.EnEvent; +import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; +import org.onap.policy.apex.model.eventmodel.concepts.AxEvent; +import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; +import org.onap.policy.apex.model.policymodel.concepts.AxState; +import org.onap.policy.common.parameters.ParameterService; + +/** + * Test the MvelTaskSelectExecutor class. + * + */ +public class MvelTaskSelectExecutorTest { + /** + * Initiate Parameters. + */ + @Before + public void initiateParameters() { + ParameterService.register(new DistributorParameters()); + ParameterService.register(new LockManagerParameters()); + ParameterService.register(new PersistorParameters()); + } + + /** + * Clear Parameters. + */ + @After + public void clearParameters() { + ParameterService.deregister(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.LOCKING_GROUP_NAME); + ParameterService.deregister(ContextParameterConstants.PERSISTENCE_GROUP_NAME); + } + + @Test + public void testJavaTaskSelectExecutor() { + MvelTaskSelectExecutor mtse = new MvelTaskSelectExecutor(); + assertNotNull(mtse); + + try { + mtse.prepare(); + fail("test should throw an exception here"); + } catch (Exception mtseException) { + assertEquals(java.lang.NullPointerException.class, mtseException.getClass()); + } + + AxState state = new AxState(); + ApexInternalContext internalContext = null; + try { + internalContext = new ApexInternalContext(new AxPolicyModel()); + } catch (ContextException e) { + fail("test should not throw an exception here"); + } + mtse.setContext(null, state, internalContext); + + state.getTaskSelectionLogic().setLogic("x > 1 2 ()"); + try { + mtse.prepare(); + fail("test should throw an exception here"); + } catch (Exception mtseException) { + assertEquals("failed to compile MVEL code for state NULL:0.0.0:NULL:NULL", mtseException.getMessage()); + } + + state.getTaskSelectionLogic().setLogic("java.lang.String"); + + try { + mtse.prepare(); + } catch (Exception mtseException) { + fail("test should not throw an exception here"); + } + + try { + mtse.execute(-1, null); + fail("test should throw an exception here"); + } catch (Exception mtseException) { + assertEquals(java.lang.NullPointerException.class, mtseException.getClass()); + } + + AxEvent axEvent = new AxEvent(new AxArtifactKey("Event", "0.0.1")); + EnEvent event = new EnEvent(axEvent); + try { + mtse.execute(-1, event); + fail("test should throw an exception here"); + } catch (Exception mtseException) { + assertEquals("failed to execute MVEL code for state NULL:0.0.0:NULL:NULL", + mtseException.getMessage()); + } + + state.getTaskSelectionLogic().setLogic("executionId != -1"); + try { + mtse.prepare(); + mtse.execute(-1, event); + fail("test should throw an exception here"); + } catch (Exception mtseException) { + assertEquals("execute-post: task selection logic failed on state \"NULL:0.0.0:NULL:NULL\"", + mtseException.getMessage()); + } + + try { + mtse.prepare(); + AxArtifactKey taskKey = mtse.execute(0, event); + assertEquals("NULL:0.0.0", taskKey.getId()); + mtse.cleanUp(); + } catch (Exception mtseException) { + fail("test should not throw an exception here"); + } + } +} |