--- /dev/null	2018-11-26 11:49:18.255023023 +0100
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestShenandoahArgumentRanges.java	2018-11-26 21:28:14.662064616 +0100
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2016, 2018, Red Hat, Inc. All rights reserved.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test TestShenandoahArgumentRanges
+ * @summary Test that Shenandoah arguments are checked for ranges where applicable
+ * @key gc
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run driver TestShenandoahArgumentRanges
+ */
+
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class TestShenandoahArgumentRanges {
+    public static void main(String[] args) throws Exception {
+        testRange("ShenandoahGarbageThreshold", 0, 100);
+        testRange("ShenandoahFreeThreshold", 0, 100);
+        testRange("ShenandoahAllocationThreshold", 0, 100);
+        testHeuristics();
+    }
+
+    private static void testHeuristics() throws Exception {
+
+        {
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+                                                                      "-XX:+UnlockExperimentalVMOptions",
+                                                                      "-XX:+UseShenandoahGC",
+                                                                      "-XX:ShenandoahGCHeuristics=aggressive",
+                                                                      "-version");
+            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            output.shouldHaveExitValue(0);
+        }
+        {
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+                                                                      "-XX:+UnlockExperimentalVMOptions",
+                                                                      "-XX:+UseShenandoahGC",
+                                                                      "-XX:ShenandoahGCHeuristics=static",
+                                                                      "-version");
+            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            output.shouldHaveExitValue(0);
+        }
+        {
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+                                                                      "-XX:+UnlockExperimentalVMOptions",
+                                                                      "-XX:+UseShenandoahGC",
+                                                                      "-XX:ShenandoahGCHeuristics=fluff",
+                                                                      "-version");
+            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            output.shouldMatch("Unknown -XX:ShenandoahGCHeuristics option");
+            output.shouldHaveExitValue(1);
+        }
+    }
+
+    private static void testRange(String option, int min, int max) throws Exception {
+        {
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+                                                                      "-XX:+UnlockExperimentalVMOptions",
+                                                                      "-XX:+UseShenandoahGC",
+                                                                      "-XX:" + option + "=" + (max + 1),
+                                                                      "-version");
+            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            output.shouldHaveExitValue(1);
+        }
+        {
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+                                                                      "-XX:+UnlockExperimentalVMOptions",
+                                                                      "-XX:+UseShenandoahGC",
+                                                                      "-XX:" + option + "=" + max,
+                                                                      "-version");
+            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            output.shouldHaveExitValue(0);
+        }
+        {
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+                                                                      "-XX:+UnlockExperimentalVMOptions",
+                                                                      "-XX:+UseShenandoahGC",
+                                                                      "-XX:" + option + "=" + (min - 1),
+                                                                      "-version");
+            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            output.shouldHaveExitValue(1);
+        }
+        {
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+                                                                      "-XX:+UnlockExperimentalVMOptions",
+                                                                      "-XX:+UseShenandoahGC",
+                                                                      "-XX:" + option + "=" + min,
+                                                                      "-version");
+            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            output.shouldHaveExitValue(0);
+        }
+    }
+}