From 5b9a171ccd5add177c7f3177f6e972f4d4442f93 Mon Sep 17 00:00:00 2001 From: Antoine Duprat Date: Wed, 27 May 2015 11:33:09 +0200 Subject: [PATCH] JWC-102 Mailbox with #private namespace are not groups --- cassandra/pom.xml | 12 ++++ .../utils/SimpleMailboxACLJsonConverterTest.java | 32 +++++---- .../james/mailbox/store/GroupFolderResolver.java | 8 ++- .../mailbox/store/GroupFolderResolverTest.java | 78 ++++++++++++++++++++++ 4 files changed, 116 insertions(+), 14 deletions(-) create mode 100644 store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 823008e..4e0bc87 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -85,6 +85,18 @@ jackson-databind + net.javacrumbs.json-unit + json-unit + 1.5.5 + test + + + net.javacrumbs.json-unit + json-unit-fluent + 1.5.5 + test + + org.cassandraunit cassandra-unit ${cassandra-unit.version} diff --git a/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/SimpleMailboxACLJsonConverterTest.java b/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/SimpleMailboxACLJsonConverterTest.java index 97d8a46..90359bf 100644 --- a/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/SimpleMailboxACLJsonConverterTest.java +++ b/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/SimpleMailboxACLJsonConverterTest.java @@ -19,15 +19,17 @@ package org.apache.james.mailbox.cassandra.mail.utils; +import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; +import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; import static org.assertj.core.api.Assertions.assertThat; +import java.util.HashMap; +import java.util.Map; + import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.SimpleMailboxACL; import org.junit.Test; -import java.util.HashMap; -import java.util.Map; - public class SimpleMailboxACLJsonConverterTest { public class ACLMapBuilder { @@ -66,31 +68,37 @@ public class SimpleMailboxACLJsonConverterTest { @Test public void emptyACLShouldBeWellSerialized() throws Exception { - assertThat(SimpleMailboxACLJsonConverter.toJson(SimpleMailboxACL.EMPTY)).isEqualTo("{\"entries\":{}}"); + assertThatJson(SimpleMailboxACLJsonConverter.toJson(SimpleMailboxACL.EMPTY)) + .isEqualTo("{\"entries\":{}}") + .when(IGNORING_ARRAY_ORDER); } @Test public void singleUserEntryACLShouldBeWellSerialized() throws Exception { - assertThat(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleUserEntryToMap().buildAsACL())) - .isEqualTo("{\"entries\":{\"-user\":2040}}"); + assertThatJson(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleUserEntryToMap().buildAsACL())) + .isEqualTo("{\"entries\":{\"-user\":2040}}") + .when(IGNORING_ARRAY_ORDER); } @Test public void singleGroupEntryACLShouldBeWellSerialized() throws Exception { - assertThat(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleGroupEntryToMap().buildAsACL())) - .isEqualTo("{\"entries\":{\"-$group\":2032}}"); + assertThatJson(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleGroupEntryToMap().buildAsACL())) + .isEqualTo("{\"entries\":{\"-$group\":2032}}") + .when(IGNORING_ARRAY_ORDER); } @Test public void singleSpecialEntryACLShouldBeWellSerialized() throws Exception { - assertThat(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleSpecialEntryToMap().buildAsACL())) - .isEqualTo("{\"entries\":{\"-special\":1968}}"); + assertThatJson(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleSpecialEntryToMap().buildAsACL())) + .isEqualTo("{\"entries\":{\"-special\":1968}}") + .when(IGNORING_ARRAY_ORDER); } @Test public void multipleEntriesACLShouldBeWellSerialized() throws Exception { - assertThat(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleUserEntryToMap().addSingleGroupEntryToMap().buildAsACL())) - .isEqualTo("{\"entries\":{\"-user\":2040,\"-$group\":2032}}"); + assertThatJson(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleUserEntryToMap().addSingleGroupEntryToMap().buildAsACL())) + .isEqualTo("{\"entries\":{\"-user\":2040,\"-$group\":2032}}") + .when(IGNORING_ARRAY_ORDER); } @Test diff --git a/store/src/main/java/org/apache/james/mailbox/store/GroupFolderResolver.java b/store/src/main/java/org/apache/james/mailbox/store/GroupFolderResolver.java index c2fa01c..449ef43 100644 --- a/store/src/main/java/org/apache/james/mailbox/store/GroupFolderResolver.java +++ b/store/src/main/java/org/apache/james/mailbox/store/GroupFolderResolver.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.store; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.store.mail.model.Mailbox; public class GroupFolderResolver { @@ -30,8 +31,11 @@ public class GroupFolderResolver { this.mailboxSession = mailboxSession; } - public boolean isGroupFolder(Mailbox mailbox) { + public boolean isGroupFolder(Mailbox mailbox) { String namespace = mailbox.getNamespace(); - return namespace == null || (!namespace.equals(mailboxSession.getPersonalSpace()) && !namespace.equals(mailboxSession.getOtherUsersSpace())); + return namespace == null || + (!namespace.equals(mailboxSession.getPersonalSpace()) + && !namespace.equals(MailboxConstants.USER_NAMESPACE) + && !namespace.equals(mailboxSession.getOtherUsersSpace())); } } diff --git a/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java b/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java new file mode 100644 index 0000000..bdbfe57 --- /dev/null +++ b/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java @@ -0,0 +1,78 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ +package org.apache.james.mailbox.store; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.List; +import java.util.Locale; + +import org.apache.james.mailbox.MailboxSession.SessionType; +import org.apache.james.mailbox.model.MailboxConstants; +import org.apache.james.mailbox.model.MailboxPath; +import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; +import org.junit.Test; +import org.slf4j.Logger; + +public class GroupFolderResolverTest { + + private static final long UID_VALIDITY = 9999; + private Logger log = null; + private List localePreferences = null; + private List sharedSpaces = null; + private char pathSeparator = ' '; + + @Test + public void isGroupFolderShouldReturnFalseWhenMailboxNamespaceIsNull() { + SimpleMailboxSession mailboxSession = new SimpleMailboxSession(1, "username", "password", log, localePreferences, sharedSpaces, null, pathSeparator, SessionType.User); + GroupFolderResolver testee = new GroupFolderResolver(mailboxSession); + + SimpleMailbox mailbox = new SimpleMailbox(new MailboxPath(null, "user", "name"), UID_VALIDITY); + assertThat(testee.isGroupFolder(mailbox)).isFalse(); + } + + @Test + public void isGroupFolderShouldReturnFalseWhenMailboxNamespaceEqualsToUserNamespace() { + SimpleMailboxSession mailboxSession = new SimpleMailboxSession(1, "username", "password", log, localePreferences, sharedSpaces, null, pathSeparator, SessionType.User); + GroupFolderResolver testee = new GroupFolderResolver(mailboxSession); + + SimpleMailbox mailbox = new SimpleMailbox(new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "name"), UID_VALIDITY); + assertThat(testee.isGroupFolder(mailbox)).isFalse(); + } + + @Test + public void isGroupFolderShouldReturnFalseWhenMailboxNamespaceEqualsToOtherUsersNamespace() { + String otherUsersSpace = "other"; + SimpleMailboxSession mailboxSession = new SimpleMailboxSession(1, "username", "password", log, localePreferences, sharedSpaces, otherUsersSpace, pathSeparator, SessionType.User); + GroupFolderResolver testee = new GroupFolderResolver(mailboxSession); + + SimpleMailbox mailbox = new SimpleMailbox(new MailboxPath("other", "user", "name"), UID_VALIDITY); + assertThat(testee.isGroupFolder(mailbox)).isFalse(); + } + + @Test + public void isGroupFolderShouldReturnTrueWhenMailboxNamespaceDoesntEqualToOtherUsersNamespace() { + String otherUsersSpace = "other"; + SimpleMailboxSession mailboxSession = new SimpleMailboxSession(1, "username", "password", log, localePreferences, sharedSpaces, otherUsersSpace, pathSeparator, SessionType.User); + GroupFolderResolver testee = new GroupFolderResolver(mailboxSession); + + SimpleMailbox mailbox = new SimpleMailbox(new MailboxPath("namespace", "user", "name"), UID_VALIDITY); + assertThat(testee.isGroupFolder(mailbox)).isTrue(); + } +} -- 2.4.2