diff options
7 files changed, 416 insertions, 15 deletions
diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutor.java b/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutor.java index aaccbebab..5c62cf8b0 100644 --- a/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutor.java +++ b/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutor.java @@ -99,11 +99,7 @@ public class JrubyStateFinalizerExecutor 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-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutor.java b/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutor.java index 8019259bd..8d2ccffe1 100644 --- a/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutor.java +++ b/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutor.java @@ -99,11 +99,7 @@ public class JrubyTaskExecutor 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-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutor.java b/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutor.java index 0e239f7bc..02ae0d8e4 100644 --- a/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutor.java +++ b/plugins/plugins-executor/plugins-executor-jruby/src/main/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutor.java @@ -100,11 +100,7 @@ public class JrubyTaskSelectExecutor 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-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyExecutorParametersTest.java b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyExecutorParametersTest.java new file mode 100644 index 000000000..6e35aafb3 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyExecutorParametersTest.java @@ -0,0 +1,34 @@ +/*-
+ * ============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.jruby;
+
+import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
+
+/**
+ * Test the JrubyExecutorParameters class.
+ */
+public class JrubyExecutorParametersTest {
+ @Test
+ public void testJrubyExecutorParameters() {
+ assertNotNull(new JrubyExecutorParameters());
+ }
+}
diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutorTest.java b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutorTest.java new file mode 100644 index 000000000..1c2ea1cd6 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyStateFinalizerExecutorTest.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.jruby;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import java.lang.reflect.Field;
+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;
+
+/**
+ * Test the JrubyStateFinalizerExecutor class.
+ *
+ */
+public class JrubyStateFinalizerExecutorTest {
+ /**
+ * 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 testJrubyStateFinalizerExecutor() {
+ JrubyStateFinalizerExecutor jsfe = new JrubyStateFinalizerExecutor();
+ assertNotNull(jsfe);
+
+ try {
+ Field fieldContainer = JrubyStateFinalizerExecutor.class.getDeclaredField("container");
+ fieldContainer.setAccessible(true);
+ fieldContainer.set(jsfe, null);
+ jsfe.prepare();
+ fail("test should throw an exception here");
+ } catch (Exception jtseException) {
+ assertEquals(java.lang.NullPointerException.class, jtseException.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();
+ jsfe.setContext(parentStateExcutor, stateFinalizerLogic, internalContext);
+ try {
+ jsfe.prepare();
+ } catch (Exception jtseException) {
+ fail("test should not throw an exception here");
+ }
+
+ try {
+ jsfe.execute(-1, null);
+ fail("test should throw an exception here");
+ } catch (Exception jtseException) {
+ 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", jtseException.getMessage());
+ }
+
+ AxEvent axEvent = new AxEvent(new AxArtifactKey("Event", "0.0.1"));
+ EnEvent event = new EnEvent(axEvent);
+
+ final String jrubyLogic = "if executor.executionId == -1" + "\n return false" + "\n else "
+ + "\n executor.setSelectedStateOutputName(\"SelectedOutputIsMe\")" + "\n return true" + "\n end";
+ stateFinalizerLogic.setLogic(jrubyLogic);
+
+ state.getStateOutputs().put("SelectedOutputIsMe", null);
+ try {
+ jsfe.prepare();
+ String stateOutput = jsfe.execute(0, event);
+ assertEquals("SelectedOutputIsMe", stateOutput);
+ jsfe.cleanUp();
+ } catch (Exception jtseException) {
+ jtseException.printStackTrace();
+ fail("test should not throw an exception here");
+ }
+
+ }
+}
diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutorTest.java b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutorTest.java new file mode 100644 index 000000000..88227106b --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskExecutorTest.java @@ -0,0 +1,117 @@ +/*-
+ * ============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.jruby;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import java.lang.reflect.Field;
+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 JrubyTaskExecutor class.
+ *
+ */
+public class JrubyTaskExecutorTest {
+ /**
+ * 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 testJrubyTaskExecutor() {
+ JrubyTaskExecutor jte = new JrubyTaskExecutor();
+ assertNotNull(jte);
+ try {
+ Field fieldContainer = JrubyTaskExecutor.class.getDeclaredField("container");
+ fieldContainer.setAccessible(true);
+ fieldContainer.set(jte, null);
+ jte.prepare();
+ fail("test should throw an exception here");
+ } catch (Exception jtseException) {
+ assertEquals(java.lang.NullPointerException.class, jtseException.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");
+ }
+ jte.setContext(null, task, internalContext);
+ try {
+ jte.prepare();
+ } catch (Exception jtseException) {
+ fail("test should not throw an exception here");
+ }
+
+ Map<String, Object> incomingParameters = new HashMap<>();
+ try {
+ jte.execute(-1, incomingParameters);
+ fail("test should throw an exception here");
+ } catch (Exception jteException) {
+ assertEquals("execute-post: task logic execution failure on task \"NULL\" in model NULL:0.0.0",
+ jteException.getMessage());
+ }
+
+ final String jrubyLogic =
+ "if executor.executionId == -1" + "\n return false" + "\n else " + "\n return true" + "\n end";
+ task.getTaskLogic().setLogic(jrubyLogic);
+
+ try {
+ jte.prepare();
+ Map<String, Object> returnMap = jte.execute(0, incomingParameters);
+ assertEquals(0, returnMap.size());
+ jte.cleanUp();
+ } catch (Exception jteException) {
+ fail("test should not throw an exception here");
+ }
+ }
+}
diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutorTest.java b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutorTest.java new file mode 100644 index 000000000..3914fb530 --- /dev/null +++ b/plugins/plugins-executor/plugins-executor-jruby/src/test/java/org/onap/policy/apex/plugins/executor/jruby/JrubyTaskSelectExecutorTest.java @@ -0,0 +1,121 @@ +/*-
+ * ============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.jruby;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import java.lang.reflect.Field;
+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 JrubyTaskSelectExecutor class.
+ *
+ */
+public class JrubyTaskSelectExecutorTest {
+ /**
+ * 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 testJrubyTaskSelectExecutor() {
+ JrubyTaskSelectExecutor jtse = new JrubyTaskSelectExecutor();
+ assertNotNull(jtse);
+ assertNotNull(jtse.getOutputEventSet());
+ try {
+ Field fieldContainer = JrubyTaskSelectExecutor.class.getDeclaredField("container");
+ fieldContainer.setAccessible(true);
+ fieldContainer.set(jtse, null);
+ jtse.prepare();
+ fail("test should throw an exception here");
+ } catch (Exception jtseException) {
+ assertEquals(java.lang.NullPointerException.class, jtseException.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");
+ }
+ jtse.setContext(null, state, internalContext);
+
+
+ try {
+ jtse.prepare();
+ } catch (Exception jtseException) {
+ fail("test should not throw an exception here");
+ }
+ AxEvent axEvent = new AxEvent(new AxArtifactKey("Event", "0.0.1"));
+ EnEvent event = new EnEvent(axEvent);
+ try {
+ jtse.execute(-1, event);
+ fail("test should throw an exception here");
+ } catch (Exception jtseException) {
+ assertEquals("execute-post: task selection logic failed on state \"NULL:0.0.0:NULL:NULL\"",
+ jtseException.getMessage());
+ }
+
+ final String jrubyLogic =
+ "if executor.executionId == -1" + "\n return false" + "\n else " + "\n return true" + "\n end";
+ state.getTaskSelectionLogic().setLogic(jrubyLogic);
+
+ try {
+ jtse.prepare();
+ AxArtifactKey taskKey = jtse.execute(0, event);
+ assertEquals("NULL:0.0.0", taskKey.getId());
+ jtse.cleanUp();
+ } catch (Exception jtseException) {
+ fail("test should not throw an exception here");
+ }
+ }
+}
|