JAMES-2592 Use assertThatThrownBy instead of ExpectedException
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/219b961d Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/219b961d Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/219b961d Branch: refs/heads/3.2.x Commit: 219b961d44dea1dffe3ff37658f8b1393605d9db Parents: 8bdf5c8 Author: Antoine Duprat <adup...@linagora.com> Authored: Tue Nov 13 16:29:13 2018 +0100 Committer: Antoine Duprat <adup...@linagora.com> Committed: Fri Dec 7 17:11:56 2018 +0100 ---------------------------------------------------------------------- .../backends/es/ClientProviderImplTest.java | 86 ++++++++------------ 1 file changed, 33 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/219b961d/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplTest.java index 95f1014..a901199 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplTest.java @@ -20,129 +20,109 @@ package org.apache.james.backends.es; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.elasticsearch.common.settings.Settings; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import java.util.Optional; public class ClientProviderImplTest { - @Rule - public ExpectedException expectedException = ExpectedException.none(); - @Test public void fromHostsStringShouldThrowOnNullString() { - expectedException.expect(NullPointerException.class); - - ClientProviderImpl.fromHostsString(null, Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.fromHostsString(null, Optional.empty())) + .isInstanceOf(NullPointerException.class); } @Test public void fromHostsStringShouldThrowOnEmptyString() { - expectedException.expect(IllegalArgumentException.class); - - ClientProviderImpl.fromHostsString("", Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.fromHostsString("", Optional.empty())) + .isInstanceOf(IllegalArgumentException.class); } @Test public void forHostShouldThrowOnNullHost() { - expectedException.expect(NullPointerException.class); - - ClientProviderImpl.forHost(null, 9200, Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.forHost(null, 9200, Optional.empty())) + .isInstanceOf(NullPointerException.class); } @Test public void forHostShouldThrowOnEmptyHost() { - expectedException.expect(IllegalArgumentException.class); - - ClientProviderImpl.forHost("", 9200, Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.forHost("", 9200, Optional.empty())) + .isInstanceOf(IllegalArgumentException.class); } @Test public void forHostShouldThrowOnNegativePort() { - expectedException.expect(IllegalArgumentException.class); - - ClientProviderImpl.forHost("localhost", -1, Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.forHost("localhost", -1, Optional.empty())) + .isInstanceOf(IllegalArgumentException.class); } @Test public void forHostShouldThrowOnZeroPort() { - expectedException.expect(IllegalArgumentException.class); - - ClientProviderImpl.forHost("localhost", 0, Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.forHost("localhost", 0, Optional.empty())) + .isInstanceOf(IllegalArgumentException.class); } @Test public void forHostShouldThrowOnTooBigPort() { - expectedException.expect(IllegalArgumentException.class); - - ClientProviderImpl.forHost("localhost", 65536, Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.forHost("localhost", 65536, Optional.empty())) + .isInstanceOf(IllegalArgumentException.class); } @Test public void fromHostsStringShouldEmptyAddress() { - expectedException.expect(IllegalArgumentException.class); - - ClientProviderImpl.fromHostsString(":9200", Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.fromHostsString(":9200", Optional.empty())) + .isInstanceOf(IllegalArgumentException.class); } @Test public void fromHostsStringShouldThrowOnAbsentPort() { - expectedException.expect(IllegalArgumentException.class); - - ClientProviderImpl.fromHostsString("localhost", Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.fromHostsString("localhost", Optional.empty())) + .isInstanceOf(IllegalArgumentException.class); } @Test public void fromHostsStringShouldThrowWhenTooMuchParts() { - expectedException.expect(IllegalArgumentException.class); - - ClientProviderImpl.fromHostsString("localhost:9200:9200", Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.fromHostsString("localhost:9200:9200", Optional.empty())) + .isInstanceOf(IllegalArgumentException.class); } @Test public void fromHostsStringShouldThrowOnEmptyPort() { - expectedException.expect(NumberFormatException.class); - - ClientProviderImpl.fromHostsString("localhost:", Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.fromHostsString("localhost:", Optional.empty())) + .isInstanceOf(NumberFormatException.class); } @Test public void fromHostsStringShouldThrowOnInvalidPort() { - expectedException.expect(NumberFormatException.class); - - ClientProviderImpl.fromHostsString("localhost:invalid", Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.fromHostsString("localhost:invalid", Optional.empty())) + .isInstanceOf(NumberFormatException.class); } @Test public void fromHostsStringShouldThrowOnNegativePort() { - expectedException.expect(IllegalArgumentException.class); - - ClientProviderImpl.fromHostsString("localhost:-1", Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.fromHostsString("localhost:-1", Optional.empty())) + .isInstanceOf(IllegalArgumentException.class); } @Test public void fromHostsStringShouldThrowOnZeroPort() { - expectedException.expect(IllegalArgumentException.class); - - ClientProviderImpl.fromHostsString("localhost:0", Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.fromHostsString("localhost:0", Optional.empty())) + .isInstanceOf(IllegalArgumentException.class); } @Test public void fromHostsStringShouldThrowOnTooBigPort() { - expectedException.expect(IllegalArgumentException.class); - - ClientProviderImpl.fromHostsString("localhost:65536", Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.fromHostsString("localhost:65536", Optional.empty())) + .isInstanceOf(IllegalArgumentException.class); } @Test public void fromHostsStringShouldThrowIfOneHostIsInvalid() { - expectedException.expect(IllegalArgumentException.class); - - ClientProviderImpl.fromHostsString("localhost:9200,localhost", Optional.empty()); + assertThatThrownBy(() -> ClientProviderImpl.fromHostsString("localhost:9200,localhost", Optional.empty())) + .isInstanceOf(IllegalArgumentException.class); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
