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 bt...@apache.org on 2020/05/07 02:12:43 UTC
[james-project] 19/22: JAMES-3148 Readability enhencements: method
extractions and renames
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit ecbbc2f7ba69e8e086d6eb4e70b2e0b460eddead
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Apr 14 12:16:04 2020 +0700
JAMES-3148 Readability enhencements: method extractions and renames
---
.../cassandra/CassandraMailboxManagerTest.java | 18 +++++++-----
.../mail/CassandraApplicableFlagDAOTest.java | 2 +-
.../mail/CassandraDeletedMessageDAOTest.java | 4 +--
.../mail/CassandraMailboxRecentDAOTest.java | 32 +++++++++++-----------
4 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
index 0865d83..2a2dc63 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
@@ -550,7 +550,7 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest<CassandraMai
}
@Test
- void deleteMailboxShouldCleanupACLWhenRightDeleteFails(CassandraCluster cassandraCluster) throws Exception {
+ void deleteMailboxShouldCleanupACLWhenRightsDeleteFails(CassandraCluster cassandraCluster) throws Exception {
mailboxManager.setRights(inboxId, new MailboxACL(
Pair.of(MailboxACL.EntryKey.createUserEntryKey(BOB), new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read))), session);
@@ -654,7 +654,8 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest<CassandraMai
mailboxManager.deleteMailbox(inbox, session);
assertThat(deletedMessageDAO(cassandraCluster).retrieveDeletedMessage((CassandraId) inboxId, MessageRange.all())
- .collectList().block())
+ .collectList()
+ .block())
.isEmpty();
}
@@ -671,7 +672,8 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest<CassandraMai
mailboxManager.deleteMailbox(inbox, session);
assertThat(deletedMessageDAO(cassandraCluster).retrieveDeletedMessage((CassandraId) inboxId, MessageRange.all())
- .collectList().block())
+ .collectList()
+ .block())
.isEmpty();
}
@@ -683,7 +685,7 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest<CassandraMai
mailboxManager.deleteMailbox(inbox, session);
assertThat(countersDAO(cassandraCluster).retrieveMailboxCounters((CassandraId) inboxId)
- .blockOptional())
+ .blockOptional())
.isEmpty();
}
@@ -699,7 +701,7 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest<CassandraMai
mailboxManager.deleteMailbox(inbox, session);
assertThat(countersDAO(cassandraCluster).retrieveMailboxCounters((CassandraId) inboxId)
- .blockOptional())
+ .blockOptional())
.isEmpty();
}
@@ -712,7 +714,8 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest<CassandraMai
mailboxManager.deleteMailbox(inbox, session);
assertThat(new CassandraMailboxRecentsDAO(cassandraCluster.getConf()).getRecentMessageUidsInMailbox((CassandraId) inboxId)
- .collectList().block())
+ .collectList()
+ .block())
.isEmpty();
}
@@ -730,7 +733,8 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest<CassandraMai
mailboxManager.deleteMailbox(inbox, session);
assertThat(new CassandraMailboxRecentsDAO(cassandraCluster.getConf()).getRecentMessageUidsInMailbox((CassandraId) inboxId)
- .collectList().block())
+ .collectList()
+ .block())
.isEmpty();
}
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java
index 710f400..60bbbf9 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java
@@ -74,7 +74,7 @@ class CassandraApplicableFlagDAOTest {
}
@Test
- void retrieveApplicableFlagShouldReturnEmptyWhenDeleted() {
+ void retrieveApplicableFlagsShouldReturnEmptyWhenDeleted() {
testee.updateApplicableFlags(CASSANDRA_ID, ImmutableSet.of(USER_FLAG)).block();
testee.delete(CASSANDRA_ID).block();
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAOTest.java
index f3154fe..87cc6a4 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAOTest.java
@@ -84,8 +84,8 @@ class CassandraDeletedMessageDAOTest {
testee.removeAll(MAILBOX_ID).block();
List<MessageUid> result = testee.retrieveDeletedMessage(MAILBOX_ID, MessageRange.all())
- .collectList()
- .block();
+ .collectList()
+ .block();
assertThat(result).isEmpty();
}
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentDAOTest.java
index e773083..e11bf82 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentDAOTest.java
@@ -51,8 +51,8 @@ class CassandraMailboxRecentDAOTest {
@Test
void getRecentMessageUidsInMailboxShouldBeEmptyByDefault() {
assertThat(testee.getRecentMessageUidsInMailbox(CASSANDRA_ID)
- .collectList()
- .block())
+ .collectList()
+ .block())
.isEmpty();
}
@@ -61,8 +61,8 @@ class CassandraMailboxRecentDAOTest {
testee.addToRecent(CASSANDRA_ID, UID1).block();
assertThat(testee.getRecentMessageUidsInMailbox(CASSANDRA_ID)
- .collectList()
- .block())
+ .collectList()
+ .block())
.containsOnly(UID1);
}
@@ -73,8 +73,8 @@ class CassandraMailboxRecentDAOTest {
testee.removeFromRecent(CASSANDRA_ID, UID1).block();
assertThat(testee.getRecentMessageUidsInMailbox(CASSANDRA_ID)
- .collectList()
- .block())
+ .collectList()
+ .block())
.isEmpty();
}
@@ -86,8 +86,8 @@ class CassandraMailboxRecentDAOTest {
testee.delete(CASSANDRA_ID).block();
assertThat(testee.getRecentMessageUidsInMailbox(CASSANDRA_ID)
- .collectList()
- .block())
+ .collectList()
+ .block())
.isEmpty();
}
@@ -101,8 +101,8 @@ class CassandraMailboxRecentDAOTest {
testee.removeFromRecent(CASSANDRA_ID, UID1).block();
assertThat(testee.getRecentMessageUidsInMailbox(CASSANDRA_ID)
- .collectList()
- .block())
+ .collectList()
+ .block())
.isEmpty();
}
@@ -113,8 +113,8 @@ class CassandraMailboxRecentDAOTest {
testee.addToRecent(CASSANDRA_ID, UID2).block();
assertThat(testee.getRecentMessageUidsInMailbox(CASSANDRA_ID)
- .collectList()
- .block())
+ .collectList()
+ .block())
.containsOnly(UID1, UID2);
}
@@ -126,8 +126,8 @@ class CassandraMailboxRecentDAOTest {
testee.removeFromRecent(CASSANDRA_ID, UID2).block();
assertThat(testee.getRecentMessageUidsInMailbox(CASSANDRA_ID)
- .collectList()
- .block())
+ .collectList()
+ .block())
.containsOnly(UID1);
}
@@ -151,8 +151,8 @@ class CassandraMailboxRecentDAOTest {
.forEach(i -> testee.addToRecent(CASSANDRA_ID, MessageUid.of(i + 1)).block());
assertThat(testee.getRecentMessageUidsInMailbox(CASSANDRA_ID)
- .collectList()
- .block())
+ .collectList()
+ .block())
.hasSize(size);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org