Merge pull request #14 from jglick/JENKINS-25119-addendum

[JENKINS-25119] Cleaning up test from #7
jenkinsci · May 29, 2015 · c6d43e7 · c6d43e7
2 parents 6f16f00 + e7f8fa8
commit c6d43e7
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/...test/java/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SandboxInterceptorTest.java b/...test/java/org/jenkinsci/plugins/scriptsecurity/sandbox/groovy/SandboxInterceptorTest.java
@@ -245,9 +245,14 @@ public static final class Special {
         }
     }
 
-    @Ignore("TODO not yet implemented")
+    @Issue("JENKINS-25119")
     @Test public void defaultGroovyMethods() throws Exception {
-        assertEvaluate(new GenericWhitelist(), Arrays.asList(1, 4, 9), "([1, 2, 3] as int[]).collect({it * it})");
+        assertRejected(new ProxyWhitelist(), "staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods toInteger java.lang.String", "'123'.toInteger();");
+        assertEvaluate(new StaticWhitelist("staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods toInteger java.lang.String"), 123, "'123'.toInteger();");
+        assertEvaluate(new StaticWhitelist("staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods collect java.lang.Object groovy.lang.Closure"), Arrays.asList(1, 4, 9), "([1, 2, 3] as int[]).collect({x -> x * x})");
+        /* TODO No such property: it for class: Script1:
+        assertEvaluate(new StaticWhitelist("staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods collect java.lang.Object groovy.lang.Closure"), Arrays.asList(1, 4, 9), "([1, 2, 3] as int[]).collect({it * it})");
+        */
     }
 
     @Test public void whitelistedIrrelevantInsideScript() throws Exception {
@@ -395,16 +400,6 @@ public static final class Ambiguity {
         assertEvaluate(new GenericWhitelist(), Collections.singletonMap("part0", "one\ntwo"), "def list = [['one', 'two']]; def map = [:]; for (int i = 0; i < list.size(); i++) {map[\"part${i}\"] = list.get(i).join(\"\\n\")}; map");
     }
 
-    @Issue("JENKINS-25119")
-    @Test public void groovyAdditionalMethod() throws Exception {
-        try {
-            assertEvaluate(new ProxyWhitelist(), "should fail", "'123'.toInteger();");
-        } catch (RejectedAccessException x) {
-            assertNotNull(x.toString(), x.getSignature());
-        }
-        assertEvaluate(new StaticWhitelist("staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods toInteger java.lang.String"), new Integer(123), "'123'.toInteger();");
-    }
-
     private static void assertEvaluate(Whitelist whitelist, final Object expected, final String script) {
         final GroovyShell shell = new GroovyShell(GroovySandbox.createSecureCompilerConfiguration());
         Object actual = GroovySandbox.run(shell.parse(script), whitelist);