Skip to content

Commit 1126eff

Browse files
committed
Disable Derby-based tests for Java < 21
1 parent e9c54cf commit 1126eff

8 files changed

Lines changed: 27 additions & 2 deletions

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/dsl/JdbcTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626

2727
import org.assertj.core.api.InstanceOfAssertFactories;
2828
import org.junit.jupiter.api.Test;
29+
import org.junit.jupiter.api.condition.EnabledForJreRange;
30+
import org.junit.jupiter.api.condition.EnabledOnJre;
31+
import org.junit.jupiter.api.condition.JRE;
2932
import org.mockito.Mockito;
3033

3134
import org.springframework.beans.factory.BeanFactory;
@@ -75,6 +78,7 @@
7578
*/
7679
@SpringJUnitConfig
7780
@DirtiesContext
81+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "Derby 10.17")
7882
class JdbcTests {
7983

8084
@Autowired

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/inbound/JdbcPollingChannelAdapterIntegrationTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import org.junit.jupiter.api.AfterEach;
2626
import org.junit.jupiter.api.BeforeAll;
2727
import org.junit.jupiter.api.Test;
28+
import org.junit.jupiter.api.condition.EnabledForJreRange;
29+
import org.junit.jupiter.api.condition.JRE;
2830

2931
import org.springframework.integration.test.support.TestApplicationContextAware;
3032
import org.springframework.jdbc.core.JdbcTemplate;
@@ -45,6 +47,7 @@
4547
* @author Gary Russell
4648
* @author Artem Bilan
4749
*/
50+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "Derby 10.17")
4851
public class JdbcPollingChannelAdapterIntegrationTests implements TestApplicationContextAware {
4952

5053
private static EmbeddedDatabase embeddedDatabase;

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/metadata/JdbcMetadataStoreTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import org.apache.derby.shared.common.error.StandardException;
2222
import org.junit.jupiter.api.BeforeEach;
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.context.ApplicationContextException;
@@ -41,6 +43,7 @@
4143
@SpringJUnitConfig
4244
@DirtiesContext // close at the end after class
4345
@Transactional
46+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "Derby 10.17")
4447
public class JdbcMetadataStoreTests {
4548

4649
@Autowired

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/outbound/StoredProcMessageHandlerDerbyIntegrationTests.java

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

2830
import org.springframework.expression.Expression;
2931
import org.springframework.integration.config.ExpressionFactoryBean;
@@ -46,6 +48,7 @@
4648
* @author Gary Russell
4749
* @author Artem Bilan
4850
*/
51+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "Derby 10.17")
4952
public class StoredProcMessageHandlerDerbyIntegrationTests implements TestApplicationContextAware {
5053

5154
private static EmbeddedDatabase embeddedDatabase;

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/outbound/StoredProcOutboundChannelAdapterWithinChainTests.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import java.util.Map;
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

2325
import org.springframework.beans.factory.annotation.Autowired;
2426
import org.springframework.integration.jdbc.storedproc.User;
@@ -37,7 +39,8 @@
3739
* @since 2.2
3840
*/
3941
@SpringJUnitConfig
40-
@DirtiesContext // close at the end after class
42+
@DirtiesContext
43+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "Derby 10.17")
4144
public class StoredProcOutboundChannelAdapterWithinChainTests {
4245

4346
@Autowired

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/outbound/StoredProcOutboundGatewayWithNamespaceIntegrationTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727

2828
import org.junit.jupiter.api.BeforeEach;
2929
import org.junit.jupiter.api.Test;
30+
import org.junit.jupiter.api.condition.EnabledForJreRange;
31+
import org.junit.jupiter.api.condition.JRE;
3032

3133
import org.springframework.beans.factory.annotation.Autowired;
3234
import org.springframework.integration.annotation.ServiceActivator;
@@ -49,6 +51,7 @@
4951
*/
5052
@SpringJUnitConfig
5153
@DirtiesContext
54+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "Derby 10.17")
5255
public class StoredProcOutboundGatewayWithNamespaceIntegrationTests {
5356

5457
@Autowired

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/outbound/StoredProcOutboundGatewayWithSpelIntegrationTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import java.util.concurrent.atomic.AtomicInteger;
2525

2626
import org.junit.jupiter.api.Test;
27+
import org.junit.jupiter.api.condition.EnabledForJreRange;
28+
import org.junit.jupiter.api.condition.JRE;
2729
import org.mockito.Mockito;
2830

2931
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +61,7 @@
5961
*/
6062
@SpringJUnitConfig
6163
@DirtiesContext
64+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "Derby 10.17")
6265
public class StoredProcOutboundGatewayWithSpelIntegrationTests {
6366

6467
@Autowired

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/outbound/StoredProcOutboundGatewayWithSpringContextIntegrationTests.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import java.util.concurrent.atomic.AtomicInteger;
2626

2727
import org.junit.jupiter.api.Test;
28+
import org.junit.jupiter.api.condition.EnabledForJreRange;
29+
import org.junit.jupiter.api.condition.JRE;
2830

2931
import org.springframework.beans.factory.annotation.Autowired;
3032
import org.springframework.context.support.AbstractApplicationContext;
@@ -43,7 +45,8 @@
4345
* @author Artem Bilan
4446
*/
4547
@SpringJUnitConfig
46-
@DirtiesContext // close at the end after class
48+
@DirtiesContext
49+
@EnabledForJreRange(min = JRE.JAVA_21, disabledReason = "Derby 10.17")
4750
public class StoredProcOutboundGatewayWithSpringContextIntegrationTests {
4851

4952
@Autowired

0 commit comments

Comments
 (0)