You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/06/26 02:31:55 UTC
groovy git commit: Make some base test classes CompileStatic
Repository: groovy
Updated Branches:
refs/heads/master 419ca1c19 -> 0d4b52f53
Make some base test classes CompileStatic
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0d4b52f5
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0d4b52f5
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0d4b52f5
Branch: refs/heads/master
Commit: 0d4b52f53bb2b964929ed4330fd17fd2e85587a5
Parents: 419ca1c
Author: sunlan <su...@apache.org>
Authored: Tue Jun 26 10:31:47 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Tue Jun 26 10:31:47 2018 +0800
----------------------------------------------------------------------
src/test/gls/CompilableTestSupport.groovy | 4 ++-
.../stc/StaticTypeCheckingTestCase.groovy | 8 +++---
.../asm/sc/StaticCompilationTestSupport.groovy | 26 +++++++++++---------
3 files changed, 22 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/0d4b52f5/src/test/gls/CompilableTestSupport.groovy
----------------------------------------------------------------------
diff --git a/src/test/gls/CompilableTestSupport.groovy b/src/test/gls/CompilableTestSupport.groovy
index 9e5b404..78e563e 100644
--- a/src/test/gls/CompilableTestSupport.groovy
+++ b/src/test/gls/CompilableTestSupport.groovy
@@ -18,9 +18,11 @@
*/
package gls
+import groovy.transform.CompileStatic
import org.codehaus.groovy.control.CompilationFailedException
-public abstract class CompilableTestSupport extends GroovyTestCase {
+@CompileStatic
+abstract class CompilableTestSupport extends GroovyTestCase {
protected shouldNotCompile(String script) {
try {
GroovyClassLoader gcl = new GroovyClassLoader()
http://git-wip-us.apache.org/repos/asf/groovy/blob/0d4b52f5/src/test/groovy/transform/stc/StaticTypeCheckingTestCase.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/transform/stc/StaticTypeCheckingTestCase.groovy b/src/test/groovy/transform/stc/StaticTypeCheckingTestCase.groovy
index c7c2262..cfb9480 100644
--- a/src/test/groovy/transform/stc/StaticTypeCheckingTestCase.groovy
+++ b/src/test/groovy/transform/stc/StaticTypeCheckingTestCase.groovy
@@ -18,16 +18,18 @@
*/
package groovy.transform.stc
-import org.codehaus.groovy.control.CompilerConfiguration
-import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer
+import groovy.transform.CompileStatic
import groovy.transform.TypeChecked
+import org.codehaus.groovy.control.CompilerConfiguration
import org.codehaus.groovy.control.MultipleCompilationErrorsException
-import org.codehaus.groovy.control.messages.SyntaxErrorMessage
+import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer
import org.codehaus.groovy.control.customizers.ImportCustomizer
+import org.codehaus.groovy.control.messages.SyntaxErrorMessage
/**
* Support class for static type checking test cases.
*/
+@CompileStatic
abstract class StaticTypeCheckingTestCase extends GroovyTestCase {
protected CompilerConfiguration config
protected GroovyShell shell
http://git-wip-us.apache.org/repos/asf/groovy/blob/0d4b52f5/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTestSupport.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTestSupport.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTestSupport.groovy
index 301eaac..153b48b 100644
--- a/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTestSupport.groovy
+++ b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTestSupport.groovy
@@ -18,19 +18,21 @@
*/
package org.codehaus.groovy.classgen.asm.sc
-import groovy.transform.Trait
-import org.codehaus.groovy.control.CompilerConfiguration
-import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer
import groovy.transform.CompileStatic
+import org.codehaus.groovy.ast.ClassNode
+import org.codehaus.groovy.classgen.GeneratorContext
import org.codehaus.groovy.control.CompilationUnit
-import java.security.CodeSource
-import org.codehaus.groovy.control.customizers.CompilationCustomizer
import org.codehaus.groovy.control.CompilePhase
-import org.codehaus.groovy.ast.ClassNode
-import org.objectweb.asm.ClassReader
-import org.objectweb.asm.util.CheckClassAdapter
+import org.codehaus.groovy.control.CompilerConfiguration
+import org.codehaus.groovy.control.SourceUnit
+import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer
+import org.codehaus.groovy.control.customizers.CompilationCustomizer
import org.codehaus.groovy.control.customizers.ImportCustomizer
import org.codehaus.groovy.tools.GroovyClass
+import org.objectweb.asm.ClassReader
+import org.objectweb.asm.util.CheckClassAdapter
+
+import java.security.CodeSource
/**
* A mixin class which can be used to transform a static type checking test case into a
@@ -83,7 +85,7 @@ trait StaticCompilationTestSupport {
}
}
- public static class CompilationUnitAwareGroovyClassLoader extends GroovyClassLoader {
+ static class CompilationUnitAwareGroovyClassLoader extends GroovyClassLoader {
StaticCompilationTestSupport testCase
CompilationUnitAwareGroovyClassLoader(
@@ -102,14 +104,14 @@ trait StaticCompilationTestSupport {
}
}
- public static class CustomCompilationUnit extends CompilationUnit {
+ static class CustomCompilationUnit extends CompilationUnit {
CustomCompilationUnit(final CompilerConfiguration configuration, final CodeSource security, final GroovyClassLoader loader) {
super(configuration, security, loader)
}
}
- public static class ASTTreeCollector extends CompilationCustomizer {
+ static class ASTTreeCollector extends CompilationCustomizer {
StaticCompilationTestSupport testCase
ASTTreeCollector(StaticCompilationTestSupport testCase) {
@@ -118,7 +120,7 @@ trait StaticCompilationTestSupport {
}
@Override
- void call(final org.codehaus.groovy.control.SourceUnit source, final org.codehaus.groovy.classgen.GeneratorContext context, final ClassNode classNode) {
+ void call(final SourceUnit source, final GeneratorContext context, final ClassNode classNode) {
def unit = testCase.compilationUnit
if (!unit) return
List<GroovyClass> classes = unit.generatedClasses