Skip to content

Commit d806c35

Browse files
committed
Disable JRuby-based tests for Java < 21
**Auto-cherry-pick to `7.0.x`**
1 parent 1126eff commit d806c35

3 files changed

Lines changed: 11 additions & 2 deletions

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import org.junit.jupiter.api.AfterAll;
2323
import org.junit.jupiter.api.BeforeAll;
2424
import org.junit.jupiter.api.Test;
25+
import org.junit.jupiter.api.condition.EnabledForJreRange;
26+
import org.junit.jupiter.api.condition.JRE;
2527

2628
import org.springframework.beans.factory.annotation.Autowired;
2729
import org.springframework.messaging.MessageChannel;
@@ -40,6 +42,7 @@
4042
*/
4143
@SpringJUnitConfig
4244
@DirtiesContext
45+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "JRuby 10.0.5.0")
4346
public class Int3164Jsr223RefreshTests {
4447

4548
private static File workDir;

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223SplitterTests.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;
@@ -36,6 +38,7 @@
3638
*/
3739
@SpringJUnitConfig
3840
@DirtiesContext
41+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "JRuby 10.0.5.0")
3942
public class Jsr223SplitterTests {
4043

4144
@Autowired

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

Lines changed: 5 additions & 2 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

2426
import org.springframework.core.io.ClassPathResource;
2527
import org.springframework.core.io.Resource;
@@ -34,6 +36,7 @@
3436
* @author David Turanski
3537
* @author Artem Bilan
3638
*/
39+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "JRuby 10.0.5.0")
3740
public class Jsr223ScriptExecutorTests {
3841

3942
@Test
@@ -64,13 +67,13 @@ public void testPython() {
6467
Object obj = executor.executeScript(new StaticScriptSource("x=2"));
6568
assertThat(obj).isEqualTo(2);
6669

67-
obj = executor.executeScript(new StaticScriptSource("def foo(y):\n\tx=y\n\treturn y\nz=foo(2)"));
70+
obj = executor.executeScript(new StaticScriptSource("def test(y):\n\tx=y\n\treturn y\nz=test(2)"));
6871
assertThat(obj).isEqualTo(2);
6972
}
7073

7174
@Test
7275
public void testInvalidLanguageThrowsIllegalArgumentException() {
73-
assertThatIllegalArgumentException().isThrownBy(() -> ScriptExecutorFactory.getScriptExecutor("foo"));
76+
assertThatIllegalArgumentException().isThrownBy(() -> ScriptExecutorFactory.getScriptExecutor("test"));
7477
}
7578

7679
}

0 commit comments

Comments
 (0)