diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveMessageSourceProducerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveMessageSourceProducerTests.java index f482b99fc7..ca94c6ac03 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveMessageSourceProducerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveMessageSourceProducerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 the original author or authors. + * Copyright 2020-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; @@ -46,8 +45,6 @@ import static org.mockito.Mockito.mock; public class ReactiveMessageSourceProducerTests { @Test - @DisabledIfEnvironmentVariable(named = "bamboo_buildKey", matches = ".*?", - disabledReason = "Timing is too short for CI") void testReactiveMessageSourceProducing() { LinkedBlockingQueue queue = IntStream.range(0, 10) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java index 9b741a7c10..4b66b3544d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java @@ -29,7 +29,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.mockito.Mockito; import org.springframework.beans.DirectFieldAccessor; @@ -416,8 +415,6 @@ public class DelayHandlerTests { } @Test - @DisabledIfEnvironmentVariable(named = "bamboo_buildKey", matches = ".*?", - disabledReason = "Timing is too short for CI") public void testReschedulePersistedMessagesOnStartup() throws Exception { MessageGroupStore messageGroupStore = new SimpleMessageStore(); this.delayHandler.setDefaultDelay(2000); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java index 710b60841b..03aff01d49 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java @@ -53,7 +53,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; -import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -71,7 +70,6 @@ import org.springframework.integration.ip.tcp.serializer.MapJsonSerializer; import org.springframework.integration.ip.util.TestingUtilities; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.converter.MapMessageConverter; -import org.springframework.integration.test.condition.LogLevels; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.util.CompositeExecutor; import org.springframework.messaging.Message; @@ -101,7 +99,6 @@ import static org.mockito.Mockito.when; * @since 2.0 * */ -@LogLevels(level = "trace", categories = "org.springframework.integration.ip.tcp") public class TcpNioConnectionTests { private static final Log logger = LogFactory.getLog(TcpNioConnectionTests.class); @@ -245,8 +242,6 @@ public class TcpNioConnectionTests { } @Test - @DisabledIfEnvironmentVariable(named = "bamboo_buildKey", matches = ".*?", - disabledReason = "Timing is too short for CI") public void testCleanup() { TcpNioClientConnectionFactory factory = new TcpNioClientConnectionFactory("localhost", 0); factory.setApplicationEventPublisher(nullPublisher); @@ -809,8 +804,6 @@ public class TcpNioConnectionTests { } @Test - @DisabledIfEnvironmentVariable(named = "bamboo_buildKey", matches = ".*?", - disabledReason = "Timing is too short for CI") public void testNoDelayOnClose() throws Exception { TcpNioServerConnectionFactory cf = new TcpNioServerConnectionFactory(0); final CountDownLatch reading = new CountDownLatch(1); diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java index 1f8f5d67ef..1227f10668 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -324,8 +323,6 @@ public class MySqlJdbcMessageStoreTests implements MySqlContainerTest { @Test @Transactional - @DisabledIfEnvironmentVariable(named = "bamboo_buildKey", matches = ".*?", - disabledReason = "Timing is too short for CI") public void testExpireMessageGroupOnCreateOnly() throws Exception { String groupId = "X"; Message message = MessageBuilder.withPayload("foo").setCorrelationId(groupId).build(); @@ -345,8 +342,6 @@ public class MySqlJdbcMessageStoreTests implements MySqlContainerTest { @Test @Transactional - @DisabledIfEnvironmentVariable(named = "bamboo_buildKey", matches = ".*?", - disabledReason = "Timing is too short for CI") public void testExpireMessageGroupOnIdleOnly() throws Exception { String groupId = "X"; Message message = MessageBuilder.withPayload("foo").setCorrelationId(groupId).build(); diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/oracle/OracleJdbcMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/oracle/OracleJdbcMessageStoreTests.java index 5f2e3ab09a..104274abe4 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/oracle/OracleJdbcMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/oracle/OracleJdbcMessageStoreTests.java @@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -321,8 +320,6 @@ public class OracleJdbcMessageStoreTests implements OracleContainerTest { @Test @Transactional - @DisabledIfEnvironmentVariable(named = "bamboo_buildKey", matches = ".*?", - disabledReason = "Timing is too short for CI") public void testExpireMessageGroupOnCreateOnly() throws Exception { String groupId = "X"; Message message = MessageBuilder.withPayload("foo").setCorrelationId(groupId).build(); @@ -342,8 +339,6 @@ public class OracleJdbcMessageStoreTests implements OracleContainerTest { @Test @Transactional - @DisabledIfEnvironmentVariable(named = "bamboo_buildKey", matches = ".*?", - disabledReason = "Timing is too short for CI") public void testExpireMessageGroupOnIdleOnly() throws Exception { String groupId = "X"; Message message = MessageBuilder.withPayload("foo").setCorrelationId(groupId).build(); diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifierTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifierTests.java index 1f1e167c1a..5130028bfa 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifierTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifierTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 the original author or authors. + * Copyright 2022-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,6 +43,7 @@ import org.mockito.Mockito; import org.springframework.core.io.FileSystemResource; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; /** * @@ -76,11 +77,11 @@ public class ResourceKnownHostsServerKeyVerifierTests { = new ResourceKnownHostsServerKeyVerifier( new FileSystemResource(KnownHostEntry.getDefaultKnownHostsFile())); - ClientFactoryManager manager = Mockito.mock(ClientFactoryManager.class); + ClientFactoryManager manager = mock(); Mockito.when(manager.getRandomFactory()).thenReturn((Factory) JceRandomFactory.INSTANCE); HOST_KEYS.forEach((key, value) -> { - ClientSession session = Mockito.mock(ClientSession.class); + ClientSession session = mock(); Mockito.when(session.getFactoryManager()).thenReturn(manager); Mockito.when(session.getConnectAddress()).thenReturn(key); @@ -122,7 +123,7 @@ public class ResourceKnownHostsServerKeyVerifierTests { } static boolean isDefaultKnownHostsFilePresent() { - return System.getenv("bamboo_buildKey") == null && KnownHostEntry.getDefaultKnownHostsFile().toFile().exists(); + return KnownHostEntry.getDefaultKnownHostsFile().toFile().exists(); } }