You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by jw...@apache.org on 2016/01/31 17:16:48 UTC
[2/3] groovy git commit: Remove Java 1.5 runtime checks for
java.lang.annotation.Annotation from tests
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/efee13bd
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/efee13bd
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/efee13bd
Branch: refs/heads/master
Commit: efee13bd34862dbcbdebf79254043664861eb2df
Parents: 53ac431
Author: John Wagenleitner <jw...@apache.org>
Authored: Sun Jan 31 07:11:09 2016 -0800
Committer: John Wagenleitner <jw...@apache.org>
Committed: Sun Jan 31 07:11:09 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/efee13bd/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/efee13bd/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/efee13bd/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 636008a..7ec6742 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() {