Skip to content

Commit

Permalink
Fix failing runScript test on JDK 15 (#17857)
Browse files Browse the repository at this point in the history
Test was failing due to missing script engine. It assumes
the presence of the script engine now.

Fixes #17840
  • Loading branch information
emre-aydin committed Dec 1, 2020
1 parent 52c5bb6 commit 59a0513
Showing 1 changed file with 11 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.hazelcast.instance.BuildInfoProvider;
import com.hazelcast.internal.cluster.impl.VersionMismatchException;
import com.hazelcast.internal.json.JsonObject;
import com.hazelcast.internal.management.ScriptEngineManagerContext;
import com.hazelcast.internal.management.dto.ClientBwListDTO;
import com.hazelcast.internal.management.dto.ClientBwListEntryDTO;
import com.hazelcast.internal.management.dto.MCEventDTO;
Expand All @@ -46,6 +47,8 @@
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;

import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import java.security.AccessControlException;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -74,6 +77,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeNotNull;

@RunWith(HazelcastParallelClassRunner.class)
@Category({QuickTest.class, ParallelJVMTest.class})
Expand Down Expand Up @@ -316,7 +320,13 @@ public void applyMCConfig() throws Exception {

@Test
public void runScript() throws Exception {
String result = resolve(managementCenterService.runScript(members[0], "javascript", "'hello world';"));
String engineName = "javascript";

ScriptEngineManager scriptEngineManager = ScriptEngineManagerContext.getScriptEngineManager();
ScriptEngine scriptEngine = scriptEngineManager.getEngineByName(engineName);
assumeNotNull(scriptEngine);

String result = resolve(managementCenterService.runScript(members[0], engineName, "'hello world';"));
assertEquals("hello world", result);
}

Expand Down

0 comments on commit 59a0513

Please sign in to comment.