groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwagenleit...@apache.org
Subject [2/3] groovy git commit: Remove Java 1.5 runtime checks for java.lang.annotation.Annotation from tests
Date Sun, 31 Jan 2016 16:18:56 GMT
Remove Java 1.5 runtime checks for java.lang.annotation.Annotation from tests


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/615cca5b
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/615cca5b
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/615cca5b

Branch: refs/heads/GROOVY_2_4_X
Commit: 615cca5bca6388d3e99fe204639956b30754cb17
Parents: a007f87
Author: John Wagenleitner <jwagenleitner@apache.org>
Authored: Sun Jan 31 07:11:09 2016 -0800
Committer: John Wagenleitner <jwagenleitner@apache.org>
Committed: Sun Jan 31 08:17:41 2016 -0800

----------------------------------------------------------------------
 .../org/codehaus/groovy/classgen/GenericsGenTest.groovy   |  8 --------
 .../org/codehaus/groovy/classgen/InterfaceTest.groovy     |  7 -------
 .../groovy/control/CompilerConfigurationTest.java         | 10 +---------
 3 files changed, 1 insertion(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/615cca5b/src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy b/src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy
index e93271c..6d959a9 100644
--- a/src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy
+++ b/src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy
@@ -24,14 +24,6 @@ import org.codehaus.groovy.control.*
 class GenericsGenTest extends GroovyTestCase {
 
     void testCompile() {
-        try {
-            Class.forName("java.lang.annotation.Annotation");
-        }
-        catch (Exception ex) {
-            return
-        }
-
-
         File dir = createTempDir("groovy-src-", "-src")
         assertNotNull dir
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/615cca5b/src/test/org/codehaus/groovy/classgen/InterfaceTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/classgen/InterfaceTest.groovy b/src/test/org/codehaus/groovy/classgen/InterfaceTest.groovy
index 687b5e1..f267287 100644
--- a/src/test/org/codehaus/groovy/classgen/InterfaceTest.groovy
+++ b/src/test/org/codehaus/groovy/classgen/InterfaceTest.groovy
@@ -24,13 +24,6 @@ import org.codehaus.groovy.tools.FileSystemCompiler
 class InterfaceTest extends GroovyTestCase {
 
     void testCompile() {
-        try {
-            Class.forName("java.lang.annotation.Annotation");
-        }
-        catch (Exception ex) {
-            return
-        }
-
         File dir = createTempDir("groovy-src-", "-src")
         assertNotNull dir
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/615cca5b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
index cb93092..890984f 100644
--- a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
+++ b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
@@ -76,15 +76,7 @@ public class CompilerConfigurationTest extends GroovyTestCase {
     }
 
     private static String getVMVersion() {
-        try {
-            Class.forName("java.lang.annotation.Annotation");
-            return CompilerConfiguration.POST_JDK5;
-        }
-        catch(Exception ex) {
-            // IGNORE
-        }
-
-        return CompilerConfiguration.PRE_JDK5;
+        return CompilerConfiguration.POST_JDK5;
     }
 
     public void testSetViaSystemProperties() {


Mime
View raw message