This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new a6a6429f6e minor items
a6a6429f6e is described below
commit a6a6429f6ee554fa796c87f86dd159bb07d12b6b
Author: Eric Milles <[email protected]>
AuthorDate: Sat Feb 14 12:51:26 2026 -0600
minor items
---
.../groovy/org.apache.groovy-asciidoctor.gradle | 9 ++---
.../src/main/groovy/org.apache.groovy-core.gradle | 2 +-
.../groovy/org.apache.groovy-documented.gradle | 15 ++++----
.../codehaus/groovy/classgen/asm/CompileStack.java | 10 ++---
.../groovy/classgen/asm/StatementWriter.java | 18 ++++-----
src/spec/test/CommandChainsTest.groovy | 40 ++++++++++++++++++--
.../bugs/{Groovy9265.groovy => Groovy5912.groovy} | 28 ++++++--------
src/test/groovy/bugs/Groovy9213.groovy | 12 +++---
src/test/groovy/bugs/Groovy9215.groovy | 2 -
src/test/groovy/bugs/Groovy9226.groovy | 2 -
src/test/groovy/bugs/Groovy9236.groovy | 2 -
src/test/groovy/bugs/Groovy9238.groovy | 1 -
src/test/groovy/bugs/Groovy9240.groovy | 2 -
src/test/groovy/bugs/Groovy9252.groovy | 2 -
src/test/groovy/bugs/Groovy9261.groovy | 2 -
src/test/groovy/bugs/Groovy9265.groovy | 2 -
src/test/groovy/bugs/Groovy9270.groovy | 2 -
src/test/groovy/bugs/Groovy9271.groovy | 2 -
src/test/groovy/bugs/Groovy9292.groovy | 9 +++--
src/test/groovy/bugs/Groovy9294.groovy | 2 -
src/test/groovy/bugs/Groovy9324.groovy | 3 --
src/test/groovy/bugs/Groovy9327.groovy | 2 -
src/test/groovy/bugs/Groovy9329.groovy | 3 +-
src/test/groovy/bugs/Groovy9336.groovy | 2 -
src/test/groovy/bugs/Groovy9338.groovy | 2 -
src/test/groovy/bugs/Groovy9370.groovy | 2 -
src/test/groovy/bugs/Groovy9387.groovy | 2 -
src/test/groovy/bugs/Groovy9400.groovy | 9 ++---
src/test/groovy/bugs/Groovy9412.groovy | 2 -
src/test/groovy/bugs/Groovy9413.groovy | 1 +
src/test/groovy/bugs/Groovy9524.groovy | 1 +
src/test/groovy/bugs/Groovy9556.groovy | 2 +-
src/test/groovy/bugs/Groovy9566.groovy | 1 +
src/test/groovy/bugs/Groovy9587.groovy | 2 -
src/test/groovy/bugs/Groovy9589.groovy | 1 +
src/test/groovy/bugs/Groovy9601.groovy | 5 +--
src/test/groovy/bugs/Groovy9611.groovy | 1 +
.../{Groovy965_Bug.groovy => Groovy965.groovy} | 39 ++++++++++----------
src/test/groovy/bugs/Groovy9666.groovy | 1 +
src/test/groovy/bugs/Groovy9706.groovy | 2 +-
src/test/groovy/bugs/Groovy9719.groovy | 2 +-
src/test/groovy/bugs/Groovy9797.groovy | 17 +++------
src/test/groovy/bugs/Groovy9815.groovy | 1 +
src/test/groovy/bugs/Groovy9911.groovy | 1 +
src/test/groovy/bugs/Groovy9922.groovy | 1 +
.../{Groovy996_Bug.groovy => Groovy996.groovy} | 18 ++++-----
src/test/groovy/bugs/Groovy9966.groovy | 1 +
src/test/groovy/bugs/Groovy9982.groovy | 1 +
.../AnnotationCollectorReflectionTest.groovy | 1 +
.../bugs/groovy5912/otherpkg/Groovy5912Bug.groovy | 43 ----------------------
src/test/groovy/bugs/groovy8531/Groovy8531.groovy | 5 ---
src/test/groovy/bugs/groovy8757/UsageTest.groovy | 3 +-
.../SyntheticParameterAnnotationsBug.groovy | 3 +-
src/test/groovy/bugs/groovy8966/Groovy8966.groovy | 3 +-
src/test/groovy/bugs/groovy9204/Groovy9204.groovy | 2 +-
src/test/groovy/bugs/groovy9742/Groovy9742.groovy | 3 +-
56 files changed, 149 insertions(+), 203 deletions(-)
diff --git a/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
index 2b1567c43b..f89e06e850 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
@@ -90,15 +90,14 @@ asciidoctor {
asciidoctorj {
jrubyVersion = versions.jruby
version = versions.asciidoctorj
- def vers = versions.groovy
resolutionStrategy {
it.disableDependencyVerification()
}
def baseUrls = [
- jdk: 'https://docs.oracle.com/en/java/javase/11/docs/api/index.html',
- gjdk:
"https://docs.groovy-lang.org/${vers}/html/groovy-jdk/index.html";,
- gapi: "https://docs.groovy-lang.org/${vers}/html/gapi/index.html";,
- gapid: "https://docs.groovy-lang.org/${vers}/html/gapi/";,
+ jdk :
"https://docs.oracle.com/en/java/javase/${17}/docs/api/index.html";,
+ gjdk :
"https://docs.groovy-lang.org/${versions.groovy}/html/groovy-jdk/index.html";,
+ gapi :
"https://docs.groovy-lang.org/${versions.groovy}/html/gapi/index.html";,
+ gapid: "https://docs.groovy-lang.org/${versions.groovy}/html/gapi/";,
]
for (def entry : baseUrls.entrySet()) {
def macroName = entry.key
diff --git a/build-logic/src/main/groovy/org.apache.groovy-core.gradle
b/build-logic/src/main/groovy/org.apache.groovy-core.gradle
index ca21968a79..8dcb59538e 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-core.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-core.gradle
@@ -177,7 +177,7 @@ tasks.named('compileTestGroovy') {
tasks.register('checkCompatibility') {
doLast {
- assert JavaVersion.current().java11Compatible
+ assert JavaVersion.current().java17Compatible
}
}
diff --git a/build-logic/src/main/groovy/org.apache.groovy-documented.gradle
b/build-logic/src/main/groovy/org.apache.groovy-documented.gradle
index b4ebb4f941..f0271d66c2 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-documented.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-documented.gradle
@@ -59,13 +59,12 @@ tasks.withType(Javadoc).configureEach {
overview =
project.relativePath(rootProject.file('src/main/java/overviewj.html'))
bottom = 'Copyright © 2003-2026 The Apache Software Foundation.
All rights reserved.'
source = sharedConfiguration.targetJavaVersion.get()
- links('https://docs.oracle.com/en/java/javase/11/docs/api/',
- 'https://docs.oracle.com/javaee/7/api/',
-
'https://commons.apache.org/proper/commons-cli/javadocs/api-release/',
- 'https://junit.org/junit4/javadoc/latest/',
- 'https://docs.junit.org/current/api/',
- 'https://picocli.info/apidocs/',
- 'https://docs.oracle.com/javaee/6/api/')
+ links("https://docs.oracle.com/en/java/javase/${17}/docs/api/";,
+ 'https://docs.oracle.com/javaee/7/api/',
+
'https://commons.apache.org/proper/commons-cli/javadocs/api-release/',
+ 'https://junit.org/junit4/javadoc/latest/',
+ 'https://docs.junit.org/current/api/',
+ 'https://picocli.info/apidocs/')
}
}
@@ -82,7 +81,7 @@ tasks.withType(Groovydoc).configureEach {
overviewText =
rootProject.resources.text.fromFile('src/main/java/overview.html')
access = GroovydocAccess.PROTECTED
link 'https://docs.oracle.com/javaee/7/api/', 'javax.servlet.',
'javax.management.'
- link 'https://docs.oracle.com/javase/11/docs/api/java.base/', 'java.',
'org.xml.', 'javax.', 'org.w3c.'
+ link "https://docs.oracle.com/javase/${17}/docs/api/java.base/";, 'java.',
'org.xml.', 'javax.', 'org.w3c.'
link 'https://docs.groovy-lang.org/docs/ant/api/', 'org.apache.ant.',
'org.apache.tools.ant.'
link 'https://junit.org/junit4/javadoc/latest/', 'org.junit.', 'junit.'
link 'https://docs.junit.org/current/api/org.junit.jupiter.api/',
'org.junit.jupiter.', 'org.junit.platform.'
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/CompileStack.java
b/src/main/java/org/codehaus/groovy/classgen/asm/CompileStack.java
index a02729a168..ed6b860af7 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/CompileStack.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/CompileStack.java
@@ -322,13 +322,13 @@ public class CompileStack {
/**
* creates a temporary variable.
*
- * @param name defines the name
- * @param node defines the node
- * @param store defines if the top-level argument of the stack should be
stored
+ * @param name the variable name
+ * @param type the variable type
+ * @param store indicates if the top-level argument of the stack should be
stored
* @return the index used for this temporary variable
*/
- public int defineTemporaryVariable(final String name, final ClassNode
node, final boolean store) {
- BytecodeVariable answer = defineVar(name, node, false, false);
+ public int defineTemporaryVariable(final String name, final ClassNode
type, final boolean store) {
+ BytecodeVariable answer = defineVar(name, type, false, false);
temporaryVariables.addFirst(answer); // TRICK: we add at the beginning
so when we find for remove or get we always have the last one
usedVariables.removeLast();
diff --git
a/src/main/java/org/codehaus/groovy/classgen/asm/StatementWriter.java
b/src/main/java/org/codehaus/groovy/classgen/asm/StatementWriter.java
index bd447084f7..022e228d71 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/StatementWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/StatementWriter.java
@@ -623,7 +623,7 @@ public class StatementWriter {
}
cs.applyBlockRecorder();
mv.visitInsn(RETURN);
- } else {
+ } else { // return value
Expression expression = statement.getExpression();
expression.visit(controller.getAcg());
@@ -634,15 +634,15 @@ public class StatementWriter {
}
if (cs.hasBlockRecorder()) {
- ClassNode top = os.getTopOperand();
- int returnVal = cs.defineTemporaryVariable("returnValue",
returnType, true);
- cs.applyBlockRecorder();
- os.load(top, returnVal);
- cs.removeVar(returnVal);
+ int rv = cs.defineTemporaryVariable("returnValue", returnType,
true);
+ cs.applyBlockRecorder(); // handle finally block
+ BytecodeHelper.load(mv, returnType, rv);
+ BytecodeHelper.doReturn(mv, returnType);
+ cs.removeVar(rv);
+ } else {
+ BytecodeHelper.doReturn(mv, returnType);
+ os.remove(1);
}
-
- BytecodeHelper.doReturn(mv, returnType);
- os.remove(1);
}
}
diff --git a/src/spec/test/CommandChainsTest.groovy
b/src/spec/test/CommandChainsTest.groovy
index dd35f1a485..c70de309e6 100644
--- a/src/spec/test/CommandChainsTest.groovy
+++ b/src/spec/test/CommandChainsTest.groovy
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,9 +21,10 @@ import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-class CommandChainsTest {
+final class CommandChainsTest {
+
@Test
- void testCommandChainEquivalence() {
+ void testCommandChainEquivalence1() {
assertScript '''String left = 'left'
String right = 'right'
@@ -56,6 +56,10 @@ assert m1.list == ['left', 'right']
assert m1.list == m2.list
'''
+ }
+
+ @Test
+ void testCommandChainEquivalence2() {
assertScript '''import groovy.transform.EqualsAndHashCode
@EqualsAndHashCode
@@ -107,6 +111,10 @@ assert m1.medicine == 'chloroquinine'
assert m1.duration == 6
assert m1 == m2
'''
+ }
+
+ @Test
+ void testCommandChainEquivalence3() {
assertScript '''import groovy.transform.EqualsAndHashCode
@EqualsAndHashCode
@@ -143,6 +151,10 @@ assert m1 == m2
assert m1.object == 'wall'
assert m1.colors == ['red','green','yellow']
'''
+ }
+
+ @Test
+ void testCommandChainEquivalence4() {
assertScript '''import groovy.transform.EqualsAndHashCode
@EqualsAndHashCode
@@ -170,6 +182,10 @@ assert m1 == m2
assert m1.map == [that: 'margarita']
assert m1.test == true
'''
+ }
+
+ @Test
+ void testCommandChainEquivalence5() {
assertScript '''
class DSL {
int count
@@ -191,6 +207,10 @@ m2.given({}).when({}).then({})
assert m1.count == 3
assert m2.count == 3
'''
+ }
+
+ @Test
+ void testCommandChainEquivalence6() {
assertScript '''import groovy.transform.EqualsAndHashCode
@EqualsAndHashCode
@@ -221,6 +241,10 @@ m2.select(all).unique().from(names)
assert m1 == m2
assert (m1.names as Set) == ['Bob','Alice'] as Set
'''
+ }
+
+ @Test
+ void testCommandChainEquivalence7() {
assertScript '''import groovy.transform.Canonical
@Canonical
@@ -261,7 +285,7 @@ assert m1.thing == 'cookies'
}
@Test
- void testCommandChainImplementation() {
+ void testCommandChainImplementation1() {
assertScript '''
// tag::commandchain_impl1[]
show = { println it }
@@ -278,6 +302,10 @@ please show the square_root of 100
// ==> 10.0
// end::commandchain_impl1[]
'''
+ }
+
+ @Test
+ void testCommandChainImplementation2() {
assertScript '''
// tag::commandchain_impl2[]
@Grab('com.google.guava:guava:r09')
@@ -288,6 +316,10 @@ def result =
Splitter.on(',').trimResults(CharMatcher.is('_' as char)).split("_a
// end::commandchain_impl2_assert[]
assert result == ['a ', 'b_ ', 'c']
'''
+ }
+
+ @Test
+ void testCommandChainImplementation3() {
assertScript '''
// tag::commandchain_impl3[]
@Grab('com.google.guava:guava:r09')
diff --git a/src/test/groovy/bugs/Groovy9265.groovy
b/src/test/groovy/bugs/Groovy5912.groovy
similarity index 63%
copy from src/test/groovy/bugs/Groovy9265.groovy
copy to src/test/groovy/bugs/Groovy5912.groovy
index a7fe0bef68..74c7816853 100644
--- a/src/test/groovy/bugs/Groovy9265.groovy
+++ b/src/test/groovy/bugs/Groovy5912.groovy
@@ -18,32 +18,26 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
-import static groovy.test.GroovyAssert.assertScript
+import static groovy.test.GroovyAssert.shouldFail
-@CompileStatic
-final class Groovy9265 {
+final class Groovy5912 {
@Test
- void testAccessInnerClassFieldFromClosure() {
- assertScript '''
- class Outer {
- static class Inner {
- public String field = 'works'
- }
- }
+ void testPackageVisibility() {
+ def err = shouldFail '''
+ import bugs.groovy5912.PluginPathAwareFileSystemResourceLoader
@groovy.transform.CompileStatic
- def test() {
- return { ->
- def var = new Outer.Inner()
- var.field
- }()
+ class GrailsProjectLoader {
+ def access() {
+ new
PluginPathAwareFileSystemResourceLoader().setSearchLocations(null)
+ }
}
- assert test() == 'works'
+ new GrailsProjectLoader().access()
'''
+ assert err.message.contains('Cannot find matching method
bugs.groovy5912.PluginPathAwareFileSystemResourceLoader#setSearchLocations')
}
}
diff --git a/src/test/groovy/bugs/Groovy9213.groovy
b/src/test/groovy/bugs/Groovy9213.groovy
index 8a43c59060..849e4796bd 100644
--- a/src/test/groovy/bugs/Groovy9213.groovy
+++ b/src/test/groovy/bugs/Groovy9213.groovy
@@ -18,23 +18,21 @@
*/
package bugs
-import groovy.transform.CompileStatic
-import org.codehaus.groovy.control.CompilerConfiguration
import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.Timeout
-import static org.codehaus.groovy.control.ParserPluginFactory.antlr4
+import static groovy.test.GroovyAssert.assertScript
-@CompileStatic @Disabled
final class Groovy9213 {
+
@Timeout(15000)
+ @Disabled
@Test
void testUnmatchedParenInLongScript4() {
- def config = new CompilerConfiguration(pluginFactory: antlr4())
- new GroovyShell(config).evaluate('''
+ assertScript '''
int a = 0
(
- ''' + ('a = 0\n' * 50))
+ ''' + ('a = 0\n' * 50)
}
}
diff --git a/src/test/groovy/bugs/Groovy9215.groovy
b/src/test/groovy/bugs/Groovy9215.groovy
index a03781ddd0..afb9d883f3 100644
--- a/src/test/groovy/bugs/Groovy9215.groovy
+++ b/src/test/groovy/bugs/Groovy9215.groovy
@@ -19,12 +19,10 @@
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9215 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9226.groovy
b/src/test/groovy/bugs/Groovy9226.groovy
index 3222333ad7..a04e1b3688 100644
--- a/src/test/groovy/bugs/Groovy9226.groovy
+++ b/src/test/groovy/bugs/Groovy9226.groovy
@@ -19,12 +19,10 @@
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9226 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9236.groovy
b/src/test/groovy/bugs/Groovy9236.groovy
index cfacf8d29d..eb7bc5237a 100644
--- a/src/test/groovy/bugs/Groovy9236.groovy
+++ b/src/test/groovy/bugs/Groovy9236.groovy
@@ -18,10 +18,8 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
-@CompileStatic
final class Groovy9236 {
/**
diff --git a/src/test/groovy/bugs/Groovy9238.groovy
b/src/test/groovy/bugs/Groovy9238.groovy
index b5b32d9c82..3c5075c06b 100644
--- a/src/test/groovy/bugs/Groovy9238.groovy
+++ b/src/test/groovy/bugs/Groovy9238.groovy
@@ -25,7 +25,6 @@ import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9238 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9240.groovy
b/src/test/groovy/bugs/Groovy9240.groovy
index a27fee3531..e5c75e58b3 100644
--- a/src/test/groovy/bugs/Groovy9240.groovy
+++ b/src/test/groovy/bugs/Groovy9240.groovy
@@ -18,12 +18,10 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9240 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9252.groovy
b/src/test/groovy/bugs/Groovy9252.groovy
index ba5e303482..16cdcf1534 100644
--- a/src/test/groovy/bugs/Groovy9252.groovy
+++ b/src/test/groovy/bugs/Groovy9252.groovy
@@ -18,12 +18,10 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9252 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9261.groovy
b/src/test/groovy/bugs/Groovy9261.groovy
index 710012f04d..a4d7d0a619 100644
--- a/src/test/groovy/bugs/Groovy9261.groovy
+++ b/src/test/groovy/bugs/Groovy9261.groovy
@@ -18,12 +18,10 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.shouldFail
-@CompileStatic
final class Groovy9261 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9265.groovy
b/src/test/groovy/bugs/Groovy9265.groovy
index a7fe0bef68..5770529713 100644
--- a/src/test/groovy/bugs/Groovy9265.groovy
+++ b/src/test/groovy/bugs/Groovy9265.groovy
@@ -18,12 +18,10 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9265 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9270.groovy
b/src/test/groovy/bugs/Groovy9270.groovy
index 611b946907..f4f364832b 100644
--- a/src/test/groovy/bugs/Groovy9270.groovy
+++ b/src/test/groovy/bugs/Groovy9270.groovy
@@ -18,13 +18,11 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
import static groovy.test.GroovyAssert.shouldFail
-@CompileStatic
final class Groovy9270 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9271.groovy
b/src/test/groovy/bugs/Groovy9271.groovy
index 2113f1da32..1c2f54a5b9 100644
--- a/src/test/groovy/bugs/Groovy9271.groovy
+++ b/src/test/groovy/bugs/Groovy9271.groovy
@@ -18,11 +18,9 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.codehaus.groovy.control.CompilerConfiguration
import org.junit.jupiter.api.Test
-@CompileStatic
final class Groovy9271 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9292.groovy
b/src/test/groovy/bugs/Groovy9292.groovy
index ea7c44d014..1918731e05 100644
--- a/src/test/groovy/bugs/Groovy9292.groovy
+++ b/src/test/groovy/bugs/Groovy9292.groovy
@@ -29,7 +29,8 @@ final class Groovy9292 {
ast(groovy.transform.CompileStatic)
}
- @Test // GROOVY-11356
+ // GROOVY-11356
+ @Test
void 'test accessing a private super class field inside a closure - same
module'() {
def err = shouldFail shell, '''
package a
@@ -49,7 +50,8 @@ final class Groovy9292 {
assert err.message =~ /No such property: superField for class: a.B/
}
- @Test // GROOVY-11356
+ // GROOVY-11356
+ @Test
void 'test accessing a private super class field inside a closure - same
package'() {
assertScript shell, '''
package a
@@ -74,7 +76,8 @@ final class Groovy9292 {
assert err.message =~ /No such property: superField for class: a.B/
}
- @Test // GROOVY-11356
+ // GROOVY-11356
+ @Test
void 'test accessing a private super class field inside a closure - diff
package'() {
assertScript shell, '''
package a
diff --git a/src/test/groovy/bugs/Groovy9294.groovy
b/src/test/groovy/bugs/Groovy9294.groovy
index b1480ba146..d6fac471c4 100644
--- a/src/test/groovy/bugs/Groovy9294.groovy
+++ b/src/test/groovy/bugs/Groovy9294.groovy
@@ -18,12 +18,10 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9294 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9324.groovy
b/src/test/groovy/bugs/Groovy9324.groovy
index 2c92d112be..b31706e5ef 100644
--- a/src/test/groovy/bugs/Groovy9324.groovy
+++ b/src/test/groovy/bugs/Groovy9324.groovy
@@ -18,12 +18,10 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9324 {
@Test
@@ -46,5 +44,4 @@ final class Groovy9324 {
AstAssert.assertSyntaxTree(expected, actual)
'''
}
-
}
diff --git a/src/test/groovy/bugs/Groovy9327.groovy
b/src/test/groovy/bugs/Groovy9327.groovy
index cd866a7635..66a505168d 100644
--- a/src/test/groovy/bugs/Groovy9327.groovy
+++ b/src/test/groovy/bugs/Groovy9327.groovy
@@ -18,12 +18,10 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.shouldFail
-@CompileStatic
final class Groovy9327 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9329.groovy
b/src/test/groovy/bugs/Groovy9329.groovy
index fe2c8634a0..7baddeb81c 100644
--- a/src/test/groovy/bugs/Groovy9329.groovy
+++ b/src/test/groovy/bugs/Groovy9329.groovy
@@ -18,13 +18,12 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9329 {
+
@Test
void test() {
assertScript '''
diff --git a/src/test/groovy/bugs/Groovy9336.groovy
b/src/test/groovy/bugs/Groovy9336.groovy
index 9d57b1068f..fcfbad2267 100644
--- a/src/test/groovy/bugs/Groovy9336.groovy
+++ b/src/test/groovy/bugs/Groovy9336.groovy
@@ -18,12 +18,10 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9336 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9338.groovy
b/src/test/groovy/bugs/Groovy9338.groovy
index 7cce3a29c0..8f503fbe10 100644
--- a/src/test/groovy/bugs/Groovy9338.groovy
+++ b/src/test/groovy/bugs/Groovy9338.groovy
@@ -18,12 +18,10 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.shouldFail
-@CompileStatic
final class Groovy9338 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9370.groovy
b/src/test/groovy/bugs/Groovy9370.groovy
index c7390c9a22..e3ece9437c 100644
--- a/src/test/groovy/bugs/Groovy9370.groovy
+++ b/src/test/groovy/bugs/Groovy9370.groovy
@@ -18,12 +18,10 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9370 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9387.groovy
b/src/test/groovy/bugs/Groovy9387.groovy
index eab20100ef..a14d6ec928 100644
--- a/src/test/groovy/bugs/Groovy9387.groovy
+++ b/src/test/groovy/bugs/Groovy9387.groovy
@@ -18,12 +18,10 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9387 {
private static final String SUPPORT_ADAPTER = '''
diff --git a/src/test/groovy/bugs/Groovy9400.groovy
b/src/test/groovy/bugs/Groovy9400.groovy
index 2e1bea7709..b3a0d2153a 100644
--- a/src/test/groovy/bugs/Groovy9400.groovy
+++ b/src/test/groovy/bugs/Groovy9400.groovy
@@ -18,21 +18,20 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
-@CompileStatic
final class Groovy9400 {
+
@Test
- void testCR() {
- final GroovyShell shell = new GroovyShell()
+ void testCR1() {
+ def shell = new GroovyShell()
def script = shell.parse("println('hello world 1')\rprintln('hello
world 2')")
script.run()
}
@Test
void testCR2() {
- final GroovyShell shell = new GroovyShell()
+ def shell = new GroovyShell()
def script = shell.parse("def a = 1\rdef b = a\rb")
assert 1 == script.run()
}
diff --git a/src/test/groovy/bugs/Groovy9412.groovy
b/src/test/groovy/bugs/Groovy9412.groovy
index 795126e6bd..7dcda84aa7 100644
--- a/src/test/groovy/bugs/Groovy9412.groovy
+++ b/src/test/groovy/bugs/Groovy9412.groovy
@@ -18,12 +18,10 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9412 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9413.groovy
b/src/test/groovy/bugs/Groovy9413.groovy
index 6b8e181de3..1eb2b9a3b9 100644
--- a/src/test/groovy/bugs/Groovy9413.groovy
+++ b/src/test/groovy/bugs/Groovy9413.groovy
@@ -23,6 +23,7 @@ import
org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit
import org.junit.jupiter.api.Test
final class Groovy9413 {
+
@Test
void testInterfaceGenerics() {
def config = new CompilerConfiguration(
diff --git a/src/test/groovy/bugs/Groovy9524.groovy
b/src/test/groovy/bugs/Groovy9524.groovy
index 5f6db463c4..926cffa056 100644
--- a/src/test/groovy/bugs/Groovy9524.groovy
+++ b/src/test/groovy/bugs/Groovy9524.groovy
@@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
final class Groovy9524 {
+
@Test
void testEnumConstClassCallingPrivateMethod() {
assertScript '''
diff --git a/src/test/groovy/bugs/Groovy9556.groovy
b/src/test/groovy/bugs/Groovy9556.groovy
index eea4be08ee..f0b3320547 100644
--- a/src/test/groovy/bugs/Groovy9556.groovy
+++ b/src/test/groovy/bugs/Groovy9556.groovy
@@ -23,7 +23,7 @@ import
org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit
import org.junit.jupiter.api.Test
final class Groovy9556 {
-// .\gradlew --no-daemon --max-workers 2 :test --tests groovy.bugs.Groovy9556
--debug-jvm
+
@Test
void testInheritConstructors() {
def config = new CompilerConfiguration(
diff --git a/src/test/groovy/bugs/Groovy9566.groovy
b/src/test/groovy/bugs/Groovy9566.groovy
index b6a1f2ea15..e5d84d1e6d 100644
--- a/src/test/groovy/bugs/Groovy9566.groovy
+++ b/src/test/groovy/bugs/Groovy9566.groovy
@@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
final class Groovy9566 {
+
@Test
void testDefaultImportsWithSameClassName() {
assertScript '''
diff --git a/src/test/groovy/bugs/Groovy9587.groovy
b/src/test/groovy/bugs/Groovy9587.groovy
index a04dd7ae39..4992abfe5a 100644
--- a/src/test/groovy/bugs/Groovy9587.groovy
+++ b/src/test/groovy/bugs/Groovy9587.groovy
@@ -18,12 +18,10 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9587 {
@Test
diff --git a/src/test/groovy/bugs/Groovy9589.groovy
b/src/test/groovy/bugs/Groovy9589.groovy
index fc0b3ef9d2..e411b735d5 100644
--- a/src/test/groovy/bugs/Groovy9589.groovy
+++ b/src/test/groovy/bugs/Groovy9589.groovy
@@ -26,6 +26,7 @@ import org.codehaus.groovy.control.Phases
import org.junit.jupiter.api.Test
final class Groovy9589 {
+
@Test
void testParallelParse() {
final cnt = 2
diff --git a/src/test/groovy/bugs/Groovy9601.groovy
b/src/test/groovy/bugs/Groovy9601.groovy
index 884a64546d..2973fac9c0 100644
--- a/src/test/groovy/bugs/Groovy9601.groovy
+++ b/src/test/groovy/bugs/Groovy9601.groovy
@@ -18,14 +18,13 @@
*/
package bugs
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy9601 {
- @Test // regression test
+
+ @Test
void testAccessVariableSpecifiedByAbstractGetter() {
assertScript '''
abstract class Base {
diff --git a/src/test/groovy/bugs/Groovy9611.groovy
b/src/test/groovy/bugs/Groovy9611.groovy
index 7758bf1687..d173fbd3c5 100644
--- a/src/test/groovy/bugs/Groovy9611.groovy
+++ b/src/test/groovy/bugs/Groovy9611.groovy
@@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
final class Groovy9611 {
+
@Test
void testAccessFieldWithinAICUsingReflection() {
assertScript '''
diff --git a/src/test/groovy/bugs/Groovy965_Bug.groovy
b/src/test/groovy/bugs/Groovy965.groovy
similarity index 76%
rename from src/test/groovy/bugs/Groovy965_Bug.groovy
rename to src/test/groovy/bugs/Groovy965.groovy
index 90809df3c1..b4f2fb181d 100644
--- a/src/test/groovy/bugs/Groovy965_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy965.groovy
@@ -22,27 +22,28 @@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.assertEquals
-
/**
* A test case to ensure that Groovy can compile class names and variable
names with non-ASCII
* characters and that non-ASCII characters in Strings do the right thing.
*/
-class Groovy965_Bug {
-
- @Test
- void testUnicodeVariableNamesAndStrings ( ) {
- def âøñè = 'âøñè'
- assertEquals ( 'âøñè' , âøñè )
- }
-
- @Test
- void testUnicodeMëthødName ( ) { }
-
- @Test
- void testUnicodeClassName ( ) {
- def object = new Bläh ( )
- assert true
- }
+final class Groovy965 {
+
+ @Test
+ void testUnicodeVariableNamesAndStrings() {
+ def âøñè = 'âøñè'
+ assertEquals('âøñè', âøñè)
+ }
+
+ @Test
+ void testUnicodeMëthødName() {
+ }
+
+ @Test
+ void testUnicodeClassName() {
+ def blah = new Bläh()
+ assert true
+ }
+
+ static class Bläh {
+ }
}
-
-class Bläh { }
diff --git a/src/test/groovy/bugs/Groovy9666.groovy
b/src/test/groovy/bugs/Groovy9666.groovy
index c9da1a0499..2401228752 100644
--- a/src/test/groovy/bugs/Groovy9666.groovy
+++ b/src/test/groovy/bugs/Groovy9666.groovy
@@ -24,6 +24,7 @@ import org.codehaus.groovy.control.SourceUnit
import org.junit.jupiter.api.Test
final class Groovy9666 {
+
@Test
void testCanIterateImportsWhileAdding() {
def mn = new ModuleNode((SourceUnit)null)
diff --git a/src/test/groovy/bugs/Groovy9706.groovy
b/src/test/groovy/bugs/Groovy9706.groovy
index 27437f840c..1a5b351bdd 100644
--- a/src/test/groovy/bugs/Groovy9706.groovy
+++ b/src/test/groovy/bugs/Groovy9706.groovy
@@ -22,8 +22,8 @@ import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
+final class Groovy9706 {
-class Groovy9706 {
@Test
void testVarargsPrimitive() {
assertScript '''
diff --git a/src/test/groovy/bugs/Groovy9719.groovy
b/src/test/groovy/bugs/Groovy9719.groovy
index 8740849e47..69ab4e0d7e 100644
--- a/src/test/groovy/bugs/Groovy9719.groovy
+++ b/src/test/groovy/bugs/Groovy9719.groovy
@@ -18,7 +18,6 @@
*/
package bugs
-
import org.codehaus.groovy.control.CompilationUnit
import org.codehaus.groovy.control.CompilerConfiguration
import org.junit.jupiter.api.Test
@@ -26,6 +25,7 @@ import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
final class Groovy9719 {
+
@Test
void testInnerClassRef() {
def config = new CompilerConfiguration()
diff --git a/src/test/groovy/bugs/Groovy9797.groovy
b/src/test/groovy/bugs/Groovy9797.groovy
index fcd2f70df8..7b9e855cfa 100644
--- a/src/test/groovy/bugs/Groovy9797.groovy
+++ b/src/test/groovy/bugs/Groovy9797.groovy
@@ -23,8 +23,7 @@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.assertEquals
import static org.junit.jupiter.api.Assertions.assertNotSame
-
-/*
+/**
* About bug fix:
* According to the IEEE-754 floating point standard, the sign of a negative
zero
* must be preserved. However, when Groovy compiles code, it uses the ==
@@ -34,10 +33,9 @@ import static org.junit.jupiter.api.Assertions.assertNotSame
* standard. This fix uses Float.equals which can differentiate between
positive
* and negative zero.
*/
+final class Groovy9797 {
-class Groovy9797 {
- // Test with string conversion
- @Test
+ @Test // with string conversion
void testFloatToString() {
float negativeZero = -0.0f
float positiveZero = 0.0f
@@ -45,16 +43,14 @@ class Groovy9797 {
assertEquals('0.0', (positiveZero).toString())
}
- // Test with int bits
- @Test
+ @Test // with int bits
void testNegativePositiveZeroFloatIntBitsNotSame() {
int negativeZeroBits = Float.floatToIntBits(-0.0f)
int positiveZeroBits = Float.floatToIntBits(0.0f)
assertNotSame(negativeZeroBits, positiveZeroBits)
}
- // Test with string conversion
- @Test
+ @Test // with string conversion
void testDoubleToString() {
double negativeZero = -0.0d
double positiveZero = 0.0d
@@ -62,8 +58,7 @@ class Groovy9797 {
assertEquals('0.0', (positiveZero).toString())
}
- // Test with long bits
- @Test
+ @Test // with long bits
void testNegativePositiveZeroDoubleLongBitsNotSame() {
long negativeZeroBits = Double.doubleToLongBits(-0.0d)
long positiveZeroBits = Double.doubleToLongBits(0.0d)
diff --git a/src/test/groovy/bugs/Groovy9815.groovy
b/src/test/groovy/bugs/Groovy9815.groovy
index a484de51f3..99bad7b60b 100644
--- a/src/test/groovy/bugs/Groovy9815.groovy
+++ b/src/test/groovy/bugs/Groovy9815.groovy
@@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
final class Groovy9815 {
+
@Test
void testObjectVsStaticMethod() {
10.times {
diff --git a/src/test/groovy/bugs/Groovy9911.groovy
b/src/test/groovy/bugs/Groovy9911.groovy
index 207fcae3c9..b07f3a0c4f 100644
--- a/src/test/groovy/bugs/Groovy9911.groovy
+++ b/src/test/groovy/bugs/Groovy9911.groovy
@@ -21,6 +21,7 @@ package bugs
import org.junit.jupiter.api.Test
final class Groovy9911 {
+
@Test
void testTupleEqualityWithNonComparableElements() {
assert Tuple.tuple(1, [2]) == Tuple.tuple(1, [2])
diff --git a/src/test/groovy/bugs/Groovy9922.groovy
b/src/test/groovy/bugs/Groovy9922.groovy
index bc542b6779..c12709f6e5 100644
--- a/src/test/groovy/bugs/Groovy9922.groovy
+++ b/src/test/groovy/bugs/Groovy9922.groovy
@@ -21,6 +21,7 @@ package bugs
import org.junit.jupiter.api.Test
final class Groovy9922 {
+
@Test
void getPidConfirmedByJpsOutputOnEnvironmentsWithThatExecutable() {
def result = executeJpsSafe()
diff --git a/src/test/groovy/bugs/Groovy996_Bug.groovy
b/src/test/groovy/bugs/Groovy996.groovy
similarity index 80%
rename from src/test/groovy/bugs/Groovy996_Bug.groovy
rename to src/test/groovy/bugs/Groovy996.groovy
index 8c92918eac..7baf6e54fd 100644
--- a/src/test/groovy/bugs/Groovy996_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy996.groovy
@@ -20,21 +20,21 @@ package bugs
import org.junit.jupiter.api.Test
+final class Groovy996 {
-class Groovy996_Bug {
@Test
void testAccessToSuperProtectedField() {
- def a = new Groovy996_SubClass()
+ def a = new SubClass()
a.out()
}
-}
-class Groovy996_SuperClass {
- protected String x = 'This is an X'
-}
+ static class SuperClass {
+ protected String x = 'This is an X'
+ }
-class Groovy996_SubClass extends Groovy996_SuperClass {
- void out() {
- println( x )
+ static class SubClass extends SuperClass {
+ void out() {
+ println( x )
+ }
}
}
diff --git a/src/test/groovy/bugs/Groovy9966.groovy
b/src/test/groovy/bugs/Groovy9966.groovy
index 77076915ed..f70e6705ee 100644
--- a/src/test/groovy/bugs/Groovy9966.groovy
+++ b/src/test/groovy/bugs/Groovy9966.groovy
@@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.shouldFail
final class Groovy9966 {
+
@Test
void testWhenStarsAlign() {
shouldFail MissingPropertyException, '''
diff --git a/src/test/groovy/bugs/Groovy9982.groovy
b/src/test/groovy/bugs/Groovy9982.groovy
index 2f914e88a6..2260a68db2 100644
--- a/src/test/groovy/bugs/Groovy9982.groovy
+++ b/src/test/groovy/bugs/Groovy9982.groovy
@@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
final class Groovy9982 {
+
@Test
void testMethodAndPropertyWithSameName() {
assertScript '''
diff --git
a/src/test/groovy/bugs/groovy10121/AnnotationCollectorReflectionTest.groovy
b/src/test/groovy/bugs/groovy10121/AnnotationCollectorReflectionTest.groovy
index 2124d4a20e..d4f436d258 100644
--- a/src/test/groovy/bugs/groovy10121/AnnotationCollectorReflectionTest.groovy
+++ b/src/test/groovy/bugs/groovy10121/AnnotationCollectorReflectionTest.groovy
@@ -21,6 +21,7 @@ package bugs.groovy10121
import org.junit.jupiter.api.Test
final class AnnotationCollectorReflectionTest {
+
@Test
void testHelperIsVisibleAsInnerClass() {
def innerNames = SomeCollectedAnnotations.classes*.name
diff --git a/src/test/groovy/bugs/groovy5912/otherpkg/Groovy5912Bug.groovy
b/src/test/groovy/bugs/groovy5912/otherpkg/Groovy5912Bug.groovy
deleted file mode 100644
index 829509fdef..0000000000
--- a/src/test/groovy/bugs/groovy5912/otherpkg/Groovy5912Bug.groovy
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bugs.groovy5912.otherpkg
-
-
-class Groovy5912Bug {
- void test() {
- def errMsg = shouldFail '''
- package bugs.groovy5912.otherpkg
-
- import bugs.groovy5912.PluginPathAwareFileSystemResourceLoader
-import org.junit.jupiter.api.Test
-import static groovy.test.GroovyAssert.*
-
- @groovy.transform.CompileStatic
- class GrailsProjectLoader {
- def access() {
- new
PluginPathAwareFileSystemResourceLoader().setSearchLocations(null)
- }
- }
-
- new GrailsProjectLoader().access()
- '''
-
- assert errMsg.message.contains('[Static type checking] - Cannot find
matching method
bugs.groovy5912.PluginPathAwareFileSystemResourceLoader#setSearchLocations')
- }
-}
diff --git a/src/test/groovy/bugs/groovy8531/Groovy8531.groovy
b/src/test/groovy/bugs/groovy8531/Groovy8531.groovy
index c2a5ced26a..ce35cddfd0 100644
--- a/src/test/groovy/bugs/groovy8531/Groovy8531.groovy
+++ b/src/test/groovy/bugs/groovy8531/Groovy8531.groovy
@@ -18,13 +18,11 @@
*/
package bugs.groovy8531
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
import static groovy.test.GroovyAssert.shouldFail
-@CompileStatic
final class Groovy8531 {
@Test
@@ -82,7 +80,6 @@ final class Groovy8531 {
void reduce(PrivateContext context) {}
}
'''
-
assert err.message.contains('unable to resolve class PrivateContext')
}
@@ -94,7 +91,6 @@ final class Groovy8531 {
void reduce(PrivateBaseContext context) {}
}
'''
-
assert err.message.contains('unable to resolve class
PrivateBaseContext')
}
@@ -109,7 +105,6 @@ final class Groovy8531 {
void reduce(PackagePrivateContext context) {}
}
'''
-
assert err.message.contains('unable to resolve class
PackagePrivateContext')
}
}
diff --git a/src/test/groovy/bugs/groovy8757/UsageTest.groovy
b/src/test/groovy/bugs/groovy8757/UsageTest.groovy
index 2d7e56de93..a9a5605863 100644
--- a/src/test/groovy/bugs/groovy8757/UsageTest.groovy
+++ b/src/test/groovy/bugs/groovy8757/UsageTest.groovy
@@ -22,7 +22,8 @@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.assertEquals
-class UsageTest {
+final class UsageTest {
+
@Test
void testAccessingPrecompiledTraitWithMethodGenerics() {
def c0 = new GroovyShell().evaluate('''
diff --git
a/src/test/groovy/bugs/groovy8953/SyntheticParameterAnnotationsBug.groovy
b/src/test/groovy/bugs/groovy8953/SyntheticParameterAnnotationsBug.groovy
index 639480d1be..e050aaafe5 100644
--- a/src/test/groovy/bugs/groovy8953/SyntheticParameterAnnotationsBug.groovy
+++ b/src/test/groovy/bugs/groovy8953/SyntheticParameterAnnotationsBug.groovy
@@ -22,7 +22,8 @@ import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-class SyntheticParameterAnnotationsBug {
+final class SyntheticParameterAnnotationsBug {
+
@Test
void testEnumConstructorWithSyntheticParamUsageWithAsmResolvingDisabled() {
assertScript '''
diff --git a/src/test/groovy/bugs/groovy8966/Groovy8966.groovy
b/src/test/groovy/bugs/groovy8966/Groovy8966.groovy
index e55101da37..d8d30d3129 100644
--- a/src/test/groovy/bugs/groovy8966/Groovy8966.groovy
+++ b/src/test/groovy/bugs/groovy8966/Groovy8966.groovy
@@ -18,13 +18,12 @@
*/
package bugs.groovy8966
-import groovy.transform.CompileStatic
import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
-@CompileStatic
final class Groovy8966 {
+
@Test
void test() {
assertScript '''
diff --git a/src/test/groovy/bugs/groovy9204/Groovy9204.groovy
b/src/test/groovy/bugs/groovy9204/Groovy9204.groovy
index 5423afbd0f..b0e38fc989 100644
--- a/src/test/groovy/bugs/groovy9204/Groovy9204.groovy
+++ b/src/test/groovy/bugs/groovy9204/Groovy9204.groovy
@@ -22,8 +22,8 @@ import org.junit.jupiter.api.Test
import static groovy.test.GroovyAssert.assertScript
+final class Groovy9204 {
-class Groovy9204 {
@Test
void testGenerics() {
assertScript '''
diff --git a/src/test/groovy/bugs/groovy9742/Groovy9742.groovy
b/src/test/groovy/bugs/groovy9742/Groovy9742.groovy
index 998dca88a2..c41ddd7fcd 100644
--- a/src/test/groovy/bugs/groovy9742/Groovy9742.groovy
+++ b/src/test/groovy/bugs/groovy9742/Groovy9742.groovy
@@ -26,7 +26,8 @@ import java.util.concurrent.Executors
import java.util.concurrent.Future
import java.util.concurrent.TimeUnit
-class Groovy9742 {
+final class Groovy9742 {
+
@Test
void testDeadLock() {
ExecutorService fixedThreadPool = Executors.newFixedThreadPool(1);
