groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pascalschumac...@apache.org
Subject [2/3] incubator-groovy git commit: use the JUnit ignore annotation instead of gradle excludes to exclude security tests and Groovy4393Bug from test execution
Date Fri, 10 Jul 2015 17:25:11 GMT
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/86700ae7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/86700ae7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/86700ae7

Branch: refs/heads/master
Commit: 86700ae7823185ed23f1a72633543ceaacd1bca5
Parents: 02df109
Author: pascalschumacher <pascalschumacher@gmx.net>
Authored: Fri Jul 10 19:00:40 2015 +0200
Committer: pascalschumacher <pascalschumacher@gmx.net>
Committed: Fri Jul 10 19:00:40 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/86700ae7/gradle/test.gradle
----------------------------------------------------------------------
diff --git a/gradle/test.gradle b/gradle/test.gradle
index c09a847..0328f1f 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -89,9 +89,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']
@@ -103,9 +100,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/86700ae7/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/86700ae7/src/test/groovy/security/RunOneGroovyScript.java
----------------------------------------------------------------------
diff --git a/src/test/groovy/security/RunOneGroovyScript.java b/src/test/groovy/security/RunOneGroovyScript.java
index 3b2fec8..b5d16c0 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/86700ae7/src/test/groovy/security/SecurityTest.java
----------------------------------------------------------------------
diff --git a/src/test/groovy/security/SecurityTest.java b/src/test/groovy/security/SecurityTest.java
index a3bed8d..4330835 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/86700ae7/src/test/groovy/security/SecurityTestSupport.java
----------------------------------------------------------------------
diff --git a/src/test/groovy/security/SecurityTestSupport.java b/src/test/groovy/security/SecurityTestSupport.java
index d00bc3f..bb63a7b 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;


Mime
View raw message