HADOOP-19500

Author: stoty

hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/BaseSLSRunnerTest.java

@@ -24,7 +24,9 @@
 import org.apache.hadoop.yarn.server.resourcemanager.monitor.invariants.MetricsInvariantChecker;
 import org.junit.After;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
@@ -35,6 +37,8 @@
 import java.util.List;
 import java.util.UUID;
 
+import javax.script.ScriptEngineManager;
+
 /**
  * This is a base class to ease the implementation of SLS-based tests.
  */
@@ -59,6 +63,12 @@ public abstract class BaseSLSRunnerTest {
   protected String ongoingInvariantFile;
   protected String exitInvariantFile;
 
+  @BeforeClass
+  public static void checkForJavaScript() {
+    Assume.assumeNotNull("JavaScript engine not available (JEP 372)",
+        new ScriptEngineManager().getEngineByName("JavaScript"));
+  }
+  
   @Before
   public abstract void setup();
 

hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSDagAMSimulator.java

@@ -28,13 +28,9 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import static org.junit.Assume.assumeNotNull;
-
 import java.util.Arrays;
 import java.util.Collection;
 
-import javax.script.ScriptEngineManager;
-
 /**
  * This test performs simple runs of the SLS with the generic syn json format.
  */
@@ -66,7 +62,6 @@ public static Collection<Object[]> data() {
 
   @Before
   public void setup() {
-    assumeNotNull(new ScriptEngineManager().getEngineByName("JavaScript"));
     ongoingInvariantFile = "src/test/resources/ongoing-invariants.txt";
     exitInvariantFile = "src/test/resources/exit-invariants.txt";
   }

hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSGenericSynth.java

@@ -28,13 +28,9 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import static org.junit.Assume.assumeNotNull;
-
 import java.util.Arrays;
 import java.util.Collection;
 
-import javax.script.ScriptEngineManager;
-
 /**
  * This test performs simple runs of the SLS with the generic syn json format.
  */
@@ -66,7 +62,6 @@ public static Collection<Object[]> data() {
 
   @Before
   public void setup() {
-    assumeNotNull(new ScriptEngineManager().getEngineByName("JavaScript"));
     ongoingInvariantFile = "src/test/resources/ongoing-invariants.txt";
     exitInvariantFile = "src/test/resources/exit-invariants.txt";
   }

hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSRunner.java

@@ -32,10 +32,7 @@
 import java.security.Security;
 import java.util.*;
 
-import javax.script.ScriptEngineManager;
-
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeNotNull;
 
 /**
  * This test performs simple runs of the SLS with different trace types and
@@ -81,7 +78,6 @@ public static Collection<Object[]> data() {
 
   @Before
   public void setup() {
-    assumeNotNull(new ScriptEngineManager().getEngineByName("JavaScript"));
     ongoingInvariantFile = "src/test/resources/ongoing-invariants.txt";
     exitInvariantFile = "src/test/resources/exit-invariants.txt";
   }

hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSStreamAMSynth.java

@@ -28,13 +28,9 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import static org.junit.Assume.assumeNotNull;
-
 import java.util.Arrays;
 import java.util.Collection;
 
-import javax.script.ScriptEngineManager;
-
 /**
  * This test performs simple runs of the SLS with the generic syn json format.
  */
@@ -66,7 +62,6 @@ public static Collection<Object[]> data() {
 
   @Before
   public void setup() {
-    assumeNotNull(new ScriptEngineManager().getEngineByName("JavaScript"));
     ongoingInvariantFile = "src/test/resources/ongoing-invariants.txt";
     exitInvariantFile = "src/test/resources/exit-invariants.txt";
   }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/TestMetricsInvariantChecker.java

@@ -17,10 +17,6 @@
  */
 package org.apache.hadoop.yarn.server.resourcemanager.monitor.invariants;
 
-import static org.junit.Assume.assumeNotNull;
-
-import javax.script.ScriptEngineManager;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.metrics2.MetricsSystem;
 import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
@@ -30,11 +26,15 @@
 import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
 import org.apache.log4j.Logger;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+
+import javax.script.ScriptEngineManager;
 
 /**
  * This class tests the {@code MetricsInvariantChecker} by running it multiple
@@ -49,9 +49,14 @@ public class TestMetricsInvariantChecker {
   private MetricsInvariantChecker ic;
   private Configuration conf;
 
+  @BeforeAll
+  public static void checkForJavaScript() {
+    assumeFalse(new ScriptEngineManager().getEngineByName("JavaScript") == null,
+        "JavaScript engine not available (JEP 372)");
+  }
+
   @BeforeEach
   public void setup() {
-    assumeNotNull(new ScriptEngineManager().getEngineByName("JavaScript"));
     this.metricsSystem = DefaultMetricsSystem.instance();
     JvmMetrics.initSingleton("ResourceManager", null);
     this.ic = new MetricsInvariantChecker();