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

GH-2760: use assertThatExceptionOfType in tests

Browse Source 
Fixes https://github.com/spring-projects/spring-integration/issues/2760

* The `assertThatExceptionOfType()` is more convenient,
than `assertThatThrownBy`, so, replace all the usages accordingly
* Fix JavaDoc typo in the `AbstractScriptExecutingMessageProcessor`
* Fix Sonar smells for `throws Exception` in `AbstractScriptExecutingMessageProcessor`
hierarchy and some code polishing for them
This commit is contained in:
Artem Bilan
2019-02-22 13:54:36 -05:00
parent 82ecd5a75d
commit 1d54f9663a
22 changed files with 187 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java
View File

@@ -17,7 +17,7 @@
package org.springframework.integration.ws.config;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.BDDMockito.willThrow;
import static org.mockito.Mockito.doAnswer;
@@ -51,6 +51,7 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.messaging.MessagingException;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.ws.client.WebServiceClientException;
@@ -130,8 +131,9 @@ public class UriVariableTests {
.setHeader("param", "test1 & test2")
.build();
assertThatThrownBy(() -> this.inputHttp.send(message))
.hasCauseInstanceOf(WebServiceIOException.class); // offline
assertThatExceptionOfType(MessagingException.class)
.isThrownBy(() -> this.inputHttp.send(message))
.withCauseInstanceOf(WebServiceIOException.class); // offline
assertThat(uri.get()).isEqualTo("http://localhost/spring-integration?param=test1%20&%20test2");
}