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 2017/09/29 07:21:43 UTC
[05/31] james-project git commit: MAILBOX-307 Improve
MailboxMapperACLTest code quality
MAILBOX-307 Improve MailboxMapperACLTest code quality
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a797e679
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a797e679
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a797e679
Branch: refs/heads/master
Commit: a797e679e27ba792debd22076e4d6831b02f4045
Parents: f5a57cb
Author: benwa <bt...@linagora.com>
Authored: Wed Sep 27 10:42:07 2017 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Sep 29 09:20:40 2017 +0200
----------------------------------------------------------------------
.../store/mail/model/MailboxMapperACLTest.java | 75 ++++++++++----------
1 file changed, 39 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/a797e679/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
index ebbb1e9..6c78b81 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
@@ -23,6 +23,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MailboxACL.EntryKey;
+import org.apache.james.mailbox.model.MailboxACL.NameType;
+import org.apache.james.mailbox.model.MailboxACL.Rfc4314Rights;
+import org.apache.james.mailbox.model.MailboxACL.Right;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
@@ -38,7 +42,6 @@ public abstract class MailboxMapperACLTest {
public static final boolean POSITIVE = true;
public static final boolean NEGATIVE = !POSITIVE;
- private MailboxPath benwaInboxPath;
private Mailbox benwaInboxMailbox;
@Rule
@@ -55,7 +58,7 @@ public abstract class MailboxMapperACLTest {
this.mailboxMapper = mapperProvider.createMailboxMapper();
- benwaInboxPath = new MailboxPath("#private", "benwa", "INBOX");
+ MailboxPath benwaInboxPath = new MailboxPath("#private", "benwa", "INBOX");
benwaInboxMailbox = createMailbox(benwaInboxPath);
mailboxMapper.save(benwaInboxMailbox);
}
@@ -71,8 +74,8 @@ public abstract class MailboxMapperACLTest {
@Test
public void updateAclShouldSaveAclWhenReplace() throws MailboxException {
- MailboxACL.EntryKey key = new MailboxACL.EntryKey("user", MailboxACL.NameType.user, NEGATIVE);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights("asew");
+ EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+ Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
mailboxMapper.updateACL(benwaInboxMailbox,
new MailboxACL.ACLCommand(key,
MailboxACL.EditMode.REPLACE,
@@ -87,10 +90,10 @@ public abstract class MailboxMapperACLTest {
}
@Test
- public void updateAclShouldOverrightStoredAclWhenReplace() throws MailboxException {
- MailboxACL.EntryKey key = new MailboxACL.EntryKey("user", MailboxACL.NameType.user, NEGATIVE);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights("asew");
- MailboxACL.Rfc4314Rights newRights = new MailboxACL.Rfc4314Rights("skate");
+ public void updateAclShouldOverwriteStoredAclWhenReplace() throws MailboxException {
+ EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+ Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
+ Rfc4314Rights newRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
mailboxMapper.updateACL(benwaInboxMailbox,
new MailboxACL.ACLCommand(key,
MailboxACL.EditMode.REPLACE,
@@ -110,10 +113,10 @@ public abstract class MailboxMapperACLTest {
@Test
public void updateAclShouldTreatNegativeAndPositiveRightSeparately() throws MailboxException {
- MailboxACL.EntryKey key1 = new MailboxACL.EntryKey("user", MailboxACL.NameType.user, NEGATIVE);
- MailboxACL.EntryKey key2 = new MailboxACL.EntryKey("user", MailboxACL.NameType.user, POSITIVE);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights("asew");
- MailboxACL.Rfc4314Rights newRights = new MailboxACL.Rfc4314Rights("skate");
+ EntryKey key1 = new EntryKey("user", NameType.user, NEGATIVE);
+ EntryKey key2 = new EntryKey("user", NameType.user, POSITIVE);
+ Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
+ Rfc4314Rights newRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
mailboxMapper.updateACL(benwaInboxMailbox,
new MailboxACL.ACLCommand(key1,
MailboxACL.EditMode.REPLACE,
@@ -134,10 +137,10 @@ public abstract class MailboxMapperACLTest {
@Test
public void updateAclShouldTreatNameTypesRightSeparately() throws MailboxException {
- MailboxACL.EntryKey key1 = new MailboxACL.EntryKey("user", MailboxACL.NameType.user, NEGATIVE);
- MailboxACL.EntryKey key2 = new MailboxACL.EntryKey("user", MailboxACL.NameType.group, NEGATIVE);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights("asew");
- MailboxACL.Rfc4314Rights newRights = new MailboxACL.Rfc4314Rights("skate");
+ EntryKey key1 = new EntryKey("user", NameType.user, NEGATIVE);
+ EntryKey key2 = new EntryKey("user", NameType.group, NEGATIVE);
+ Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
+ Rfc4314Rights newRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
mailboxMapper.updateACL(benwaInboxMailbox,
new MailboxACL.ACLCommand(key1,
MailboxACL.EditMode.REPLACE,
@@ -158,9 +161,9 @@ public abstract class MailboxMapperACLTest {
@Test
public void updateAclShouldCleanAclEntryWhenEmptyReplace() throws MailboxException {
- MailboxACL.EntryKey key = new MailboxACL.EntryKey("user", MailboxACL.NameType.user, NEGATIVE);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights("asew");
- MailboxACL.Rfc4314Rights newRights = new MailboxACL.Rfc4314Rights("");
+ EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+ Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
+ Rfc4314Rights newRights = new Rfc4314Rights();
mailboxMapper.updateACL(benwaInboxMailbox,
new MailboxACL.ACLCommand(key,
MailboxACL.EditMode.REPLACE,
@@ -179,10 +182,10 @@ public abstract class MailboxMapperACLTest {
@Test
public void updateAclShouldCombineStoredAclWhenAdd() throws MailboxException {
- MailboxACL.EntryKey key = new MailboxACL.EntryKey("user", MailboxACL.NameType.user, NEGATIVE);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights("asew");
- MailboxACL.Rfc4314Rights newRights = new MailboxACL.Rfc4314Rights("skate");
- MailboxACL.Rfc4314Rights bothRights = new MailboxACL.Rfc4314Rights("asewkt");
+ EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+ Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
+ Rfc4314Rights newRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
+ Rfc4314Rights bothRights = new Rfc4314Rights(Right.Administer, Right.WriteSeenFlag, Right.PerformExpunge, Right.Write, Right.CreateMailbox, Right.DeleteMessages);
mailboxMapper.updateACL(benwaInboxMailbox,
new MailboxACL.ACLCommand(key,
MailboxACL.EditMode.REPLACE,
@@ -202,10 +205,10 @@ public abstract class MailboxMapperACLTest {
@Test
public void removeAclShouldRemoveSomeStoredAclWhenAdd() throws MailboxException {
- MailboxACL.EntryKey key = new MailboxACL.EntryKey("user", MailboxACL.NameType.user, NEGATIVE);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights("asew");
- MailboxACL.Rfc4314Rights removedRights = new MailboxACL.Rfc4314Rights("se");
- MailboxACL.Rfc4314Rights finalRights = new MailboxACL.Rfc4314Rights("aw");
+ EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+ Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
+ Rfc4314Rights removedRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.PerformExpunge);
+ Rfc4314Rights finalRights = new Rfc4314Rights(Right.Administer, Right.Write);
mailboxMapper.updateACL(benwaInboxMailbox,
new MailboxACL.ACLCommand(key,
MailboxACL.EditMode.REPLACE,
@@ -225,10 +228,10 @@ public abstract class MailboxMapperACLTest {
@Test
public void removeAclShouldNotFailWhenRemovingNonExistingRight() throws MailboxException {
- MailboxACL.EntryKey key = new MailboxACL.EntryKey("user", MailboxACL.NameType.user, NEGATIVE);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights("asew");
- MailboxACL.Rfc4314Rights removedRights = new MailboxACL.Rfc4314Rights("sel");
- MailboxACL.Rfc4314Rights finalRights = new MailboxACL.Rfc4314Rights("aw");
+ EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+ Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
+ Rfc4314Rights removedRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.PerformExpunge, Right.Lookup);
+ Rfc4314Rights finalRights = new Rfc4314Rights(Right.Administer, Right.Write);
mailboxMapper.updateACL(benwaInboxMailbox,
new MailboxACL.ACLCommand(key,
MailboxACL.EditMode.REPLACE,
@@ -248,9 +251,9 @@ public abstract class MailboxMapperACLTest {
@Test
public void resetAclShouldReplaceStoredAcl() throws MailboxException {
- MailboxACL.EntryKey key = new MailboxACL.EntryKey("user", MailboxACL.NameType.user, NEGATIVE);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights("asew");
- MailboxACL.Rfc4314Rights newRights = new MailboxACL.Rfc4314Rights("skate");
+ EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+ Rfc4314Rights rights = new Rfc4314Rights(Right.Administer, Right.PerformExpunge, Right.Write, Right.WriteSeenFlag);
+ Rfc4314Rights newRights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
mailboxMapper.updateACL(benwaInboxMailbox,
new MailboxACL.ACLCommand(key,
MailboxACL.EditMode.REPLACE,
@@ -268,8 +271,8 @@ public abstract class MailboxMapperACLTest {
@Test
public void resetAclShouldInitializeStoredAcl() throws MailboxException {
- MailboxACL.EntryKey key = new MailboxACL.EntryKey("user", MailboxACL.NameType.user, NEGATIVE);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights("skate");
+ EntryKey key = new EntryKey("user", NameType.user, NEGATIVE);
+ Rfc4314Rights rights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages);
mailboxMapper.resetACL(benwaInboxMailbox,
new MailboxACL(ImmutableMap.of(key, rights)));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org