You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2018/06/06 07:00:57 UTC
[03/15] james-project git commit: JAMES-2408 Enhance
ElasticSearchIndexerTest
JAMES-2408 Enhance ElasticSearchIndexerTest
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/84b7b75e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/84b7b75e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/84b7b75e
Branch: refs/heads/master
Commit: 84b7b75e734af8551ba87e5acb2edd54c2d30104
Parents: 056bf99
Author: benwa <bt...@linagora.com>
Authored: Tue Jun 5 10:59:56 2018 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Wed Jun 6 08:58:56 2018 +0200
----------------------------------------------------------------------
.../backends/es/ElasticSearchIndexerTest.java | 64 +++++++++++---------
1 file changed, 35 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/84b7b75e/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java
index e05b35c..539272b 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java
@@ -20,6 +20,7 @@
package org.apache.james.backends.es;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.elasticsearch.index.query.QueryBuilders.termQuery;
import java.util.concurrent.Executors;
@@ -35,7 +36,7 @@ import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
public class ElasticSearchIndexerTest {
@@ -64,7 +65,7 @@ public class ElasticSearchIndexerTest {
}
@Test
- public void indexMessageShouldWork() throws Exception {
+ public void indexMessageShouldWork() {
String messageId = "1";
String content = "{\"message\": \"trying out Elasticsearch\"}";
@@ -80,20 +81,21 @@ public class ElasticSearchIndexerTest {
}
}
- @Test(expected = IllegalArgumentException.class)
- public void indexMessageShouldThrowWhenJsonIsNull() throws InterruptedException {
- testee.index("1", null);
+ @Test
+ public void indexMessageShouldThrowWhenJsonIsNull() {
+ assertThatThrownBy(() -> testee.index("1", null))
+ .isInstanceOf(IllegalArgumentException.class);
}
@Test
- public void updateMessages() throws Exception {
+ public void updateMessages() {
String messageId = "1";
String content = "{\"message\": \"trying out Elasticsearch\",\"field\":\"Should be unchanged\"}";
testee.index(messageId, content);
embeddedElasticSearch.awaitForElasticSearch();
- testee.update(Lists.newArrayList(new UpdatedRepresentation(messageId, "{\"message\": \"mastering out Elasticsearch\"}")));
+ testee.update(ImmutableList.of(new UpdatedRepresentation(messageId, "{\"message\": \"mastering out Elasticsearch\"}")));
embeddedElasticSearch.awaitForElasticSearch();
try (Client client = node.client()) {
@@ -113,28 +115,32 @@ public class ElasticSearchIndexerTest {
}
}
- @Test(expected = IllegalArgumentException.class)
- public void updateMessageShouldThrowWhenJsonIsNull() throws InterruptedException {
- testee.update(Lists.newArrayList(new UpdatedRepresentation("1", null)));
+ @Test
+ public void updateMessageShouldThrowWhenJsonIsNull() {
+ assertThatThrownBy(() -> testee.update(ImmutableList.of(new UpdatedRepresentation("1", null))))
+ .isInstanceOf(IllegalArgumentException.class);
}
- @Test(expected = IllegalArgumentException.class)
- public void updateMessageShouldThrowWhenIdIsNull() throws InterruptedException {
- testee.update(Lists.newArrayList(new UpdatedRepresentation(null, "{\"message\": \"mastering out Elasticsearch\"}")));
+ @Test
+ public void updateMessageShouldThrowWhenIdIsNull() {
+ assertThatThrownBy(() -> testee.update(ImmutableList.of(new UpdatedRepresentation(null, "{\"message\": \"mastering out Elasticsearch\"}"))))
+ .isInstanceOf(IllegalArgumentException.class);
}
- @Test(expected = IllegalArgumentException.class)
- public void updateMessageShouldThrowWhenJsonIsEmpty() throws InterruptedException {
- testee.update(Lists.newArrayList(new UpdatedRepresentation("1", "")));
+ @Test
+ public void updateMessageShouldThrowWhenJsonIsEmpty() {
+ assertThatThrownBy(() -> testee.update(ImmutableList.of(new UpdatedRepresentation("1", ""))))
+ .isInstanceOf(IllegalArgumentException.class);
}
- @Test(expected = IllegalArgumentException.class)
- public void updateMessageShouldThrowWhenIdIsEmpty() throws InterruptedException {
- testee.update(Lists.newArrayList(new UpdatedRepresentation("", "{\"message\": \"mastering out Elasticsearch\"}")));
+ @Test
+ public void updateMessageShouldThrowWhenIdIsEmpty() {
+ assertThatThrownBy(() -> testee.update(ImmutableList.of(new UpdatedRepresentation("", "{\"message\": \"mastering out Elasticsearch\"}"))))
+ .isInstanceOf(IllegalArgumentException.class);
}
@Test
- public void deleteByQueryShouldWorkOnSingleMessage() throws Exception {
+ public void deleteByQueryShouldWorkOnSingleMessage() {
String messageId = "1:2";
String content = "{\"message\": \"trying out Elasticsearch\", \"property\":\"1\"}";
@@ -154,7 +160,7 @@ public class ElasticSearchIndexerTest {
}
@Test
- public void deleteByQueryShouldWorkWhenMultipleMessages() throws Exception {
+ public void deleteByQueryShouldWorkWhenMultipleMessages() {
String messageId = "1:1";
String content = "{\"message\": \"trying out Elasticsearch\", \"property\":\"1\"}";
@@ -184,14 +190,14 @@ public class ElasticSearchIndexerTest {
}
@Test
- public void deleteMessage() throws Exception {
+ public void deleteMessage() {
String messageId = "1:2";
String content = "{\"message\": \"trying out Elasticsearch\"}";
testee.index(messageId, content);
embeddedElasticSearch.awaitForElasticSearch();
- testee.delete(Lists.newArrayList(messageId));
+ testee.delete(ImmutableList.of(messageId));
embeddedElasticSearch.awaitForElasticSearch();
try (Client client = node.client()) {
@@ -204,7 +210,7 @@ public class ElasticSearchIndexerTest {
}
@Test
- public void deleteShouldWorkWhenMultipleMessages() throws Exception {
+ public void deleteShouldWorkWhenMultipleMessages() {
String messageId = "1:1";
String content = "{\"message\": \"trying out Elasticsearch\", \"mailboxId\":\"1\"}";
@@ -221,7 +227,7 @@ public class ElasticSearchIndexerTest {
testee.index(messageId3, content3);
embeddedElasticSearch.awaitForElasticSearch();
- testee.delete(Lists.newArrayList(messageId, messageId3));
+ testee.delete(ImmutableList.of(messageId, messageId3));
embeddedElasticSearch.awaitForElasticSearch();
try (Client client = node.client()) {
@@ -234,12 +240,12 @@ public class ElasticSearchIndexerTest {
}
@Test
- public void updateMessagesShouldNotThrowWhenEmptyList() throws Exception {
- testee.update(Lists.newArrayList());
+ public void updateMessagesShouldNotThrowWhenEmptyList() {
+ testee.update(ImmutableList.of());
}
@Test
- public void deleteMessagesShouldNotThrowWhenEmptyList() throws Exception {
- testee.delete(Lists.newArrayList());
+ public void deleteMessagesShouldNotThrowWhenEmptyList() {
+ testee.delete(ImmutableList.of());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org