From c3ebcf5630ab8aa166df4e93ef3df8479f3b1a7d Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 17 Dec 2010 12:53:21 -0500
Subject: [PATCH] INT-1694, INT-1695 un-Ignored tests

---
 .../integration/gateway/MessagingGatewayTests.java       | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java
index 75df22606c..01afa56980 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java
@@ -16,7 +16,6 @@
 
 package org.springframework.integration.gateway;
 
-import static junit.framework.Assert.assertFalse;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
@@ -34,6 +33,7 @@ import org.easymock.IAnswer;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
+
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageChannel;
 import org.springframework.integration.MessageDeliveryException;
@@ -44,7 +44,6 @@ import org.springframework.integration.channel.PublishSubscribeChannel;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.core.PollableChannel;
 import org.springframework.integration.handler.ServiceActivatingHandler;
-import org.springframework.integration.message.ErrorMessage;
 import org.springframework.integration.test.util.TestUtils;
 
 /**
@@ -238,7 +237,6 @@ public class MessagingGatewayTests {
 	
 	// should fail but it doesn't now
 	@Test(expected=MessagingException.class)
-	@Ignore
 	public void validateErroMessageCanNotBeReplyMessage() {
 		DirectChannel reqChannel = new DirectChannel();
 		reqChannel.subscribe(new MessageHandler() {		
@@ -259,14 +257,11 @@ public class MessagingGatewayTests {
 		this.messagingGateway.start();
 		
 		this.messagingGateway.sendAndReceiveMessage("hello");
-		
 	}
 	
-	
 	// should not fail but it does now
 	@Test
-	@Ignore
-	public void validateErrorChannelWithSuccessfullReply() {
+	public void validateErrorChannelWithSuccessfulReply() {
 		DirectChannel reqChannel = new DirectChannel();
 		reqChannel.subscribe(new MessageHandler() {		
 			public void handleMessage(Message<?> message) throws MessagingException {