diff --git a/src/test/java/delight/nashornsandbox/TestIssue117.java b/src/test/java/delight/nashornsandbox/TestIssue117.java index 792c856..69c1f47 100644 --- a/src/test/java/delight/nashornsandbox/TestIssue117.java +++ b/src/test/java/delight/nashornsandbox/TestIssue117.java @@ -25,21 +25,22 @@ public static String getMatchStr(String regex, int repl) { return sb.toString(); } - @Test + @Test(expected = ScriptCPUAbuseException.class) public void test() throws ScriptCPUAbuseException, ScriptException, NoSuchMethodException { NashornSandbox sandbox = NashornSandboxes.create(); - for (int i = 480; i <= 500; i++) { + for (int i = 4800; i <= 4820; i++) { long startTime = System.currentTimeMillis(); String js_script = getMatchStr("(([^;]+;){9}[^;]+)", i); try { sandbox.eval(js_script); } catch (Exception e) { + throw e; } long endTime = System.currentTimeMillis(); long costTime = endTime - startTime; - Assert.assertTrue("RegEx attack successful. Took longer than 5000 ms to resolve script. Time required: "+costTime, costTime <= 5000); + Assert.assertTrue("RegEx attack successful. Script ran for longer 120000 ms. Time required: "+costTime, costTime <= 120000); } } }