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 687d9eb7007ebe24cc1e892cf4af4a930f289864
Author: Rene Cordier <rcord...@linagora.com>
AuthorDate: Fri Nov 15 14:02:57 2019 +0700
[Refactoring] Move first batch of tests in mailbox cassandra to JUnit 5
---
.../mailbox/cassandra/ids/CassandraIdTest.java | 20 +++---
.../ids/CassandraMailboxIdDeserializerTest.java | 20 +++---
.../cassandra/ids/CassandraMessageIdTest.java | 14 ++---
.../cassandra/mail/AttachmentLoaderTest.java | 19 +++---
.../cassandra/mail/CassandraMailboxMapperTest.java | 71 ++++++++++------------
.../mail/CassandraMailboxPathV2DAOTest.java | 2 +-
.../MessageAttachmentRepresentationByIdTest.java | 31 +++++-----
.../mail/utils/FlagsUpdateStageResultTest.java | 42 ++++++-------
8 files changed, 107 insertions(+), 112 deletions(-)
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraIdTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraIdTest.java
index 4d7a195..a8c16e7 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraIdTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraIdTest.java
@@ -19,28 +19,24 @@
package org.apache.james.mailbox.cassandra.ids;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.UUID;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
import nl.jqno.equalsverifier.EqualsVerifier;
-public class CassandraIdTest {
-
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
+class CassandraIdTest {
@Test
- public void beanShouldRespectBeanContract() {
+ void beanShouldRespectBeanContract() {
EqualsVerifier.forClass(CassandraId.class)
.verify();
}
@Test
- public void fromStringShouldWorkWhenParameterIsAnUUID() {
+ void fromStringShouldWorkWhenParameterIsAnUUID() {
UUID id = UUID.randomUUID();
CassandraId cassandraId = new
CassandraId.Factory().fromString(id.toString());
@@ -49,8 +45,8 @@ public class CassandraIdTest {
}
@Test
- public void fromStringShouldThrowWhenParameterIsNotAnUUID() {
- expectedException.expect(IllegalArgumentException.class);
- new CassandraId.Factory().fromString("not an UUID");
+ void fromStringShouldThrowWhenParameterIsNotAnUUID() {
+ assertThatThrownBy(() -> new CassandraId.Factory().fromString("not an
UUID"))
+ .isInstanceOf(IllegalArgumentException.class);
}
}
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraMailboxIdDeserializerTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraMailboxIdDeserializerTest.java
index 71e78e3..597f529 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraMailboxIdDeserializerTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraMailboxIdDeserializerTest.java
@@ -20,14 +20,15 @@
package org.apache.james.mailbox.cassandra.ids;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.UUID;
import
org.apache.james.mailbox.store.mail.model.MailboxIdDeserialisationException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class CassandraMailboxIdDeserializerTest {
+class CassandraMailboxIdDeserializerTest {
private static final String UUID_STRING =
"5530370f-44c6-4647-990e-7768ce5131d4";
private static final String MALFORMED_UUID_STRING = "xyz";
@@ -35,19 +36,20 @@ public class CassandraMailboxIdDeserializerTest {
private CassandraMailboxIdDeserializer mailboxIdDeserializer;
- @Before
- public void setUp() {
+ @BeforeEach
+ void setUp() {
mailboxIdDeserializer = new CassandraMailboxIdDeserializer();
}
@Test
- public void deserializeShouldWork() throws Exception {
+ void deserializeShouldWork() throws Exception {
assertThat(mailboxIdDeserializer.deserialize(UUID_STRING)).isEqualTo(CASSANDRA_ID);
}
- @Test(expected = MailboxIdDeserialisationException.class)
- public void deserializeShouldThrowOnMalformedData() throws Exception {
- mailboxIdDeserializer.deserialize(MALFORMED_UUID_STRING);
+ @Test
+ void deserializeShouldThrowOnMalformedData() {
+ assertThatThrownBy(() ->
mailboxIdDeserializer.deserialize(MALFORMED_UUID_STRING))
+ .isInstanceOf(MailboxIdDeserialisationException.class);
}
}
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageIdTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageIdTest.java
index bb7551a..29cd278 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageIdTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/ids/CassandraMessageIdTest.java
@@ -22,20 +22,20 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.UUID;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import nl.jqno.equalsverifier.EqualsVerifier;
-public class CassandraMessageIdTest {
+class CassandraMessageIdTest {
@Test
- public void beanShouldRespectBeanContract() {
+ void beanShouldRespectBeanContract() {
EqualsVerifier.forClass(CassandraMessageId.class)
.verify();
}
@Test
- public void generateShouldReturnAValidCassandraMesssageId() {
+ void generateShouldReturnAValidCassandraMesssageId() {
CassandraMessageId.Factory testee = new CassandraMessageId.Factory();
CassandraMessageId cassandraMessageId = testee.generate();
@@ -43,7 +43,7 @@ public class CassandraMessageIdTest {
}
@Test
- public void ofShouldReturnAValidCassandraMesssageId() {
+ void ofShouldReturnAValidCassandraMesssageId() {
CassandraMessageId.Factory testee = new CassandraMessageId.Factory();
UUID expectedUuid = UUID.randomUUID();
@@ -53,7 +53,7 @@ public class CassandraMessageIdTest {
}
@Test
- public void serializeShouldReturnTheUuidAsString() {
+ void serializeShouldReturnTheUuidAsString() {
CassandraMessageId.Factory testee = new CassandraMessageId.Factory();
UUID uuid = UUID.randomUUID();
@@ -64,7 +64,7 @@ public class CassandraMessageIdTest {
}
@Test
- public void shouldBeSerializable() {
+ void shouldBeSerializable() {
assertThat(new
CassandraMessageId.Factory().generate().isSerializable()).isTrue();
}
}
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java
index 4161e8d..c536650 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java
@@ -29,25 +29,26 @@ import org.apache.james.mailbox.model.Attachment;
import org.apache.james.mailbox.model.AttachmentId;
import org.apache.james.mailbox.model.Cid;
import org.apache.james.mailbox.model.MessageAttachment;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
+
import reactor.core.publisher.Mono;
-public class AttachmentLoaderTest {
+class AttachmentLoaderTest {
private CassandraAttachmentMapper attachmentMapper;
private AttachmentLoader testee;
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
attachmentMapper = mock(CassandraAttachmentMapper.class);
testee = new AttachmentLoader(attachmentMapper);
}
@Test
- public void getAttachmentsShouldWorkWithDuplicatedAttachments() {
+ void getAttachmentsShouldWorkWithDuplicatedAttachments() {
AttachmentId attachmentId = AttachmentId.from("1");
Attachment attachment = Attachment.builder()
@@ -73,7 +74,7 @@ public class AttachmentLoaderTest {
}
@Test
- public void getAttachmentsShouldWorkWithDuplicatedIds() {
+ void getAttachmentsShouldWorkWithDuplicatedIds() {
AttachmentId attachmentId = AttachmentId.from("1");
Attachment attachment = Attachment.builder()
@@ -101,7 +102,7 @@ public class AttachmentLoaderTest {
}
@Test
- public void
getAttachmentsShouldReturnMultipleAttachmentWhenSeveralAttachmentsRepresentation()
{
+ void
getAttachmentsShouldReturnMultipleAttachmentWhenSeveralAttachmentsRepresentation()
{
AttachmentId attachmentId1 = AttachmentId.from("1");
AttachmentId attachmentId2 = AttachmentId.from("2");
@@ -137,7 +138,7 @@ public class AttachmentLoaderTest {
}
@Test
- public void getAttachmentsShouldReturnEmptyByDefault() {
+ void getAttachmentsShouldReturnEmptyByDefault() {
AttachmentId attachmentId = AttachmentId.from("1");
Attachment attachment = Attachment.builder()
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
index 60e8036..8fc831e 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
@@ -26,7 +26,8 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.james.backends.cassandra.CassandraCluster;
-import org.apache.james.backends.cassandra.DockerCassandraRule;
+import org.apache.james.backends.cassandra.CassandraClusterExtension;
+import org.apache.james.backends.cassandra.CassandraRestartExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
import
org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
import org.apache.james.backends.cassandra.utils.CassandraUtils;
@@ -41,13 +42,14 @@ import org.apache.james.mailbox.model.Mailbox;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.search.MailboxQuery;
import org.apache.james.mailbox.model.search.Wildcard;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-
-public class CassandraMailboxMapperTest {
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+@ExtendWith(CassandraRestartExtension.class)
+class CassandraMailboxMapperTest {
private static final int UID_VALIDITY = 52;
private static final Username USER = Username.of("user");
@@ -64,18 +66,17 @@ public class CassandraMailboxMapperTest {
CassandraSchemaVersionModule.MODULE,
CassandraAclModule.MODULE);
- @Rule public DockerCassandraRule cassandraServer = new
DockerCassandraRule().allowRestart();
-
- private CassandraCluster cassandra;
+ @RegisterExtension
+ static CassandraClusterExtension cassandraCluster = new
CassandraClusterExtension(MODULES);
private CassandraMailboxDAO mailboxDAO;
private CassandraMailboxPathDAOImpl mailboxPathDAO;
private CassandraMailboxPathV2DAO mailboxPathV2DAO;
private CassandraMailboxMapper testee;
- @Before
- public void setUp() {
- cassandra = CassandraCluster.create(MODULES,
cassandraServer.getHost());
+ @BeforeEach
+ void setUp() {
+ CassandraCluster cassandra = cassandraCluster.getCassandraCluster();
mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(),
cassandra.getTypesProvider());
mailboxPathDAO = new CassandraMailboxPathDAOImpl(cassandra.getConf(),
cassandra.getTypesProvider());
mailboxPathV2DAO = new CassandraMailboxPathV2DAO(cassandra.getConf(),
CassandraUtils.WITH_DEFAULT_CONFIGURATION);
@@ -90,15 +91,9 @@ public class CassandraMailboxMapperTest {
CassandraConfiguration.DEFAULT_CONFIGURATION));
}
- @After
- public void tearDown() {
- cassandra.clearTables();
- cassandra.closeCluster();
- }
-
- @Ignore("JAMES-2514 Cassandra 3 supports long mailbox names. Hence we can
not rely on this for failing")
+ @Disabled("JAMES-2514 Cassandra 3 supports long mailbox names. Hence we
can not rely on this for failing")
@Test
- public void
saveShouldNotRemoveOldMailboxPathWhenCreatingTheNewMailboxPathFails() throws
Exception {
+ void saveShouldNotRemoveOldMailboxPathWhenCreatingTheNewMailboxPathFails()
throws Exception {
testee.save(new Mailbox(MAILBOX_PATH, UID_VALIDITY));
Mailbox mailbox = testee.findMailboxByPath(MAILBOX_PATH);
@@ -116,7 +111,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void deleteShouldDeleteMailboxAndMailboxPathFromV1Table() {
+ void deleteShouldDeleteMailboxAndMailboxPathFromV1Table() {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -129,7 +124,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void deleteShouldDeleteMailboxAndMailboxPathFromV2Table() {
+ void deleteShouldDeleteMailboxAndMailboxPathFromV2Table() {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathV2DAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -142,7 +137,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void findMailboxByPathShouldReturnMailboxWhenExistsInV1Table()
throws Exception {
+ void findMailboxByPathShouldReturnMailboxWhenExistsInV1Table() throws
Exception {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -154,7 +149,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void findMailboxByPathShouldReturnMailboxWhenExistsInV2Table()
throws Exception {
+ void findMailboxByPathShouldReturnMailboxWhenExistsInV2Table() throws
Exception {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathV2DAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -166,7 +161,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void findMailboxByPathShouldReturnMailboxWhenExistsInBothTables()
throws Exception {
+ void findMailboxByPathShouldReturnMailboxWhenExistsInBothTables() throws
Exception {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -180,7 +175,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void deleteShouldRemoveMailboxWhenInBothTables() {
+ void deleteShouldRemoveMailboxWhenInBothTables() {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -195,7 +190,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void deleteShouldRemoveMailboxWhenInV1Tables() {
+ void deleteShouldRemoveMailboxWhenInV1Tables() {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -208,7 +203,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void deleteShouldRemoveMailboxWhenInV2Table() {
+ void deleteShouldRemoveMailboxWhenInV2Table() {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathV2DAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -221,7 +216,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void findMailboxByPathShouldThrowWhenDoesntExistInBothTables() {
+ void findMailboxByPathShouldThrowWhenDoesntExistInBothTables() {
mailboxDAO.save(MAILBOX)
.block();
@@ -230,7 +225,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void
findMailboxWithPathLikeShouldReturnMailboxesWhenExistsInV1Table() {
+ void findMailboxWithPathLikeShouldReturnMailboxesWhenExistsInV1Table() {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -247,7 +242,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void
findMailboxWithPathLikeShouldReturnMailboxesWhenExistsInBothTables() {
+ void findMailboxWithPathLikeShouldReturnMailboxesWhenExistsInBothTables() {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -266,7 +261,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void
findMailboxWithPathLikeShouldReturnMailboxesWhenExistsInV2Table() {
+ void findMailboxWithPathLikeShouldReturnMailboxesWhenExistsInV2Table() {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathV2DAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -283,7 +278,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void hasChildrenShouldReturnChildWhenExistsInV1Table() {
+ void hasChildrenShouldReturnChildWhenExistsInV1Table() {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -302,7 +297,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void hasChildrenShouldReturnChildWhenExistsInBothTables() {
+ void hasChildrenShouldReturnChildWhenExistsInBothTables() {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -323,7 +318,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void hasChildrenShouldReturnChildWhenExistsInV2Table() {
+ void hasChildrenShouldReturnChildWhenExistsInV2Table() {
mailboxDAO.save(MAILBOX)
.block();
mailboxPathV2DAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -342,7 +337,7 @@ public class CassandraMailboxMapperTest {
}
@Test
- public void findMailboxWithPathLikeShouldRemoveDuplicatesAndKeepV2() {
+ void findMailboxWithPathLikeShouldRemoveDuplicatesAndKeepV2() {
mailboxDAO.save(MAILBOX).block();
mailboxPathV2DAO.save(MAILBOX_PATH, MAILBOX_ID).block();
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathV2DAOTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathV2DAOTest.java
index dc1f559..1bfcffc 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathV2DAOTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathV2DAOTest.java
@@ -22,7 +22,7 @@ package org.apache.james.mailbox.cassandra.mail;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.utils.CassandraUtils;
-public class CassandraMailboxPathV2DAOTest extends CassandraMailboxPathDAOTest
{
+class CassandraMailboxPathV2DAOTest extends CassandraMailboxPathDAOTest {
@Override
CassandraMailboxPathDAO testee(CassandraCluster cassandra) {
return new CassandraMailboxPathV2DAO(cassandra.getConf(),
CassandraUtils.WITH_DEFAULT_CONFIGURATION);
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/MessageAttachmentRepresentationByIdTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/MessageAttachmentRepresentationByIdTest.java
index 4026300..84d000d 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/MessageAttachmentRepresentationByIdTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/MessageAttachmentRepresentationByIdTest.java
@@ -20,31 +20,32 @@
package org.apache.james.mailbox.cassandra.mail;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.Optional;
-import org.apache.james.mailbox.cassandra.mail.MessageAttachmentRepresentation;
import org.apache.james.mailbox.model.AttachmentId;
import org.apache.james.mailbox.model.Cid;
-import org.junit.Test;
+import org.apache.james.mailbox.model.MessageAttachment;
+import org.junit.jupiter.api.Test;
-public class MessageAttachmentRepresentationByIdTest {
+class MessageAttachmentRepresentationByIdTest {
- @Test(expected = IllegalStateException.class)
- public void buildShouldThrowWhenAttachmentIsNotGiven() {
- org.apache.james.mailbox.model.MessageAttachment.builder()
- .build();
+ @Test
+ void buildShouldThrowWhenAttachmentIsNotGiven() {
+ assertThatThrownBy(() -> MessageAttachment.builder().build())
+ .isInstanceOf(IllegalStateException.class);
}
- @Test(expected = IllegalArgumentException.class)
- public void builderShouldThrowWhenAttachmentIsNull() {
- org.apache.james.mailbox.model.MessageAttachment.builder()
- .attachment(null);
+ @Test
+ void builderShouldThrowWhenAttachmentIsNull() {
+ assertThatThrownBy(() -> MessageAttachment.builder().attachment(null))
+ .isInstanceOf(IllegalArgumentException.class);
}
@Test
- public void buildShouldWorkWhenMandatoryAttributesAreGiven() {
+ void buildShouldWorkWhenMandatoryAttributesAreGiven() {
AttachmentId attachmentId = AttachmentId.from("1");
MessageAttachmentRepresentation
expectedMessageAttachmentRepresentation = new
MessageAttachmentRepresentation(attachmentId, Optional.empty(),
Optional.empty(), false);
@@ -56,7 +57,7 @@ public class MessageAttachmentRepresentationByIdTest {
}
@Test
- public void buildShouldSetIsInlineDefaultValueWhenNotGiven() {
+ void buildShouldSetIsInlineDefaultValueWhenNotGiven() {
AttachmentId attachmentId = AttachmentId.from("1");
MessageAttachmentRepresentation messageAttachmentRepresentation =
MessageAttachmentRepresentation.builder()
@@ -67,7 +68,7 @@ public class MessageAttachmentRepresentationByIdTest {
}
@Test
- public void buildShouldAcceptInlineAndWithoutCid() {
+ void buildShouldAcceptInlineAndWithoutCid() {
AttachmentId attachmentId = AttachmentId.from("1");
MessageAttachmentRepresentation
expectedMessageAttachmentRepresentation = new
MessageAttachmentRepresentation(attachmentId, Optional.empty(),
Optional.empty(), true);
@@ -80,7 +81,7 @@ public class MessageAttachmentRepresentationByIdTest {
}
@Test
- public void buildShouldSetAttributesWhenAllAreGiven() {
+ void buildShouldSetAttributesWhenAllAreGiven() {
AttachmentId attachmentId = AttachmentId.from("1");
MessageAttachmentRepresentation
expectedMessageAttachmentRepresentation = new
MessageAttachmentRepresentation(attachmentId, Optional.of("name"),
Optional.of(Cid.from("cid")), true);
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/FlagsUpdateStageResultTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/FlagsUpdateStageResultTest.java
index 93f7273..ee959c3 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/FlagsUpdateStageResultTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/FlagsUpdateStageResultTest.java
@@ -25,23 +25,23 @@ import javax.mail.Flags;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.model.UpdatedFlags;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
import nl.jqno.equalsverifier.EqualsVerifier;
-public class FlagsUpdateStageResultTest {
+class FlagsUpdateStageResultTest {
- public static final MessageUid UID = MessageUid.of(1L);
- public static final MessageUid OTHER_UID = MessageUid.of(2L);
- public static final UpdatedFlags UPDATED_FLAGS = UpdatedFlags.builder()
+ private static final MessageUid UID = MessageUid.of(1L);
+ private static final MessageUid OTHER_UID = MessageUid.of(2L);
+ private static final UpdatedFlags UPDATED_FLAGS = UpdatedFlags.builder()
.uid(UID)
.modSeq(18L)
.oldFlags(new Flags())
.newFlags(new Flags(Flags.Flag.SEEN))
.build();
- public static final UpdatedFlags OTHER_UPDATED_FLAGS =
UpdatedFlags.builder()
+ private static final UpdatedFlags OTHER_UPDATED_FLAGS =
UpdatedFlags.builder()
.uid(OTHER_UID)
.modSeq(18L)
.oldFlags(new Flags())
@@ -49,66 +49,66 @@ public class FlagsUpdateStageResultTest {
.build();
@Test
- public void classShouldRespectBeanContract() {
+ void classShouldRespectBeanContract() {
EqualsVerifier.forClass(FlagsUpdateStageResult.class);
}
@Test
- public void noneShouldCreateResultWithoutSuccessOrFails() {
+ void noneShouldCreateResultWithoutSuccessOrFails() {
assertThat(FlagsUpdateStageResult.none())
.isEqualTo(new FlagsUpdateStageResult(ImmutableList.of(),
ImmutableList.of()));
}
@Test
- public void failShouldCreateResultWithFailedUid() {
+ void failShouldCreateResultWithFailedUid() {
assertThat(FlagsUpdateStageResult.fail(UID))
.isEqualTo(new FlagsUpdateStageResult(ImmutableList.of(UID),
ImmutableList.of()));
}
@Test
- public void successShouldCreateResultWithSucceededUpdatedFlags() {
+ void successShouldCreateResultWithSucceededUpdatedFlags() {
assertThat(FlagsUpdateStageResult.success(UPDATED_FLAGS))
.isEqualTo(new FlagsUpdateStageResult(ImmutableList.of(),
ImmutableList.of(UPDATED_FLAGS)));
}
@Test
- public void noneShouldBeWellMergedWithNone() {
+ void noneShouldBeWellMergedWithNone() {
assertThat(FlagsUpdateStageResult.none().merge(FlagsUpdateStageResult.none()))
.isEqualTo(FlagsUpdateStageResult.none());
}
@Test
- public void noneShouldBeWellMergedWithFail() {
+ void noneShouldBeWellMergedWithFail() {
assertThat(FlagsUpdateStageResult.none().merge(FlagsUpdateStageResult.fail(UID)))
.isEqualTo(FlagsUpdateStageResult.fail(UID));
}
@Test
- public void noneShouldBeWellMergedWithSuccess() {
+ void noneShouldBeWellMergedWithSuccess() {
assertThat(FlagsUpdateStageResult.none().merge(FlagsUpdateStageResult.success(UPDATED_FLAGS)))
.isEqualTo(FlagsUpdateStageResult.success(UPDATED_FLAGS));
}
@Test
- public void failShouldBeWellMergedWithFail() {
+ void failShouldBeWellMergedWithFail() {
assertThat(FlagsUpdateStageResult.fail(UID).merge(FlagsUpdateStageResult.fail(OTHER_UID)))
.isEqualTo(new FlagsUpdateStageResult(ImmutableList.of(UID,
OTHER_UID), ImmutableList.of()));
}
@Test
- public void successShouldBeWellMergedWithFail() {
+ void successShouldBeWellMergedWithFail() {
assertThat(FlagsUpdateStageResult.success(UPDATED_FLAGS).merge(FlagsUpdateStageResult.fail(UID)))
.isEqualTo(new FlagsUpdateStageResult(ImmutableList.of(UID),
ImmutableList.of(UPDATED_FLAGS)));
}
@Test
- public void successShouldBeWellMergedWithSuccess() {
+ void successShouldBeWellMergedWithSuccess() {
assertThat(FlagsUpdateStageResult.success(UPDATED_FLAGS).merge(FlagsUpdateStageResult.success(OTHER_UPDATED_FLAGS)))
.isEqualTo(new FlagsUpdateStageResult(ImmutableList.of(),
ImmutableList.of(UPDATED_FLAGS, OTHER_UPDATED_FLAGS)));
}
@Test
- public void getFailedShouldReturnFailedUid() {
+ void getFailedShouldReturnFailedUid() {
FlagsUpdateStageResult flagsUpdateStageResult = new
FlagsUpdateStageResult(ImmutableList.of(UID), ImmutableList.of(UPDATED_FLAGS));
assertThat(flagsUpdateStageResult.getFailed())
@@ -116,7 +116,7 @@ public class FlagsUpdateStageResultTest {
}
@Test
- public void getSucceededShouldReturnSucceedUpdatedFlags() {
+ void getSucceededShouldReturnSucceedUpdatedFlags() {
FlagsUpdateStageResult flagsUpdateStageResult = new
FlagsUpdateStageResult(ImmutableList.of(UID), ImmutableList.of(UPDATED_FLAGS));
assertThat(flagsUpdateStageResult.getSucceeded())
@@ -124,7 +124,7 @@ public class FlagsUpdateStageResultTest {
}
@Test
- public void keepSuccessShouldDiscardFailedUids() {
+ void keepSuccessShouldDiscardFailedUids() {
FlagsUpdateStageResult flagsUpdateStageResult = new
FlagsUpdateStageResult(ImmutableList.of(UID), ImmutableList.of(UPDATED_FLAGS));
assertThat(flagsUpdateStageResult.keepSucceded())
@@ -132,14 +132,14 @@ public class FlagsUpdateStageResultTest {
}
@Test
- public void containsFailedResultsShouldReturnTrueWhenFailed() {
+ void containsFailedResultsShouldReturnTrueWhenFailed() {
assertThat(FlagsUpdateStageResult.fail(UID).containsFailedResults())
.isTrue();
}
@Test
- public void containsFailedResultsShouldReturnFalseWhenSucceeded() {
+ void containsFailedResultsShouldReturnFalseWhenSucceeded() {
assertThat(FlagsUpdateStageResult.success(UPDATED_FLAGS).containsFailedResults())
.isFalse();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
