Skip to content

Commit a5a1635

Browse files
committed
Disable more Ruby-based tests for Java < 21
**Auto-cherry-pick to `7.0.x`**
1 parent 098f1b6 commit a5a1635

7 files changed

Lines changed: 21 additions & 0 deletions

File tree

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
package org.springframework.integration.scripting.config.jsr223;
1818

1919
import org.junit.jupiter.api.Test;
20+
import org.junit.jupiter.api.condition.EnabledForJreRange;
21+
import org.junit.jupiter.api.condition.JRE;
2022

2123
import org.springframework.beans.factory.annotation.Autowired;
2224
import org.springframework.integration.channel.QueueChannel;
@@ -37,6 +39,7 @@
3739
*/
3840
@SpringJUnitConfig
3941
@DirtiesContext
42+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "JRuby 10.0.5.0")
4043
public class Jsr223HeaderEnricherTests {
4144

4245
@Autowired

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RefreshTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import java.io.InputStream;
2222

2323
import org.junit.jupiter.api.Test;
24+
import org.junit.jupiter.api.condition.EnabledForJreRange;
25+
import org.junit.jupiter.api.condition.JRE;
2426

2527
import org.springframework.beans.factory.annotation.Autowired;
2628
import org.springframework.core.io.AbstractResource;
@@ -41,6 +43,7 @@
4143
*/
4244
@SpringJUnitConfig
4345
@DirtiesContext
46+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "JRuby 10.0.5.0")
4447
public class Jsr223RefreshTests {
4548

4649
@Autowired

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223ServiceActivatorTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import java.util.Map;
2222

2323
import org.junit.jupiter.api.Test;
24+
import org.junit.jupiter.api.condition.EnabledForJreRange;
25+
import org.junit.jupiter.api.condition.JRE;
2426

2527
import org.springframework.beans.BeansException;
2628
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +49,7 @@
4749
*/
4850
@SpringJUnitConfig
4951
@DirtiesContext
52+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "JRuby 10.0.5.0")
5053
public class Jsr223ServiceActivatorTests {
5154

5255
@Autowired

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223TransformerTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import java.util.Set;
2121

2222
import org.junit.jupiter.api.Test;
23+
import org.junit.jupiter.api.condition.EnabledForJreRange;
24+
import org.junit.jupiter.api.condition.JRE;
2325

2426
import org.springframework.beans.factory.annotation.Autowired;
2527
import org.springframework.integration.channel.QueueChannel;
@@ -41,6 +43,7 @@
4143
*/
4244
@SpringJUnitConfig
4345
@DirtiesContext
46+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "JRuby 10.0.5.0")
4447
public class Jsr223TransformerTests {
4548

4649
@Autowired

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/dsl/ScriptsTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import org.junit.jupiter.api.AfterEach;
2424
import org.junit.jupiter.api.BeforeAll;
2525
import org.junit.jupiter.api.Test;
26+
import org.junit.jupiter.api.condition.EnabledForJreRange;
27+
import org.junit.jupiter.api.condition.JRE;
2628
import org.junit.jupiter.api.io.TempDir;
2729

2830
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +56,7 @@
5456
*/
5557
@SpringJUnitConfig
5658
@DirtiesContext
59+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "JRuby 10.0.5.0")
5760
public class ScriptsTests {
5861

5962
@TempDir

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/DeriveLanguageFromExtensionTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import java.util.stream.Stream;
2020

2121
import org.junit.jupiter.api.Test;
22+
import org.junit.jupiter.api.condition.EnabledForJreRange;
23+
import org.junit.jupiter.api.condition.JRE;
2224
import org.junit.jupiter.params.ParameterizedTest;
2325
import org.junit.jupiter.params.aggregator.ArgumentsAccessor;
2426
import org.junit.jupiter.params.provider.Arguments;
@@ -45,6 +47,7 @@
4547
*/
4648
@SpringJUnitConfig
4749
@DirtiesContext
50+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "JRuby 10.0.5.0")
4851
public class DeriveLanguageFromExtensionTests {
4952

5053
@Autowired

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutingMessageProcessorTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import java.util.Map;
2121

2222
import org.junit.jupiter.api.Test;
23+
import org.junit.jupiter.api.condition.EnabledForJreRange;
24+
import org.junit.jupiter.api.condition.JRE;
2325
import org.mockito.Mockito;
2426

2527
import org.springframework.beans.factory.BeanFactory;
@@ -37,6 +39,7 @@
3739
* @author Artem Bilan
3840
*
3941
*/
42+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "JRuby 10.0.5.0")
4043
public class Jsr223ScriptExecutingMessageProcessorTests {
4144

4245
private static final ScriptExecutor SCRIPT_EXECUTOR = ScriptExecutorFactory.getScriptExecutor("jruby");

0 commit comments

Comments
 (0)