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 ad...@apache.org on 2016/02/04 09:59:22 UTC
[1/2] james-project git commit: JAMES-1682 Issue-53 is already fixed
Repository: james-project
Updated Branches:
refs/heads/master 00199af12 -> 5693353c0
JAMES-1682 Issue-53 is already fixed
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/5cde56fb
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/5cde56fb
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/5cde56fb
Branch: refs/heads/master
Commit: 5cde56fb302771f2632b9914aa4240e4fe39cf4b
Parents: 00199af
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Wed Feb 3 11:26:09 2016 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Wed Feb 3 11:26:09 2016 +0100
----------------------------------------------------------------------
.../org/apache/james/jmap/methods/GetMessageListMethodTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/5cde56fb/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java
index 803ad88..5d20456 100644
--- a/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java
+++ b/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java
@@ -42,7 +42,6 @@ import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MailboxPath;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
@@ -125,7 +124,6 @@ public abstract class GetMessageListMethodTest {
.containsOnly("username@domain.tld|mailbox|1", "username@domain.tld|mailbox|2");
}
- @Ignore("ISSUE-53")
@Test
public void getMessageListShouldReturnAllMessagesWhenMultipleMailboxesAndNoParameters() throws Exception {
jmapServer.serverProbe().createMailbox(MailboxConstants.USER_NAMESPACE, username, "mailbox");
@@ -151,7 +149,7 @@ public abstract class GetMessageListMethodTest {
.asString();
assertThat(JsonPath.parse(response).<List<String>>read("$.[0].[1].messageIds"))
- .containsOnly("1", "2");
+ .containsOnly("username@domain.tld|mailbox|1", "username@domain.tld|mailbox2|1");
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: JAMES-1682 In getMessageListRequest,
collapseThreads=true should be accepted as every message has a unique
threadId
Posted by ad...@apache.org.
JAMES-1682 In getMessageListRequest, collapseThreads=true should be accepted as every message has a unique threadId
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/5693353c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/5693353c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/5693353c
Branch: refs/heads/master
Commit: 5693353c081fd87b29236c19ba83b51967a9f27f
Parents: 5cde56f
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Wed Feb 3 11:37:11 2016 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Thu Feb 4 09:52:26 2016 +0100
----------------------------------------------------------------------
.../apache/james/jmap/methods/GetMessageListMethodTest.java | 6 +++---
.../org/apache/james/jmap/model/GetMessageListRequest.java | 7 ++-----
.../apache/james/jmap/model/GetMessageListRequestTest.java | 9 ++-------
3 files changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/5693353c/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java
index 5d20456..ddfbf30 100644
--- a/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java
+++ b/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/GetMessageListMethodTest.java
@@ -340,11 +340,11 @@ public abstract class GetMessageListMethodTest {
.post("/jmap")
.then()
.statusCode(200)
- .content(startsWith("[[\"messageList\","));
+ .body("[0][0]", equalTo("messageList"));
}
@Test
- public void getMessageListShouldReturnErrorWhenCollapseThreadIsTrue() {
+ public void getMessageListShouldWorkWhenCollapseThreadIsTrue() {
given()
.accept(ContentType.JSON)
.contentType(ContentType.JSON)
@@ -354,7 +354,7 @@ public abstract class GetMessageListMethodTest {
.post("/jmap")
.then()
.statusCode(200)
- .content(equalTo("[[\"error\",{\"type\":\"Not yet implemented\"},\"#0\"]]"));
+ .body("[0][0]", equalTo("messageList"));
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/5693353c/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/GetMessageListRequest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/GetMessageListRequest.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/GetMessageListRequest.java
index 9beee33..e056d66 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/GetMessageListRequest.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/GetMessageListRequest.java
@@ -74,11 +74,8 @@ public class GetMessageListRequest implements JmapRequest {
}
public Builder collapseThreads(boolean collapseThreads) {
- if (collapseThreads == false) {
- this.collapseThreads = collapseThreads;
- return this;
- }
- throw new NotImplementedException();
+ this.collapseThreads = collapseThreads;
+ return this;
}
public Builder position(int position) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/5693353c/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java
index 029600d..80557c5 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java
@@ -47,11 +47,6 @@ public class GetMessageListRequestTest {
}
@Test(expected=NotImplementedException.class)
- public void builderShouldThrowWhenCollapseThreadsIsTrue() {
- GetMessageListRequest.builder().collapseThreads(true);
- }
-
- @Test(expected=NotImplementedException.class)
public void builderShouldThrowWhenAnchor() {
GetMessageListRequest.builder().anchor(null);
}
@@ -83,13 +78,13 @@ public class GetMessageListRequestTest {
.build();
List<String> sort = ImmutableList.of("date desc");
List<String> fetchMessageProperties = ImmutableList.of("id", "blobId");
- GetMessageListRequest expectedGetMessageListRequest = new GetMessageListRequest(Optional.empty(), Optional.of(filterCondition), sort, Optional.of(false), 1, Optional.empty(), Optional.empty(), Optional.of(2),
+ GetMessageListRequest expectedGetMessageListRequest = new GetMessageListRequest(Optional.empty(), Optional.of(filterCondition), sort, Optional.of(true), 1, Optional.empty(), Optional.empty(), Optional.of(2),
Optional.empty(), Optional.empty(), fetchMessageProperties, Optional.empty());
GetMessageListRequest getMessageListRequest = GetMessageListRequest.builder()
.filter(filterCondition)
.sort(sort)
- .collapseThreads(false)
+ .collapseThreads(true)
.position(1)
.limit(2)
.fetchMessageProperties(fetchMessageProperties)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org