aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/plugins-executor/plugins-executor-javascript/src/test
diff options
context:
space:
mode:
authorhuaxing <huaxing.jin@est.tech>2020-06-17 13:34:10 +0800
committerLiam Fallon <liam.fallon@est.tech>2020-06-23 13:23:02 +0000
commitdb73a6835f176150be8c770f1342d7426a6169fc (patch)
tree84ff24d91ffd2b086bfd44c5cd88e21ae9b3915b /plugins/plugins-executor/plugins-executor-javascript/src/test
parent9f9f0dd271e412779c239fc941ed2424112f3459 (diff)
Remove thread in JavascriptExecutor
This change is basically a rollback of https://gerrit.onap.org/r/c/policy/apex-pdp/+/104230, with minor refactoring. The problem that 104230 tried to address was supposed to be caused by https://jira.onap.org/browse/POLICY-2463. With this rollback, apex-pdp increases performance and reduces memory usage. Issue-ID: POLICY-2572 Signed-off-by: huaxing <huaxing.jin@est.tech> Change-Id: I3a52d0ead0c1e530d218f9e3aba8b3eb5558abaf
Diffstat (limited to 'plugins/plugins-executor/plugins-executor-javascript/src/test')
-rw-r--r--plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptExecutorFullApexTest.java4
-rw-r--r--plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptExecutorTest.java321
-rw-r--r--plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptStateFinalizerExecutorTest.java59
-rw-r--r--plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskExecutorTest.java40
-rw-r--r--plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskSelectExecutorTest.java45
5 files changed, 53 insertions, 416 deletions
diff --git a/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptExecutorFullApexTest.java b/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptExecutorFullApexTest.java
index 2b1c92fd3..394126bc4 100644
--- a/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptExecutorFullApexTest.java
+++ b/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptExecutorFullApexTest.java
@@ -56,9 +56,9 @@ public class JavascriptExecutorFullApexTest {
}
private boolean fileHasOccurencesOf(final File file, final String token, final int occurenceCount)
- throws IOException {
+ throws IOException {
return occurenceCount == StringUtils.countMatches(TextFileUtils.getTextFileAsString(file.getAbsolutePath()),
- token);
+ token);
}
}
diff --git a/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptExecutorTest.java b/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptExecutorTest.java
index e45f35cf0..948fc02ed 100644
--- a/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptExecutorTest.java
+++ b/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptExecutorTest.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2020 Nordix Foundation.
+ * Copyright (C) 2020 Nordix Foundation. 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.
@@ -22,324 +22,39 @@ package org.onap.policy.apex.plugins.executor.javascript;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.awaitility.Awaitility.await;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Before;
import org.junit.Test;
import org.onap.policy.apex.core.engine.executor.exception.StateMachineException;
import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
public class JavascriptExecutorTest {
- private static final XLogger LOGGER = XLoggerFactory.getXLogger(JavascriptExecutorTest.class);
-
- private AtomicBoolean concurrentResult = new AtomicBoolean();
-
- @Before
- public void beforeSetTimeouts() {
- JavascriptExecutor.setTimeunit4Latches(TimeUnit.SECONDS);
- JavascriptExecutor.setIntializationLatchTimeout(60);
- JavascriptExecutor.setCleanupLatchTimeout(10);
- }
@Test
- public void testJavescriptExecutorConcurrencyNormal() throws StateMachineException, IOException {
- JavascriptExecutor.setTimeunit4Latches(TimeUnit.SECONDS);
- JavascriptExecutor.setIntializationLatchTimeout(60);
- JavascriptExecutor.setCleanupLatchTimeout(10);
-
- JavascriptExecutor executor = new JavascriptExecutor(new AxArtifactKey("executor:0.0.1"));
-
- assertThatThrownBy(() -> {
- executor.init(null);
- }).hasMessageMatching("^javascriptCode is marked .*on.*ull but is null$");
-
- assertThatThrownBy(() -> {
- executor.init(" ");
- }).hasMessage("initiation failed, no logic specified for executor executor:0.0.1");
-
- assertThatCode(() -> {
- executor.init("var x = 1;");
- }).doesNotThrowAnyException();
-
- assertThatThrownBy(() -> {
- executor.init("var x = 1;");
- }).hasMessage("initiation failed, executor executor:0.0.1 already initialized, run cleanUp to clear executor");
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
-
- assertThatThrownBy(() -> {
- executor.cleanUp();
- }).hasMessage("cleanup failed, executor executor:0.0.1 is not initialized");
-
- assertThatThrownBy(() -> {
- executor.execute("Hello");
- }).hasMessage("execution failed, executor executor:0.0.1 is not initialized");
-
- assertThatCode(() -> {
- executor.init("var x = 1;");
- }).doesNotThrowAnyException();
-
- assertThatThrownBy(() -> {
- executor.execute("Hello");
- }).hasMessage(
- "execute: logic for executor:0.0.1 returned a non-boolean value org.mozilla.javascript.Undefined@0");
-
- assertThatThrownBy(() -> {
- executor.execute("Hello");
- }).hasMessage(
- "execute: logic for executor:0.0.1 returned a non-boolean value org.mozilla.javascript.Undefined@0");
-
- assertThatThrownBy(() -> {
- executor.execute("Hello");
- }).hasMessage(
- "execute: logic for executor:0.0.1 returned a non-boolean value org.mozilla.javascript.Undefined@0");
-
- assertThatThrownBy(() -> {
- executor.execute("Hello");
- }).hasMessage(
- "execute: logic for executor:0.0.1 returned a non-boolean value org.mozilla.javascript.Undefined@0");
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
-
- assertThatThrownBy(() -> {
- executor.cleanUp();
- }).hasMessage("cleanup failed, executor executor:0.0.1 is not initialized");
-
- assertThatThrownBy(() -> {
- executor.execute("hello");
- }).hasMessage("execution failed, executor executor:0.0.1 is not initialized");
+ public void testReturnOK() throws StateMachineException {
+ JavascriptExecutor executor = new JavascriptExecutor(
+ new AxArtifactKey("TestTask:0.0.1"), "true;");
+ assertThatCode(() -> executor.execute(new Object()));
}
@Test
- public void testJavescriptExecutorConcurrencyLatchTimeout() throws StateMachineException, IOException {
- JavascriptExecutor.setTimeunit4Latches(TimeUnit.MICROSECONDS);
- JavascriptExecutor.setIntializationLatchTimeout(1);
- JavascriptExecutor.setCleanupLatchTimeout(10000000);
-
- JavascriptExecutor executor = new JavascriptExecutor(new AxArtifactKey("executor:0.0.1"));
-
- assertThatThrownBy(() -> {
- executor.init("var x = 1;");
- }).hasMessage("JavascriptExecutor executor:0.0.1 initiation timed out after 1 MICROSECONDS");
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
-
- JavascriptExecutor.setTimeunit4Latches(TimeUnit.SECONDS);
- JavascriptExecutor.setIntializationLatchTimeout(60);
-
- assertThatCode(() -> {
- executor.init("var x = 1;");
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
-
- JavascriptExecutor.setTimeunit4Latches(TimeUnit.MICROSECONDS);
- JavascriptExecutor.setIntializationLatchTimeout(60000000);
- JavascriptExecutor.setCleanupLatchTimeout(1);
-
- assertThatCode(() -> {
- executor.init("var x = 1;");
- }).doesNotThrowAnyException();
-
- assertThatThrownBy(() -> {
- executor.cleanUp();
- }).hasMessage("JavascriptExecutor executor:0.0.1 cleanup timed out after 1 MICROSECONDS");
-
- JavascriptExecutor.setCleanupLatchTimeout(10000000);
- assertThatThrownBy(() -> {
- executor.cleanUp();
- }).hasMessage("cleanup failed, executor executor:0.0.1 is not initialized");
-
- assertThatCode(() -> {
- executor.init("var x = 1;");
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
+ public void testReturnNonBoolean() throws StateMachineException {
+ JavascriptExecutor executor = new JavascriptExecutor(
+ new AxArtifactKey("TestTask:0.0.1"), "var a = 1; a;");
+ assertThatThrownBy(() -> executor.execute(new Object()))
+ .hasMessageContaining("logic for TestTask:0.0.1 returned a non-boolean value");
}
@Test
- public void testJavescriptExecutorBadStates() throws StateMachineException, IOException {
- JavascriptExecutor executor = new JavascriptExecutor(new AxArtifactKey("executor:0.0.1"));
-
- assertThatThrownBy(() -> {
- executor.execute("hello");
- }).hasMessage("execution failed, executor executor:0.0.1 is not initialized");
-
- assertThatThrownBy(() -> {
- executor.cleanUp();
- }).hasMessage("cleanup failed, executor executor:0.0.1 is not initialized");
-
- assertThatCode(() -> {
- executor.init("var x = 1;");
- }).doesNotThrowAnyException();
-
- executor.getExecutorThread().interrupt();
- await().atMost(10, TimeUnit.SECONDS).until(() -> !executor.getExecutorThread().isAlive());
-
- assertThatThrownBy(() -> {
- executor.execute("hello");
- }).hasMessage("execution failed, executor executor:0.0.1 is not running, "
- + "run cleanUp to clear executor and init to restart executor");
-
- assertThatThrownBy(() -> {
- executor.execute("hello");
- }).hasMessage("execution failed, executor executor:0.0.1 is not running, "
- + "run cleanUp to clear executor and init to restart executor");
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
+ public void testBlankLogic() {
+ assertThatThrownBy(() -> new JavascriptExecutor(
+ new AxArtifactKey("TestTask:0.0.1"), " "))
+ .hasMessageContaining("no logic specified for TestTask:0.0.1");
}
@Test
- public void testJavescriptExecutorExecution() throws StateMachineException, IOException {
- JavascriptExecutor executor = new JavascriptExecutor(new AxArtifactKey("executor:0.0.1"));
-
- assertThatCode(() -> {
- executor.init("true;");
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- assertTrue(executor.execute("hello"));
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- executor.init("false;");
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- assertFalse(executor.execute("hello"));
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
-
- assertThatThrownBy(() -> {
- executor.init("aaaaa = \"sss");
- }).hasMessage(
- "logic failed to compile for executor:0.0.1 with message: unterminated string literal (executor:0.0.1#1)");
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- executor.init("true;");
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- assertTrue(executor.execute("hello"));
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- executor.init("throw \"this is an error\";");
- }).doesNotThrowAnyException();
-
- assertThatThrownBy(() -> {
- assertTrue(executor.execute("hello"));
- }).hasMessage("logic failed to run for executor:0.0.1 with message: this is an error (executor:0.0.1#1)");
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- executor.init("var x = 0; while (x < 100) { x++; }; true;");
- }).doesNotThrowAnyException();
-
- concurrentResult.set(true);
-
- // Execute an infinite loop in Javascript
- (new Thread() {
- public void run() {
- try {
- while (executor.execute("hello")) {
- LOGGER.debug("test thread running . . .");
- // Loop until interrupted
- }
- } catch (StateMachineException e) {
- LOGGER.debug("test thread caught exception", e);
- }
- concurrentResult.set(false);
- LOGGER.debug("test thread exited");
- }
- }).start();
-
- await().atMost(1000, TimeUnit.MILLISECONDS).until(() -> executor.getExecutorThread().isAlive());
-
- executor.getExecutorThread().interrupt();
-
- await().atMost(1000, TimeUnit.MILLISECONDS).until(() -> !concurrentResult.get());
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- executor.init("true;");
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- assertTrue(executor.execute("hello"));
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
-
- assertThatCode(() -> {
- executor.init("x = 1; true;");
- }).doesNotThrowAnyException();
-
- concurrentResult.set(true);
-
- // Execute an infinite loop in Javascript
- Thread executionThread = new Thread() {
- public void run() {
- try {
- while (executor.execute("hello")) {
- ;
- }
- } catch (StateMachineException e) {
- ;
- }
- }
- };
- executionThread.start();
-
- executionThread.interrupt();
-
- await().atMost(300, TimeUnit.MILLISECONDS).until(() -> !executionThread.isAlive());
- await().atMost(300, TimeUnit.MILLISECONDS).until(() -> !executor.getExecutorThread().isAlive());
-
- assertThatCode(() -> {
- executor.cleanUp();
- }).doesNotThrowAnyException();
+ public void testCompileFailed() {
+ assertThatThrownBy(() -> new JavascriptExecutor(
+ new AxArtifactKey("TestTask:0.0.1"), "return boolean;"))
+ .hasMessageContaining("logic failed to compile for TestTask:0.0.1");
}
}
diff --git a/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptStateFinalizerExecutorTest.java b/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptStateFinalizerExecutorTest.java
index f54e21ec4..2da6a5c73 100644
--- a/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptStateFinalizerExecutorTest.java
+++ b/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptStateFinalizerExecutorTest.java
@@ -20,7 +20,6 @@
package org.onap.policy.apex.plugins.executor.javascript;
-import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -78,7 +77,6 @@ public class JavascriptStateFinalizerExecutorTest {
@Test
public void testJavaStateFinalizerExecutor() throws Exception {
JavascriptStateFinalizerExecutor jsfe = new JavascriptStateFinalizerExecutor();
- assertNotNull(jsfe);
assertThatThrownBy(() -> {
jsfe.prepare();
@@ -96,61 +94,30 @@ public class JavascriptStateFinalizerExecutorTest {
assertThatThrownBy(() -> {
jsfe.prepare();
}).hasMessage("logic failed to compile for NULL:0.0.0:NULL:NULL "
- + "with message: invalid return (NULL:0.0.0:NULL:NULL#1)");
+ + "with message: invalid return (NULL:0.0.0:NULL:NULL#1)");
- Map<String, Object> incomingParameters1 = new HashMap<>();
- assertThatThrownBy(() -> {
- jsfe.execute(-1, new Properties(), incomingParameters1);
- }).hasMessage("execution failed, executor NULL:0.0.0:NULL:NULL is not running, "
- + "run cleanUp to clear executor and init to restart executor");
-
- assertThatThrownBy(() -> {
- jsfe.prepare();
- }).hasMessage(
- "initiation failed, executor NULL:0.0.0:NULL:NULL already initialized, run cleanUp to clear executor");
-
- assertThatCode(() -> {
- jsfe.cleanUp();
- }).doesNotThrowAnyException();
-
- JavascriptStateFinalizerExecutor jsfe1 = new JavascriptStateFinalizerExecutor();
stateFinalizerLogic.setLogic("java.lang.String");
- jsfe1.setContext(parentStateExcutor, stateFinalizerLogic, internalContext);
- jsfe1.prepare();
+ jsfe.prepare();
AxEvent axEvent = new AxEvent(new AxArtifactKey("Event", "0.0.1"));
EnEvent event = new EnEvent(axEvent);
+ stateFinalizerLogic.setLogic("if(executor.executionId==-1)" + "{\r\n"
+ + "var returnValueType = java.lang.Boolean;" + "var returnValue = new returnValueType(false); }\n"
+ + "else{\n" + "executor.setSelectedStateOutputName(\"SelectedOutputIsMe\");\n"
+ + "var returnValueType = java.lang.Boolean;\n" + "\n"
+ + "var returnValue = new returnValueType(true);} true;");
assertThatThrownBy(() -> {
- jsfe1.execute(-1, new Properties(), event);
- }).hasMessage(
- "execute: logic for NULL:0.0.0:NULL:NULL returned a non-boolean value [JavaClass java.lang.String]");
-
- assertThatThrownBy(() -> {
- jsfe1.execute(-1, new Properties(), event);
- }).hasMessage(
- "execute: logic for NULL:0.0.0:NULL:NULL returned a non-boolean value [JavaClass java.lang.String]");
-
- assertThatCode(() -> {
- jsfe1.cleanUp();
- }).doesNotThrowAnyException();
-
- JavascriptStateFinalizerExecutor jsfe2 = new JavascriptStateFinalizerExecutor();
-
- stateFinalizerLogic.setLogic("executor.setSelectedStateOutputName(\"SelectedOutputIsMe\");\n true;");
-
- jsfe2.setContext(parentStateExcutor, stateFinalizerLogic, internalContext);
- assertThatCode(() -> {
- jsfe2.prepare();
- }).doesNotThrowAnyException();
+ jsfe.prepare();
+ jsfe.execute(-1, new Properties(), event);
+ }).hasMessage("execute-post: state finalizer logic \"NULL:0.0.0:NULL:NULL\" did not select an output state");
state.getStateOutputs().put("SelectedOutputIsMe", null);
- String stateOutput = jsfe2.execute(0, new Properties(), event);
+ jsfe.prepare();
+ String stateOutput = jsfe.execute(0, new Properties(), event);
assertEquals("SelectedOutputIsMe", stateOutput);
- assertThatCode(() -> {
- jsfe2.cleanUp();
- }).doesNotThrowAnyException();
+ jsfe.cleanUp();
}
}
diff --git a/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskExecutorTest.java b/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskExecutorTest.java
index 435397bae..031d605e1 100644
--- a/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskExecutorTest.java
+++ b/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskExecutorTest.java
@@ -20,7 +20,6 @@
package org.onap.policy.apex.plugins.executor.javascript;
-import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -64,7 +63,7 @@ public class JavascriptTaskExecutorTest {
public static void prepareForTest() {
final ContextParameters contextParameters = new ContextParameters();
contextParameters.getLockManagerParameters()
- .setPluginClass("org.onap.policy.apex.context.impl.locking.jvmlocal.JvmLocalLockManager");
+ .setPluginClass("org.onap.policy.apex.context.impl.locking.jvmlocal.JvmLocalLockManager");
contextParameters.setName(ContextParameterConstants.MAIN_GROUP_NAME);
contextParameters.getDistributorParameters().setName(ContextParameterConstants.DISTRIBUTOR_GROUP_NAME);
@@ -98,47 +97,30 @@ public class JavascriptTaskExecutorTest {
@Test
public void testJavascriptTaskExecutor() throws Exception {
+ JavascriptTaskExecutor jte = new JavascriptTaskExecutor();
+
assertThatThrownBy(() -> {
- JavascriptTaskExecutor jteBadPrep = new JavascriptTaskExecutor();
- jteBadPrep.prepare();
+ jte.prepare();
}).isInstanceOf(NullPointerException.class);
AxTask task = new AxTask(new AxArtifactKey("TestTask:0.0.1"));
final ApexInternalContext internalContext = new ApexInternalContext(new AxPolicyModel());
- JavascriptTaskExecutor jteBadLogic = new JavascriptTaskExecutor();
- assertNotNull(jteBadLogic);
-
- jteBadLogic.setContext(null, task, internalContext);
+ jte.setContext(null, task, internalContext);
task.getTaskLogic().setLogic("return boolean;");
assertThatThrownBy(() -> {
- jteBadLogic.prepare();
+ jte.prepare();
}).hasMessage("logic failed to compile for TestTask:0.0.1 with message: invalid return (TestTask:0.0.1#1)");
task.getTaskLogic().setLogic("var x = 5;");
- JavascriptTaskExecutor jte = new JavascriptTaskExecutor();
- jte.setContext(null, task, internalContext);
-
jte.prepare();
-
- assertThatThrownBy(() -> {
- jte.prepare();
- }).hasMessage("initiation failed, executor TestTask:0.0.1 already initialized, run cleanUp to clear executor");
-
- assertThatThrownBy(() -> {
- jte.execute(-1, new Properties(), null);
- }).isInstanceOf(NullPointerException.class);
-
assertThatThrownBy(() -> {
jte.execute(-1, new Properties(), null);
}).isInstanceOf(NullPointerException.class);
-
- assertThatCode(() -> {
- jte.cleanUp();
- }).doesNotThrowAnyException();
+ jte.cleanUp();
task.getTaskLogic().setLogic("var returnValue = false;\nreturnValue;");
@@ -157,10 +139,6 @@ public class JavascriptTaskExecutorTest {
Map<String, Object> returnMap = jte.execute(0, new Properties(), incomingParameters);
assertEquals(0, returnMap.size());
jte.cleanUp();
-
- assertThatCode(() -> {
- jte.cleanUp();
- }).doesNotThrowAnyException();
}
@Test
@@ -207,12 +185,12 @@ public class JavascriptTaskExecutorTest {
private ContextAlbum createTestContextAlbum() throws ContextException {
AxContextSchemas schemas = new AxContextSchemas();
AxContextSchema simpleStringSchema =
- new AxContextSchema(new AxArtifactKey("SimpleStringSchema", "0.0.1"), "JAVA", "java.lang.String");
+ new AxContextSchema(new AxArtifactKey("SimpleStringSchema", "0.0.1"), "JAVA", "java.lang.String");
schemas.getSchemasMap().put(simpleStringSchema.getKey(), simpleStringSchema);
ModelService.registerModel(AxContextSchemas.class, schemas);
AxContextAlbum axContextAlbum = new AxContextAlbum(new AxArtifactKey("TestContextAlbum", "0.0.1"), "Policy",
- true, AxArtifactKey.getNullKey());
+ true, AxArtifactKey.getNullKey());
axContextAlbum.setItemSchema(simpleStringSchema.getKey());
Distributor distributor = new JvmLocalDistributor();
diff --git a/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskSelectExecutorTest.java b/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskSelectExecutorTest.java
index 23b3afe9e..a6e410cd0 100644
--- a/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskSelectExecutorTest.java
+++ b/plugins/plugins-executor/plugins-executor-javascript/src/test/java/org/onap/policy/apex/plugins/executor/javascript/JavascriptTaskSelectExecutorTest.java
@@ -20,7 +20,6 @@
package org.onap.policy.apex.plugins.executor.javascript;
-import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -70,7 +69,6 @@ public class JavascriptTaskSelectExecutorTest {
@Test
public void testJavascriptTaskSelectExecutor() throws Exception {
JavascriptTaskSelectExecutor jtse = new JavascriptTaskSelectExecutor();
- assertNotNull(jtse);
assertThatThrownBy(() -> {
jtse.prepare();
@@ -83,19 +81,11 @@ public class JavascriptTaskSelectExecutorTest {
assertThatThrownBy(() -> {
jtse.prepare();
- }).hasMessage("initiation failed, no logic specified for executor NULL:0.0.0:NULL:NULL");
+ }).hasMessage("no logic specified for NULL:0.0.0:NULL:NULL");
AxEvent axEvent1 = new AxEvent(new AxArtifactKey("Event", "0.0.1"));
EnEvent event1 = new EnEvent(axEvent1);
- assertThatThrownBy(() -> {
- jtse.execute(-1, new Properties(), event1);
- }).hasMessage("execution failed, executor NULL:0.0.0:NULL:NULL is not initialized");
-
- assertThatThrownBy(() -> {
- jtse.cleanUp();
- }).hasMessage("cleanup failed, executor NULL:0.0.0:NULL:NULL is not initialized");
-
state.getTaskSelectionLogic().setLogic("java.lang.String");
jtse.prepare();
@@ -109,33 +99,20 @@ public class JavascriptTaskSelectExecutorTest {
assertThatThrownBy(() -> {
jtse.execute(-1, new Properties(), event);
}).hasMessage(
- "execute: logic for NULL:0.0.0:NULL:NULL returned a non-boolean value [JavaClass java.lang.String]");
+ "execute: logic for NULL:0.0.0:NULL:NULL returned a non-boolean value [JavaClass java.lang.String]");
- state.getTaskSelectionLogic().setLogic("var x=1;\n" + "false;");
+ state.getTaskSelectionLogic().setLogic("var x=1;\n" + "false; ");
assertThatThrownBy(() -> {
+ jtse.prepare();
jtse.execute(-1, new Properties(), event);
- }).hasMessage(
- "execute: logic for NULL:0.0.0:NULL:NULL returned a non-boolean value [JavaClass java.lang.String]");
+ }).hasMessage("execute-post: task selection logic failed on state \"NULL:0.0.0:NULL:NULL\"");
- assertThatThrownBy(() -> {
- jtse.prepare();
- }).hasMessage(
- "initiation failed, executor NULL:0.0.0:NULL:NULL already initialized, run cleanUp to clear executor");
-
- assertThatCode(() -> {
- jtse.cleanUp();
- }).doesNotThrowAnyException();
-
- JavascriptTaskSelectExecutor jtse1 = new JavascriptTaskSelectExecutor();
- jtse1.setContext(null, state, internalContext);
- state.getTaskSelectionLogic().setLogic("var x = 1\n" + "true;");
-
- assertThatCode(() -> {
- jtse1.prepare();
- AxArtifactKey taskKey = jtse1.execute(0, new Properties(), event);
- assertEquals("NULL:0.0.0", taskKey.getId());
- jtse1.cleanUp();
- }).doesNotThrowAnyException();
+ state.getTaskSelectionLogic().setLogic("var x = 1\n" + "true; ");
+
+ jtse.prepare();
+ AxArtifactKey taskKey = jtse.execute(0, new Properties(), event);
+ assertEquals("NULL:0.0.0", taskKey.getId());
+ jtse.cleanUp();
}
}