use the JUnit ignore annotation instead of gradle excludes to exclude security tests and Groovy4393Bug from test execution
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/a9f05472 Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/a9f05472 Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/a9f05472 Branch: refs/heads/GROOVY_2_4_X Commit: a9f05472f305b2192888656e6593c76822fe3f12 Parents: e8aed2e Author: pascalschumacher <pascalschumac...@gmx.net> Authored: Fri Jul 10 19:00:40 2015 +0200 Committer: pascalschumacher <pascalschumac...@gmx.net> Committed: Fri Jul 10 19:29:24 2015 +0200 ---------------------------------------------------------------------- gradle/test.gradle | 6 ------ src/test/groovy/bugs/Groovy4393Bug.groovy | 3 +++ src/test/groovy/security/RunOneGroovyScript.java | 2 ++ src/test/groovy/security/SecurityTest.java | 2 ++ src/test/groovy/security/SecurityTestSupport.java | 2 ++ 5 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a9f05472/gradle/test.gradle ---------------------------------------------------------------------- diff --git a/gradle/test.gradle b/gradle/test.gradle index f7ccd92..9732005 100644 --- a/gradle/test.gradle +++ b/gradle/test.gradle @@ -88,9 +88,6 @@ tasks.addRule('Pattern: testSingle<Name> will test **/<Name>.class') { String ta def buildExcludeFilter() { def excludes = [] - // temporary disabling Groovy4393Bug because it requires a specific configuration - excludes << 'Groovy4393Bug' - // deal with OS specific tests def windowsTests = ['ExecuteTest_Windows'] def unixTests = ['ExecuteTest_LinuxSolaris'] @@ -102,9 +99,6 @@ def buildExcludeFilter() { } excludes += osSpecificTests - // temporarily disable security tests, see GRADLE-2170 - excludes << 'security' - // if not compiled with indy support, disable indy tests if (!rootProject.useIndy()) { excludes += ['indy', 'Indy'] http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a9f05472/src/test/groovy/bugs/Groovy4393Bug.groovy ---------------------------------------------------------------------- diff --git a/src/test/groovy/bugs/Groovy4393Bug.groovy b/src/test/groovy/bugs/Groovy4393Bug.groovy index f811c80..535a868 100644 --- a/src/test/groovy/bugs/Groovy4393Bug.groovy +++ b/src/test/groovy/bugs/Groovy4393Bug.groovy @@ -18,6 +18,9 @@ */ package groovy.bugs +import org.junit.Ignore + +@Ignore('requires a specific configuration, see: https://issues.apache.org/jira/browse/GROOVY-4393 for details') class Groovy4393Bug extends GroovyTestCase { void testIfSourceFilesWithOtherExtensionsGotCompiledFine() { http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a9f05472/src/test/groovy/security/RunOneGroovyScript.java ---------------------------------------------------------------------- diff --git a/src/test/groovy/security/RunOneGroovyScript.java b/src/test/groovy/security/RunOneGroovyScript.java index 7411ed9..d8dadeb 100644 --- a/src/test/groovy/security/RunOneGroovyScript.java +++ b/src/test/groovy/security/RunOneGroovyScript.java @@ -21,12 +21,14 @@ package groovy.security; import junit.framework.Test; import junit.framework.TestSuite; import junit.textui.TestRunner; +import org.junit.Ignore; import java.io.File; /** * Test case for running a single groovy script parsed from a .groovy file. */ +@Ignore("does not work at the moment, please fix me") public class RunOneGroovyScript extends SecurityTestSupport { protected static String file; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a9f05472/src/test/groovy/security/SecurityTest.java ---------------------------------------------------------------------- diff --git a/src/test/groovy/security/SecurityTest.java b/src/test/groovy/security/SecurityTest.java index b96173e..0126d31 100644 --- a/src/test/groovy/security/SecurityTest.java +++ b/src/test/groovy/security/SecurityTest.java @@ -23,6 +23,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import junit.textui.TestRunner; import org.codehaus.groovy.control.CompilationFailedException; +import org.junit.Ignore; import java.io.File; import java.io.IOException; @@ -41,6 +42,7 @@ import java.util.PropertyPermission; * * @author Steve Goetze */ +@Ignore("does not work at the moment, please fix me") public class SecurityTest extends SecurityTestSupport { public void testForbiddenProperty() { http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a9f05472/src/test/groovy/security/SecurityTestSupport.java ---------------------------------------------------------------------- diff --git a/src/test/groovy/security/SecurityTestSupport.java b/src/test/groovy/security/SecurityTestSupport.java index d45a1d9..72e940e 100644 --- a/src/test/groovy/security/SecurityTestSupport.java +++ b/src/test/groovy/security/SecurityTestSupport.java @@ -29,6 +29,7 @@ import junit.framework.TestResult; import junit.framework.TestSuite; import junit.textui.ResultPrinter; import org.codehaus.groovy.runtime.InvokerHelper; +import org.junit.Ignore; import java.io.File; import java.io.PrintStream; @@ -39,6 +40,7 @@ import java.util.Enumeration; /** * @author Steve Goetze */ +@Ignore("base class for security tests") public class SecurityTestSupport extends GroovyTestCase { private static final String POLICY_FILE = "security/groovy.policy"; private static int counter = 0;
