From 32358bafca0e7e143d842f54615201ecabd6ac04 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 23 Aug 2010 23:41:10 +0000 Subject: [PATCH] INT1346 INT-1369 Fix Test Timing Issues --- .../ip/tcp/TcpInboundGatewayTests.java | 1 - .../ip/tcp/TcpSendingMessageHandlerTests.java | 28 +++++++++++++------ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpInboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpInboundGatewayTests.java index 63c5973f72..4b83588c5c 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpInboundGatewayTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpInboundGatewayTests.java @@ -124,7 +124,6 @@ public class TcpInboundGatewayTests { results.add(new String(bytes)); readFully(socket.getInputStream(), bytes); results.add(new String(bytes)); - System.out.println(results); assertTrue(results.remove("Echo:Test1\r\n")); assertTrue(results.remove("Echo:Test2\r\n")); } 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 8ed8343420..d3402ed1bc 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 @@ -154,12 +154,15 @@ public class TcpSendingMessageHandlerTests { assertTrue(latch.await(10, TimeUnit.SECONDS)); handler.handleMessage(MessageBuilder.withPayload("Test").build()); handler.handleMessage(MessageBuilder.withPayload("Test").build()); + Set results = new HashSet(); Message mOut = channel.receive(10000); assertNotNull(mOut); - assertEquals("Reply1", new String((byte[]) mOut.getPayload())); + results.add(new String((byte[]) mOut.getPayload())); mOut = channel.receive(10000); assertNotNull(mOut); - assertEquals("Reply2", new String((byte[]) mOut.getPayload())); + results.add(new String((byte[]) mOut.getPayload())); + assertTrue(results.remove("Reply1")); + assertTrue(results.remove("Reply2")); done.set(true); } @@ -252,12 +255,15 @@ public class TcpSendingMessageHandlerTests { assertTrue(latch.await(10, TimeUnit.SECONDS)); handler.handleMessage(MessageBuilder.withPayload("Test").build()); handler.handleMessage(MessageBuilder.withPayload("Test").build()); + Set results = new HashSet(); Message mOut = channel.receive(10000); assertNotNull(mOut); - assertEquals("Reply1", new String((byte[]) mOut.getPayload())); + results.add(new String((byte[]) mOut.getPayload())); mOut = channel.receive(10000); assertNotNull(mOut); - assertEquals("Reply2", new String((byte[]) mOut.getPayload())); + results.add(new String((byte[]) mOut.getPayload())); + assertTrue(results.remove("Reply1")); + assertTrue(results.remove("Reply2")); done.set(true); } @@ -356,12 +362,15 @@ public class TcpSendingMessageHandlerTests { assertTrue(latch.await(10, TimeUnit.SECONDS)); handler.handleMessage(MessageBuilder.withPayload("Test").build()); handler.handleMessage(MessageBuilder.withPayload("Test").build()); + Set results = new HashSet(); Message mOut = channel.receive(10000); assertNotNull(mOut); - assertEquals("Reply1", new String((byte[]) mOut.getPayload())); + results.add(new String((byte[]) mOut.getPayload())); mOut = channel.receive(10000); assertNotNull(mOut); - assertEquals("Reply2", new String((byte[]) mOut.getPayload())); + results.add(new String((byte[]) mOut.getPayload())); + assertTrue(results.remove("Reply1")); + assertTrue(results.remove("Reply2")); done.set(true); } @@ -454,12 +463,15 @@ public class TcpSendingMessageHandlerTests { assertTrue(latch.await(10, TimeUnit.SECONDS)); handler.handleMessage(MessageBuilder.withPayload("Test").build()); handler.handleMessage(MessageBuilder.withPayload("Test").build()); + Set results = new HashSet(); Message mOut = channel.receive(10000); assertNotNull(mOut); - assertEquals("Reply1", mOut.getPayload()); + results.add((String) mOut.getPayload()); mOut = channel.receive(10000); assertNotNull(mOut); - assertEquals("Reply2", mOut.getPayload()); + results.add((String) mOut.getPayload()); + assertTrue(results.remove("Reply1")); + assertTrue(results.remove("Reply2")); done.set(true); }