From c578fdbbc7e6deab57a2bccf817f4d9433c41d95 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 31 May 2010 14:44:28 +0000 Subject: [PATCH] More "just in case" timeouts on test threads (server socket accept) --- .../integration/ip/tcp/NetSocketReaderTests.java | 11 ++++++++++- .../integration/ip/tcp/NetSocketWriterTests.java | 4 ++++ .../integration/ip/tcp/NioSocketWriterTests.java | 6 ++++++ .../ip/tcp/TcpSendingMessageHandlerTests.java | 5 +++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketReaderTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketReaderTests.java index 18d106a65b..b082c11fc3 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketReaderTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketReaderTests.java @@ -41,6 +41,7 @@ public class NetSocketReaderTests { public void testReadLength() throws Exception { int port = SocketUtils.findAvailableServerSocket(); ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); SocketUtils.testSendLength(port, null); Socket socket = server.accept(); socket.setSoTimeout(5000); @@ -70,6 +71,7 @@ public class NetSocketReaderTests { public void testReadStxEtx() throws Exception { int port = SocketUtils.findAvailableServerSocket(); ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); SocketUtils.testSendStxEtx(port, null); Socket socket = server.accept(); socket.setSoTimeout(5000); @@ -100,6 +102,7 @@ public class NetSocketReaderTests { public void testReadCrLf() throws Exception { int port = SocketUtils.findAvailableServerSocket(); ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); SocketUtils.testSendCrLf(port, null); Socket socket = server.accept(); socket.setSoTimeout(5000); @@ -130,6 +133,7 @@ public class NetSocketReaderTests { public void testReadSerialized() throws Exception { int port = SocketUtils.findAvailableServerSocket(); ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); SocketUtils.testSendSerialized(port); Socket socket = server.accept(); socket.setSoTimeout(5000); @@ -156,6 +160,7 @@ public class NetSocketReaderTests { public void testReadLengthOverflow() throws Exception { int port = SocketUtils.findAvailableServerSocket(); ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); SocketUtils.testSendLengthOverflow(port); Socket socket = server.accept(); socket.setSoTimeout(5000); @@ -177,6 +182,7 @@ public class NetSocketReaderTests { public void testReadStxEtxTimeout() throws Exception { int port = SocketUtils.findAvailableServerSocket(); ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); SocketUtils.testSendStxEtxOverflow(port); Socket socket = server.accept(); socket.setSoTimeout(500); @@ -199,6 +205,7 @@ public class NetSocketReaderTests { public void testReadStxEtxOverflow() throws Exception { int port = SocketUtils.findAvailableServerSocket(); ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); SocketUtils.testSendStxEtxOverflow(port); Socket socket = server.accept(); socket.setSoTimeout(5000); @@ -222,6 +229,7 @@ public class NetSocketReaderTests { public void testReadCrLfTimeout() throws Exception { int port = SocketUtils.findAvailableServerSocket(); ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); SocketUtils.testSendCrLfOverflow(port); Socket socket = server.accept(); socket.setSoTimeout(500); @@ -244,6 +252,7 @@ public class NetSocketReaderTests { public void testReadCrLfOverflow() throws Exception { int port = SocketUtils.findAvailableServerSocket(); ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); SocketUtils.testSendCrLfOverflow(port); Socket socket = server.accept(); socket.setSoTimeout(5000); @@ -262,5 +271,5 @@ public class NetSocketReaderTests { } server.close(); } - + } diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketWriterTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketWriterTests.java index 27371586d8..599cb1c616 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketWriterTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketWriterTests.java @@ -41,6 +41,7 @@ public class NetSocketWriterTests { final int port = SocketUtils.findAvailableServerSocket(); final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { @@ -74,6 +75,7 @@ public class NetSocketWriterTests { final int port = SocketUtils.findAvailableServerSocket(); final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { @@ -107,6 +109,7 @@ public class NetSocketWriterTests { final int port = SocketUtils.findAvailableServerSocket(); final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { @@ -140,6 +143,7 @@ public class NetSocketWriterTests { final int port = SocketUtils.findAvailableServerSocket(); final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NioSocketWriterTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NioSocketWriterTests.java index 269af7e029..c86248a910 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NioSocketWriterTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NioSocketWriterTests.java @@ -117,6 +117,7 @@ public class NioSocketWriterTests { final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault() .createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { @@ -155,6 +156,7 @@ public class NioSocketWriterTests { final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault() .createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { @@ -192,6 +194,7 @@ public class NioSocketWriterTests { final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault() .createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { @@ -229,6 +232,7 @@ public class NioSocketWriterTests { final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault() .createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { @@ -268,6 +272,7 @@ public class NioSocketWriterTests { final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault() .createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { @@ -306,6 +311,7 @@ public class NioSocketWriterTests { final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault() .createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java index 35c849a4b4..b4d5ad80b7 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java @@ -41,6 +41,7 @@ public class TcpSendingMessageHandlerTests { final int port = SocketUtils.findAvailableServerSocket(); final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { @@ -72,6 +73,7 @@ public class TcpSendingMessageHandlerTests { final int port = SocketUtils.findAvailableServerSocket(); final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { @@ -103,6 +105,7 @@ public class TcpSendingMessageHandlerTests { final int port = SocketUtils.findAvailableServerSocket(); final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { @@ -134,6 +137,7 @@ public class TcpSendingMessageHandlerTests { final int port = SocketUtils.findAvailableServerSocket(); final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try { @@ -166,6 +170,7 @@ public class TcpSendingMessageHandlerTests { final int port = SocketUtils.findAvailableServerSocket(); final String testString = "abcdef"; ServerSocket server = ServerSocketFactory.getDefault().createServerSocket(port); + server.setSoTimeout(10000); Thread t = new Thread(new Runnable() { public void run() { try {