From 920822c504acbbe5166a9c9a07fe5aa759083845 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Wed, 18 Aug 2010 17:21:52 +0000
Subject: [PATCH] INT-1346 Use Unique Port For All Unit Tests To Avoid
 Crosstalk - Previously, timing made it possible for the client from one test
 to talk to the server for another.

---
 .../ip/config/ParserUnitTests-context.xml        |  2 +-
 .../InterceptedSharedConnectionTests-context.xml |  2 +-
 .../ip/tcp/SharedConnectionTests-context.xml     |  2 +-
 .../integration/ip/tcp/common-context.xml        | 16 ++++++++--------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
index 32235a4581..30ff2356fd 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
@@ -174,7 +174,7 @@
 		id="client2"
 		type="client"
 		host="localhost"
-		port="#{tcpIpUtils.findAvailableServerSocket(6000)}"
+		port="#{tcpIpUtils.findAvailableServerSocket(6100)}"
 		input-converter="serial"
 		output-converter="serial"
 		so-keep-alive="true"
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml
index aeadba9812..36cb968c5f 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml
@@ -26,7 +26,7 @@
 	
 	<int-ip:tcp-connection-factory id="server"
 		type="server"
-		port="#{tcpIpUtils.findAvailableServerSocket(10000)}"
+		port="#{tcpIpUtils.findAvailableServerSocket(10100)}"
 		input-converter="serializer"
 		output-converter="serializer"
 		using-nio="true"
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml
index 5dd4f3142e..13b61f7e22 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml
@@ -14,7 +14,7 @@
 
 	<int-ip:tcp-connection-factory id="server"
 		type="server"
-		port="#{tcpIpUtils.findAvailableServerSocket(10000)}"
+		port="#{tcpIpUtils.findAvailableServerSocket(10200)}"
 		input-converter="serializer"
 		output-converter="serializer"
 		using-nio="true"
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml
index aff0f4b7d5..2b2b539a7a 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml
@@ -19,25 +19,25 @@
 
 	<ip:tcp-connection-factory id="crLfServer"
 		type="server"
-		port="#{tcpIpUtils.findAvailableServerSocket(6000)}"
+		port="#{tcpIpUtils.findAvailableServerSocket(7000)}"
 		input-converter="crLfConverter"
 		output-converter="crLfConverter"/>
 
 	<ip:tcp-connection-factory id="stxEtxServer"
 		type="server"
-		port="#{tcpIpUtils.findAvailableServerSocket(6100)}"
+		port="#{tcpIpUtils.findAvailableServerSocket(7100)}"
 		input-converter="stxEtxConverter"
 		output-converter="stxEtxConverter"/>
 
 	<ip:tcp-connection-factory id="lengthHeaderServer"
 		type="server"
-		port="#{tcpIpUtils.findAvailableServerSocket(6200)}"
+		port="#{tcpIpUtils.findAvailableServerSocket(7200)}"
 		input-converter="lengthHeaderConverter"
 		output-converter="lengthHeaderConverter"/>
 
 	<ip:tcp-connection-factory id="javaSerialServer"
 		type="server"
-		port="#{tcpIpUtils.findAvailableServerSocket(6300)}"
+		port="#{tcpIpUtils.findAvailableServerSocket(7300)}"
 		input-converter="javaConverter"
 		output-converter="javaConverter"/>
 
@@ -71,28 +71,28 @@
 
 	<ip:tcp-connection-factory id="crLfServerNio"
 		type="server"
-		port="#{tcpIpUtils.findAvailableServerSocket(6400)}"
+		port="#{tcpIpUtils.findAvailableServerSocket(7400)}"
 		input-converter="crLfConverter"
 		output-converter="crLfConverter"
 		using-nio="true"/>
 
 	<ip:tcp-connection-factory id="stxEtxServerNio"
 		type="server"
-		port="#{tcpIpUtils.findAvailableServerSocket(6500)}"
+		port="#{tcpIpUtils.findAvailableServerSocket(7500)}"
 		input-converter="stxEtxConverter"
 		output-converter="stxEtxConverter"
 		using-nio="true"/>
 
 	<ip:tcp-connection-factory id="lengthHeaderServerNio"
 		type="server"
-		port="#{tcpIpUtils.findAvailableServerSocket(6600)}"
+		port="#{tcpIpUtils.findAvailableServerSocket(7600)}"
 		input-converter="lengthHeaderConverter"
 		output-converter="lengthHeaderConverter"
 		using-nio="true"/>
 
 	<ip:tcp-connection-factory id="javaSerialServerNio"
 		type="server"
-		port="#{tcpIpUtils.findAvailableServerSocket(6700)}"
+		port="#{tcpIpUtils.findAvailableServerSocket(7700)}"
 		input-converter="javaConverter"
 		output-converter="javaConverter"
 		using-nio="true"/>