From 8fd4564f800a852fc7a174a61836b4657593f3af Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 9 Nov 2016 16:49:13 -0500 Subject: [PATCH] INT-3870: Un`@Ignore` IP and JMS tests JIRA: https://jira.spring.io/browse/INT-3870 Looks like something has been changed in the IP and JMS modules or their dependencies. Right now they pass (on Windows) independently of the way to run testing (Gradle or from IDE) --- .../integration/ip/tcp/connection/SocketSupportTests.java | 2 -- .../integration/jms/OutboundGatewayFunctionTests.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java index 6d153c4cb6..c7d3e9056a 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java @@ -39,7 +39,6 @@ import javax.net.ServerSocketFactory; import javax.net.SocketFactory; import javax.net.ssl.SSLEngine; -import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; @@ -299,7 +298,6 @@ Certificate fingerprints: } @Test - @Ignore public void testNetClientAndServerSSLDifferentContexts() throws Exception { System.setProperty("javax.net.debug", "all"); // SSL activity in the console TcpNetServerConnectionFactory server = new TcpNetServerConnectionFactory(0); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayFunctionTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayFunctionTests.java index 5c389528bb..85dc042194 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayFunctionTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayFunctionTests.java @@ -33,7 +33,6 @@ import javax.jms.JMSException; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQQueue; -import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.BeanFactory; @@ -302,7 +301,6 @@ public class OutboundGatewayFunctionTests extends LogAdjustingTestSupport { } @Test - @Ignore public void testContainerWithTemporaryNoCorrelation() throws Exception { BeanFactory beanFactory = mock(BeanFactory.class); when(beanFactory.containsBean(IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME)).thenReturn(true);