Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-2588 Remove Deprecation

Browse Source 
@ExpectedException is deprecated.

Also fixes a sporadic timing issue in the client mode test;
the default retry interval is 60 seconds and we only wait
10 seconds for the connection. If the initial connection
fails, we don't retry before the timeout.

INT-2527 Remove Event Deprecation

@Test @ExpectedException... -> @Test(expected...
This commit is contained in:
Gary Russell
2012-05-25 14:30:25 -04:00
committed by Oleg Zhurakousky
parent e828264867
commit fcd3771c17
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java
View File

@@ -19,7 +19,6 @@ package org.springframework.integration.event.inbound;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import org.junit.Test;
import org.springframework.context.ApplicationEvent;
@@ -36,7 +35,6 @@ import org.springframework.integration.core.PollableChannel;
import org.springframework.integration.event.core.MessagingEvent;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.integration.message.GenericMessage;
import org.springframework.test.annotation.ExpectedException;
/**
* @author Mark Fisher
@@ -150,10 +148,11 @@ public class ApplicationEventListeningMessageProducerTests {
assertEquals("test", message2.getPayload());
}
@Test @ExpectedException(value=MessageHandlingException.class)
@Test(expected=MessageHandlingException.class)
public void anyApplicationEventCausesExceptionWithErrorHandling() {
DirectChannel channel = new DirectChannel();
channel.subscribe(new AbstractReplyProducingMessageHandler() {
@Override
protected Object handleRequestMessage(Message<?> requestMessage) {
throw new RuntimeException("Failed");
}
@@ -168,10 +167,7 @@ public class ApplicationEventListeningMessageProducerTests {
assertNotNull(message);
assertEquals("Failed", ((Exception) message.getPayload()).getCause().getMessage());
adapter.setErrorChannel(null);
try {
adapter.onApplicationEvent(new TestApplicationEvent1());
fail("Expected MessageHandlingException");
} catch (MessageHandlingException e) { }
adapter.onApplicationEvent(new TestApplicationEvent1());
}