JAMES-2124 Solve various Eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f8f540a6 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f8f540a6 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f8f540a6 Branch: refs/heads/master Commit: f8f540a68a18505748d9c6e7d6d1994fdbe94f07 Parents: 8aed4b0 Author: benwa <[email protected]> Authored: Thu Aug 24 08:00:53 2017 +0700 Committer: benwa <[email protected]> Committed: Fri Aug 25 18:18:14 2017 +0700 ---------------------------------------------------------------------- .../cassandra/mail/CassandraMessageDAO.java | 11 ---- .../cassandra/mail/CassandraBlobsDAOTest.java | 2 +- .../json/MessageToElasticSearchJsonTest.java | 16 +++--- .../store/extractor/DefaultTextExtractor.java | 4 +- .../PartContentBuilderComplexMultipartTest.java | 11 ++-- ...tContentBuilderMultipartAlternativeTest.java | 9 ++-- .../store/mail/model/ListMessageAssert.java | 3 +- .../mailbox/store/mail/model/MessageAssert.java | 13 ++--- .../mailbox/tika/TikaTextExtractorTest.java | 2 +- .../james/transport/mailets/LogMessage.java | 3 +- .../transport/mailets/StripAttachmentTest.java | 5 +- .../api/AbstractProtocolTransportTest.java | 2 +- .../imap/decode/main/IdRangeParseTest.java | 3 +- .../FetchCommandParserPartialFetchTest.java | 8 +-- .../SearchCommandParserAndParenthesesTest.java | 3 -- .../parser/SearchCommandParserCharsetTest.java | 3 -- .../parser/SearchCommandParserNotTest.java | 3 -- .../parser/SearchCommandParserOrTest.java | 3 -- .../SearchCommandParserQuotedCharsetTest.java | 3 -- ...chCommandParserSearchKeySequenceSetTest.java | 5 +- .../SearchCommandParserSearchKeyTest.java | 6 +-- .../SearchCommandParserTopLevelAndTest.java | 3 -- .../decode/parser/StoreCommandParserTest.java | 3 -- .../FetchResponseEncoderEnvelopeTest.java | 40 +++++++------- .../FetchResponseEncoderNoExtensionsTest.java | 3 -- .../imap/encode/FetchResponseEncoderTest.java | 11 ++-- .../imap/encode/LSubResponseEncoderTest.java | 3 -- .../imap/encode/ListResponseEncoderTest.java | 10 ++-- .../imap/encode/ListingEncodingUtilsTest.java | 3 +- .../MailboxStatusResponseEncoderTest.java | 10 ++-- .../encode/NamespaceResponseEncoderTest.java | 3 -- .../imap/encode/SearchResponseEncoderTest.java | 10 ++-- ...ImapRequestHandlerAdandonConnectionTest.java | 5 +- .../imap/processor/DeleteACLProcessorTest.java | 3 -- .../imap/processor/GetACLProcessorTest.java | 3 -- .../james/imap/processor/LSubProcessorTest.java | 3 -- .../james/imap/processor/ListProcessorTest.java | 3 -- .../imap/processor/ListRightsProcessorTest.java | 3 -- .../imap/processor/NamespaceProcessorTest.java | 3 -- .../imap/processor/SearchProcessorTest.java | 3 -- .../imap/processor/SetACLProcessorTest.java | 3 -- .../fetch/PartialFetchBodyElementTest.java | 6 +-- protocols/pom.xml | 56 ++++++++++++++++++++ .../pop3/POP3StartTlsResponseTest.java | 4 +- .../smtp/SMTPStartTlsResponseTest.java | 4 +- .../smtp/core/fastfail/DNSRBLHandlerTest.java | 6 +-- .../smtp/core/fastfail/MaxRcptHandlerTest.java | 7 +-- .../core/fastfail/MaxUnknownCmdHandlerTest.java | 2 +- .../fastfail/ResolvableEhloHeloHandlerTest.java | 8 ++- .../smtp/core/fastfail/SpamTrapHandlerTest.java | 4 +- .../fastfail/ValidSenderDomainHandlerTest.java | 2 +- .../integration/cucumber/UploadStepdefs.java | 4 +- 52 files changed, 153 insertions(+), 196 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java index 5129f3b..5b62ef0 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java @@ -70,7 +70,6 @@ import org.apache.james.mailbox.model.ComposedMessageIdWithMetaData; import org.apache.james.mailbox.model.MessageAttachment; import org.apache.james.mailbox.store.mail.MessageMapper.FetchType; import org.apache.james.mailbox.store.mail.model.MailboxMessage; -import org.apache.james.mailbox.store.mail.model.Property; import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder; import org.apache.james.mailbox.store.mail.model.impl.SimpleProperty; import org.apache.james.util.CompletableFutureUtil; @@ -194,16 +193,6 @@ public class CassandraMessageDAO { .collect(Guavate.toImmutableList()); } - private List<UDTValue> buildPropertiesUdt(List<Property> properties) { - return properties.stream() - .map(property -> typesProvider.getDefinedUserType(PROPERTIES) - .newValue() - .setString(Properties.NAMESPACE, property.getNamespace()) - .setString(Properties.NAME, property.getLocalName()) - .setString(Properties.VALUE, property.getValue())) - .collect(Guavate.toImmutableList()); - } - private UDTValue toUDT(MessageAttachment messageAttachment) { return typesProvider.getDefinedUserType(ATTACHMENTS) .newValue() http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java index f398b9b..d2f9ceb 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java @@ -24,7 +24,6 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; import java.util.Optional; -import org.apache.commons.io.Charsets; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.CassandraConfiguration; import org.apache.james.mailbox.cassandra.ids.BlobId; @@ -33,6 +32,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import com.google.common.base.Charsets; import com.google.common.base.Strings; public class CassandraBlobsDAOTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java index 96ae5d8..c104324 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java @@ -148,7 +148,7 @@ public class MessageToElasticSearchJsonTest { htmlMail.setUid(UID); assertThatJson(messageToElasticSearchJson.convertToJson(htmlMail, ImmutableList.of(new MockMailboxSession("username").getUser()))) .when(IGNORING_ARRAY_ORDER) - .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/htmlMail.json"))); + .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/htmlMail.json"), CHARSET)); } @Test @@ -168,7 +168,7 @@ public class MessageToElasticSearchJsonTest { pgpSignedMail.setUid(UID); assertThatJson(messageToElasticSearchJson.convertToJson(pgpSignedMail, ImmutableList.of(new MockMailboxSession("username").getUser()))) .when(IGNORING_ARRAY_ORDER) - .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/pgpSignedMail.json"))); + .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/pgpSignedMail.json"), CHARSET)); } @Test @@ -189,7 +189,7 @@ public class MessageToElasticSearchJsonTest { assertThatJson(messageToElasticSearchJson.convertToJson(mail, ImmutableList.of(new MockMailboxSession("user1").getUser(), new MockMailboxSession("user2").getUser()))) .when(IGNORING_ARRAY_ORDER).when(IGNORING_VALUES) - .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/mail.json"))); + .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/mail.json"), CHARSET)); } @Test @@ -209,7 +209,7 @@ public class MessageToElasticSearchJsonTest { recursiveMail.setUid(UID); assertThatJson(messageToElasticSearchJson.convertToJson(recursiveMail, ImmutableList.of(new MockMailboxSession("username").getUser()))) .when(IGNORING_ARRAY_ORDER).when(IGNORING_VALUES) - .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMail.json"))); + .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMail.json"), CHARSET)); } @Test @@ -230,7 +230,7 @@ public class MessageToElasticSearchJsonTest { assertThatJson(messageToElasticSearchJson.convertToJson(mailWithNoInternalDate, ImmutableList.of(new MockMailboxSession("username").getUser()))) .when(IGNORING_ARRAY_ORDER) .when(IGNORING_VALUES) - .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMail.json"))); + .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMail.json"), CHARSET)); } @Test @@ -258,7 +258,7 @@ public class MessageToElasticSearchJsonTest { assertThatJson(convertToJson) .when(IGNORING_ARRAY_ORDER) .when(IGNORING_VALUES) - .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMail.json"))); + .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMail.json"), CHARSET)); } @Test @@ -286,7 +286,7 @@ public class MessageToElasticSearchJsonTest { assertThatJson(convertToJson) .when(IGNORING_ARRAY_ORDER) .when(IGNORING_VALUES) - .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMailWithoutAttachments.json"))); + .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMailWithoutAttachments.json"), CHARSET)); } @Test(expected = NullPointerException.class) @@ -385,6 +385,6 @@ public class MessageToElasticSearchJsonTest { assertThatJson(convertToJsonWithoutAttachment) .when(IGNORING_ARRAY_ORDER) .when(IGNORING_VALUES) - .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/emailWithNonIndexableAttachmentWithoutAttachment.json"))); + .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/emailWithNonIndexableAttachmentWithoutAttachment.json"), CHARSET)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java index c61fb89..93b9551 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java @@ -26,6 +26,8 @@ import org.apache.commons.io.IOUtils; import org.apache.james.mailbox.extractor.ParsedContent; import org.apache.james.mailbox.extractor.TextExtractor; +import com.google.common.base.Charsets; + /** * A default text extractor that is directly based on the input file provided. * @@ -36,7 +38,7 @@ public class DefaultTextExtractor implements TextExtractor { @Override public ParsedContent extractContent(InputStream inputStream, String contentType) throws Exception { if(contentType != null && contentType.startsWith("text/") ) { - return new ParsedContent(IOUtils.toString(inputStream), new HashMap<>()); + return new ParsedContent(IOUtils.toString(inputStream, Charsets.UTF_8), new HashMap<>()); } else { return new ParsedContent(null, new HashMap<>()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java index 0fd2dab..ed23ca3 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java @@ -19,8 +19,8 @@ package org.apache.james.mailbox.store; -import static org.junit.Assert.*; - +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -29,12 +29,13 @@ import java.util.List; import org.apache.commons.io.IOUtils; import org.apache.james.mailbox.model.MessageResult.Header; -import org.apache.james.mailbox.store.ResultHeader; import org.apache.james.mailbox.store.streaming.PartContentBuilder; import org.apache.james.mailbox.store.streaming.PartContentBuilder.PartNotFoundException; import org.junit.Before; import org.junit.Test; +import com.google.common.base.Charsets; + public class PartContentBuilderComplexMultipartTest { private static final String PREAMBLE = "This is the preamble"; @@ -192,12 +193,12 @@ public class PartContentBuilderComplexMultipartTest { private String fullContent(int[] position) throws Exception { to(position); - return IOUtils.toString(builder.getFullContent().getInputStream()); + return IOUtils.toString(builder.getFullContent().getInputStream(), Charsets.UTF_8); } private String bodyContent(int[] position) throws Exception { to(position); - return IOUtils.toString(builder.getMimeBodyContent().getInputStream()); + return IOUtils.toString(builder.getMimeBodyContent().getInputStream(), Charsets.UTF_8); } private void checkContentType(String contentType, int[] position) http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java index a426866..55d88e2 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java @@ -19,7 +19,7 @@ package org.apache.james.mailbox.store; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -28,11 +28,12 @@ import java.util.List; import org.apache.commons.io.IOUtils; import org.apache.james.mailbox.model.MessageResult.Header; -import org.apache.james.mailbox.store.ResultHeader; import org.apache.james.mailbox.store.streaming.PartContentBuilder; import org.junit.Before; import org.junit.Test; +import com.google.common.base.Charsets; + public class PartContentBuilderMultipartAlternativeTest { private static final String CONTENT_TYPE_PLAIN = "text/plain;charset=us-ascii"; @@ -105,7 +106,7 @@ public class PartContentBuilderMultipartAlternativeTest { .encode(mail).array()); builder.parse(in); builder.to(position); - return IOUtils.toString(builder.getFullContent().getInputStream()); + return IOUtils.toString(builder.getFullContent().getInputStream(), Charsets.UTF_8); } private String bodyContent(String mail, int position) throws Exception { @@ -113,7 +114,7 @@ public class PartContentBuilderMultipartAlternativeTest { .encode(mail).array()); builder.parse(in); builder.to(position); - return IOUtils.toString(builder.getMimeBodyContent().getInputStream()); + return IOUtils.toString(builder.getMimeBodyContent().getInputStream(), Charsets.UTF_8); } private void checkContentType(String contentType, String mail, int position) http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java index ccb34f2..b54b423 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java @@ -30,6 +30,7 @@ import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MessageId; +import com.google.common.base.Charsets; import com.google.common.base.Objects; import com.google.common.base.Throwables; import com.google.common.collect.FluentIterable; @@ -42,7 +43,7 @@ public class ListMessageAssert { return FluentIterable.from(messages).transform(message -> { try { return new InnerMessage(message.getMessageId(), message.getUid(), message.getMailboxId(), message.getInternalDate(), message.getBodyOctets(), - message.getFullContentOctets(), message.getMediaType(), message.getSubType(), IOUtils.toString(message.getFullContent())); + message.getFullContentOctets(), message.getMediaType(), message.getSubType(), IOUtils.toString(message.getFullContent(), Charsets.UTF_8)); } catch (IOException e) { Throwables.propagate(e); return null; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java index 7267924..67c1ba0 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java @@ -28,6 +28,7 @@ import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.MessageMapper.FetchType; import org.assertj.core.api.AbstractAssert; +import com.google.common.base.Charsets; import com.google.common.base.Objects; public class MessageAssert extends AbstractAssert<MessageAssert, MailboxMessage> { @@ -87,18 +88,18 @@ public class MessageAssert extends AbstractAssert<MessageAssert, MailboxMessage> if (!Objects.equal(actual.getFullContentOctets(), expected.getFullContentOctets())) { failWithMessage("Expected MailboxMessage size to be <%s> but was <%s>", expected.getFullContentOctets(), actual.getFullContentOctets()); } - if (!Objects.equal(IOUtils.toString(actual.getFullContent()), IOUtils.toString(expected.getFullContent()))) { - failWithMessage("Expected Full content to be <%s> but was <%s>", IOUtils.toString(expected.getFullContent()), IOUtils.toString(actual.getFullContent())); + if (!Objects.equal(IOUtils.toString(actual.getFullContent(), Charsets.UTF_8), IOUtils.toString(expected.getFullContent(), Charsets.UTF_8))) { + failWithMessage("Expected Full content to be <%s> but was <%s>", IOUtils.toString(expected.getFullContent(), Charsets.UTF_8), IOUtils.toString(actual.getFullContent(), Charsets.UTF_8)); } } if (usedFetchType == MessageMapper.FetchType.Full || usedFetchType == MessageMapper.FetchType.Headers) { - if (!Objects.equal(IOUtils.toString(actual.getHeaderContent()), IOUtils.toString(expected.getHeaderContent()))) { - failWithMessage("Expected Header content to be <%s> but was <%s>", IOUtils.toString(expected.getHeaderContent()), IOUtils.toString(actual.getHeaderContent())); + if (!Objects.equal(IOUtils.toString(actual.getHeaderContent(), Charsets.UTF_8), IOUtils.toString(expected.getHeaderContent(), Charsets.UTF_8))) { + failWithMessage("Expected Header content to be <%s> but was <%s>", IOUtils.toString(expected.getHeaderContent(), Charsets.UTF_8), IOUtils.toString(actual.getHeaderContent(), Charsets.UTF_8)); } } if (usedFetchType == MessageMapper.FetchType.Full || usedFetchType == MessageMapper.FetchType.Body) { - if (!Objects.equal(IOUtils.toString(actual.getBodyContent()), IOUtils.toString(expected.getBodyContent()))) { - failWithMessage("Expected Body content to be <%s> but was <%s>", IOUtils.toString(expected.getBodyContent()), IOUtils.toString(actual.getBodyContent())); + if (!Objects.equal(IOUtils.toString(actual.getBodyContent(), Charsets.UTF_8), IOUtils.toString(expected.getBodyContent(), Charsets.UTF_8))) { + failWithMessage("Expected Body content to be <%s> but was <%s>", IOUtils.toString(expected.getBodyContent(), Charsets.UTF_8), IOUtils.toString(actual.getBodyContent(), Charsets.UTF_8)); } } return this; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaTextExtractorTest.java ---------------------------------------------------------------------- diff --git a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaTextExtractorTest.java b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaTextExtractorTest.java index 7d70444..a75a5ad 100644 --- a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaTextExtractorTest.java +++ b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaTextExtractorTest.java @@ -63,7 +63,7 @@ public class TikaTextExtractorTest { @Test public void textualContentShouldReturnNullWhenInputStreamIsEmpty() throws Exception { - assertThat(textExtractor.extractContent(IOUtils.toInputStream(""), "text/plain").getTextualContent()) + assertThat(textExtractor.extractContent(IOUtils.toInputStream("", Charsets.UTF_8), "text/plain").getTextualContent()) .isNull(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java index 9d6eb84..bbf6a05 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java @@ -35,6 +35,7 @@ import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Charsets; import com.google.common.io.ByteStreams; /** @@ -119,7 +120,7 @@ public class LogMessage extends GenericMailet { private void logBody(MimeMessage message) throws MessagingException, IOException { if (body) { InputStream inputStream = ByteStreams.limit(message.getRawInputStream(), lengthToLog(message)); - logger.info(IOUtils.toString(inputStream)); + logger.info(IOUtils.toString(inputStream, Charsets.UTF_8)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java index e402b3b..7d6fd69 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java @@ -53,6 +53,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; +import com.google.common.base.Charsets; import com.google.common.base.Optional; import com.google.common.collect.FluentIterable; @@ -311,7 +312,7 @@ public class StripAttachmentTest { assertThat(saved).hasSize(1); assertThat(saved).containsKey(expectedKey); MimeBodyPart savedBodyPart = new MimeBodyPart(new ByteArrayInputStream(saved.get(expectedKey))); - String content = IOUtils.toString(savedBodyPart.getInputStream()); + String content = IOUtils.toString(savedBodyPart.getInputStream(), Charsets.UTF_8); assertThat(content).isEqualTo(EXPECTED_ATTACHMENT_CONTENT); } @@ -347,7 +348,7 @@ public class StripAttachmentTest { assertThat(saved).hasSize(1); assertThat(saved).containsKey(expectedKey); MimeBodyPart savedBodyPart = new MimeBodyPart(new ByteArrayInputStream(saved.get(expectedKey))); - String content = IOUtils.toString(savedBodyPart.getInputStream()); + String content = IOUtils.toString(savedBodyPart.getInputStream(), Charsets.UTF_8); assertThat(content).isEqualTo(EXPECTED_ATTACHMENT_CONTENT); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java b/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java index e89f379..b2bd786 100644 --- a/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java +++ b/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java @@ -19,7 +19,7 @@ package org.apache.james.protocols.api; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.io.InputStream; import java.io.UnsupportedEncodingException; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java index e672453..0512cdd 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java @@ -23,13 +23,12 @@ import static org.junit.Assert.assertEquals; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import junit.framework.Assert; - import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.message.IdRange; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.protocols.imap.DecodingException; +import org.junit.Assert; import org.junit.Test; public class IdRangeParseTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java index dd868f4..3993c54 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java @@ -30,16 +30,12 @@ import org.apache.james.imap.api.message.IdRange; import org.apache.james.imap.api.process.ImapSession; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; -import org.apache.james.imap.decode.parser.FetchCommandParser; import org.apache.james.protocols.imap.DecodingException; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; +import org.junit.Before; +import org.junit.Test; -@RunWith(JMock.class) public class FetchCommandParserPartialFetchTest { Mockery context = new JUnit4Mockery(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java index a5cdbe2..9d08096 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java @@ -39,13 +39,10 @@ import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.mailbox.MessageUid; import org.apache.james.protocols.imap.DecodingException; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class SearchCommandParserAndParenthesesTest { private Mockery context = new JUnit4Mockery(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java index e55e9d6..1d03795 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java @@ -37,13 +37,10 @@ import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class SearchCommandParserCharsetTest { private static final Charset UTF8 = Charset.forName("UTF-8"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java index 891dc71..44fa027 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java @@ -36,13 +36,10 @@ import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.mailbox.MessageUid; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class SearchCommandParserNotTest { SearchCommandParser parser; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java index b7eeb03..f87c5ad 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java @@ -35,13 +35,10 @@ import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.mailbox.MessageUid; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class SearchCommandParserOrTest { SearchCommandParser parser; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java index 97e84b2..503f313 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java @@ -39,13 +39,10 @@ import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.protocols.imap.DecodingException; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class SearchCommandParserQuotedCharsetTest { private static final Charset UTF8 = Charset.forName("UTF-8"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java index 44a4d1f..095b718 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java @@ -19,7 +19,7 @@ package org.apache.james.imap.decode.parser; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -34,13 +34,10 @@ import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.mailbox.MessageUid; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class SearchCommandParserSearchKeySequenceSetTest { SearchCommandParser parser; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java index 8536640..f7513f2 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java @@ -19,7 +19,8 @@ package org.apache.james.imap.decode.parser; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -35,13 +36,10 @@ import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.mailbox.MessageUid; import org.apache.james.protocols.imap.DecodingException; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class SearchCommandParserSearchKeyTest { private static final DayMonthYear DATE = new DayMonthYear(1, 1, 2000); http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java index f789f2a..febe499 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java @@ -39,13 +39,10 @@ import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.mailbox.MessageUid; import org.apache.james.protocols.imap.DecodingException; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class SearchCommandParserTopLevelAndTest { Input[] one = { sequence() }; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java index 75444d0..e308250 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java @@ -31,13 +31,10 @@ import org.apache.james.imap.api.process.ImapSession; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class StoreCommandParserTest { StoreCommandParser parser; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java index 5ee2bd6..becc340 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java @@ -19,7 +19,7 @@ package org.apache.james.imap.encode; -import junit.framework.Assert; +import static org.junit.Assert.assertEquals; import org.apache.james.imap.encode.base.ByteImapResponseWriter; import org.apache.james.imap.encode.base.ImapResponseComposerImpl; @@ -27,13 +27,11 @@ import org.apache.james.imap.message.response.FetchResponse; import org.apache.james.imap.message.response.FetchResponse.Envelope.Address; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) + public class FetchResponseEncoderEnvelopeTest { private static final String ADDRESS_ONE_HOST = "HOST"; @@ -154,7 +152,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString()); } @Test @@ -164,7 +162,7 @@ public class FetchResponseEncoderEnvelopeTest { encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (\"a date\" NIL NIL NIL NIL NIL NIL NIL NIL NIL))\r\n",writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (\"a date\" NIL NIL NIL NIL NIL NIL NIL NIL NIL))\r\n",writer.getString()); } @@ -174,7 +172,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL \"some subject\" NIL NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL \"some subject\" NIL NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString()); } @@ -184,7 +182,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL NIL \"some reply to\" NIL))\r\n", writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL NIL \"some reply to\" NIL))\r\n", writer.getString()); } @Test @@ -193,7 +191,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL NIL NIL \"some message id\"))\r\n", writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL NIL NIL \"some message id\"))\r\n", writer.getString()); } @@ -202,7 +200,7 @@ public class FetchResponseEncoderEnvelopeTest { from = mockOneAddress(); envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString()); } @@ -212,7 +210,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString()); } @@ -222,7 +220,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL NIL NIL))\r\n", writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL NIL NIL))\r\n", writer.getString()); } @@ -232,7 +230,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL NIL NIL))\r\n", writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL NIL NIL))\r\n", writer.getString()); } @@ -243,7 +241,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL NIL))\r\n", writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL NIL))\r\n", writer.getString()); } @@ -253,7 +251,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL NIL))\r\n", writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL NIL))\r\n", writer.getString()); } @@ -263,7 +261,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL))\r\n",writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL))\r\n",writer.getString()); } @@ -273,7 +271,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL))\r\n",writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL))\r\n",writer.getString()); } @@ -283,7 +281,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL))\r\n",writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL))\r\n",writer.getString()); } @@ -293,7 +291,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL))\r\n",writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL))\r\n",writer.getString()); } @@ -303,7 +301,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL))\r\n",writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL))\r\n",writer.getString()); } @@ -313,7 +311,7 @@ public class FetchResponseEncoderEnvelopeTest { envelopExpects(); encoder.doEncode(message, composer, new FakeImapSession()); - Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL))\r\n",writer.getString()); + assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL))\r\n",writer.getString()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java index 76b0ef9..928f4e6 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java @@ -37,13 +37,10 @@ import org.apache.james.imap.message.response.FetchResponse; import org.apache.james.mailbox.MessageUid; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class FetchResponseEncoderNoExtensionsTest { private ByteImapResponseWriter writer = new ByteImapResponseWriter(); private ImapResponseComposer composer = new ImapResponseComposerImpl(writer); http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java index 185d9fb..9f1470c 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java @@ -19,25 +19,22 @@ package org.apache.james.imap.encode; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import javax.mail.Flags; -import static org.junit.Assert.*; import org.apache.james.imap.api.ImapMessage; -import org.apache.james.imap.encode.FetchResponseEncoder; -import org.apache.james.imap.encode.ImapEncoder; -import org.apache.james.imap.encode.ImapResponseComposer; import org.apache.james.imap.encode.base.ByteImapResponseWriter; import org.apache.james.imap.encode.base.ImapResponseComposerImpl; import org.apache.james.imap.message.response.FetchResponse; import org.apache.james.mailbox.MessageUid; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class FetchResponseEncoderTest { private ByteImapResponseWriter writer = new ByteImapResponseWriter(); private ImapResponseComposer composer = new ImapResponseComposerImpl(writer); http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java index 5549275..23836f1 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java @@ -29,13 +29,10 @@ import org.apache.james.imap.encode.base.ImapResponseComposerImpl; import org.apache.james.imap.message.response.LSubResponse; import org.apache.james.imap.message.response.ListResponse; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class LSubResponseEncoderTest { LSubResponseEncoder encoder; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java index b5cb181..8c26450 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java @@ -19,23 +19,19 @@ package org.apache.james.imap.encode; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.apache.james.imap.api.ImapMessage; -import org.apache.james.imap.encode.ImapEncoder; -import org.apache.james.imap.encode.ImapResponseComposer; -import org.apache.james.imap.encode.SearchResponseEncoder; import org.apache.james.imap.encode.base.ByteImapResponseWriter; import org.apache.james.imap.encode.base.ImapResponseComposerImpl; import org.apache.james.imap.message.response.SearchResponse; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class ListResponseEncoderTest { private static final long[] IDS = { 1, 4, 9, 16 }; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java index f4ea9f4..bb5b187 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java @@ -24,11 +24,10 @@ import java.util.List; import org.apache.james.imap.encode.base.ByteImapResponseWriter; import org.apache.james.imap.encode.base.ImapResponseComposerImpl; import org.apache.james.imap.message.response.ListResponse; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import junit.framework.Assert; - public class ListingEncodingUtilsTest { final String nameParameter = "LIST"; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java index d5e4e72..bf57192 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java @@ -19,24 +19,20 @@ package org.apache.james.imap.encode; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.apache.james.imap.api.ImapMessage; -import org.apache.james.imap.encode.ImapEncoder; -import org.apache.james.imap.encode.ImapResponseComposer; -import org.apache.james.imap.encode.MailboxStatusResponseEncoder; import org.apache.james.imap.encode.base.ByteImapResponseWriter; import org.apache.james.imap.encode.base.ImapResponseComposerImpl; import org.apache.james.imap.message.response.MailboxStatusResponse; import org.apache.james.mailbox.MessageUid; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class MailboxStatusResponseEncoderTest { MailboxStatusResponseEncoder encoder; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java index a01dc53..86ac430 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java @@ -31,13 +31,10 @@ import org.apache.james.imap.message.response.NamespaceResponse; import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.Sequence; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class NamespaceResponseEncoderTest { ImapSession dummySession; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java index 87ef05c..1b2bb80 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java @@ -19,24 +19,20 @@ package org.apache.james.imap.encode; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.apache.james.imap.api.ImapMessage; -import org.apache.james.imap.encode.ImapEncoder; -import org.apache.james.imap.encode.ImapResponseComposer; -import org.apache.james.imap.encode.ListResponseEncoder; import org.apache.james.imap.encode.base.ByteImapResponseWriter; import org.apache.james.imap.encode.base.ImapResponseComposerImpl; import org.apache.james.imap.message.response.LSubResponse; import org.apache.james.imap.message.response.ListResponse; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class SearchResponseEncoderTest { private ListResponseEncoder encoder; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java b/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java index 6e52994..5943572 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.imap.main; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -30,13 +30,10 @@ import org.apache.james.imap.decode.main.ImapRequestStreamHandler; import org.apache.james.imap.encode.ImapEncoder; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class ImapRequestHandlerAdandonConnectionTest { /** System under test */ http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java index fa4b892..5a7519d 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java @@ -47,18 +47,15 @@ import org.apache.james.mailbox.model.SimpleMailboxACL.SimpleMailboxACLEntryKey; import org.apache.james.metrics.api.NoopMetricFactory; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; /** * DeleteACLProcessor Test. * * @author Peter Palaga */ -@RunWith(JMock.class) public class DeleteACLProcessorTest { private static final String MAILBOX_NAME = ImapConstants.INBOX_NAME; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java index 840b632..ad9417d 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java @@ -45,17 +45,14 @@ import org.apache.james.mailbox.model.SimpleMailboxACL.Rfc4314Rights; import org.apache.james.metrics.api.NoopMetricFactory; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; /** * GetACLProcessor Test. * */ -@RunWith(JMock.class) public class GetACLProcessorTest { private static final String MAILBOX_NAME = ImapConstants.INBOX_NAME; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java index 67d1a77..f46f009 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java @@ -40,13 +40,10 @@ import org.apache.james.mailbox.model.MailboxMetaData; import org.apache.james.metrics.api.NoopMetricFactory; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class LSubProcessorTest { private static final String ROOT = "ROOT"; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java index 3e956c1..2d48f28 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java @@ -32,13 +32,10 @@ import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.metrics.api.NoopMetricFactory; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class ListProcessorTest { ListProcessor processor; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java index cb425d5..cf8e8de 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java @@ -48,18 +48,15 @@ import org.apache.james.mailbox.model.SimpleMailboxACL.SimpleMailboxACLEntryKey; import org.apache.james.metrics.api.NoopMetricFactory; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; /** * ListRightsProcessor Test. * * @author Peter Palaga */ -@RunWith(JMock.class) public class ListRightsProcessorTest { private static final String MAILBOX_NAME = ImapConstants.INBOX_NAME; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java index da1bc78..998102e 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java @@ -41,13 +41,10 @@ import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.metrics.api.NoopMetricFactory; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class NamespaceProcessorTest { private static final String SHARED_PREFIX = "SharedPrefix"; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java index 5a63525..07bf600 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java @@ -58,15 +58,12 @@ import org.apache.james.mailbox.model.SearchQuery.DateResolution; import org.apache.james.metrics.api.NoopMetricFactory; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import com.google.common.base.Optional; -@RunWith(JMock.class) public class SearchProcessorTest { private static final int DAY = 6; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java index 767708d..1f687f8 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java @@ -48,18 +48,15 @@ import org.apache.james.mailbox.model.SimpleMailboxACL.SimpleMailboxACLEntryKey; import org.apache.james.metrics.api.NoopMetricFactory; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; /** * SetACLProcessor Test. * * @author Peter Palaga */ -@RunWith(JMock.class) public class SetACLProcessorTest { private static final String MAILBOX_NAME = ImapConstants.INBOX_NAME; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java index 1dfaf54..f0b3a0d 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java @@ -19,19 +19,15 @@ package org.apache.james.imap.processor.fetch; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.apache.james.imap.message.response.FetchResponse.BodyElement; -import org.apache.james.imap.processor.fetch.PartialFetchBodyElement; import org.jmock.Expectations; import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(JMock.class) public class PartialFetchBodyElementTest { private static final long NUMBER_OF_OCTETS = 100; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/pom.xml b/protocols/pom.xml index 8b90a14..7110834 100644 --- a/protocols/pom.xml +++ b/protocols/pom.xml @@ -48,6 +48,62 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox-api</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox-store</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-jsieve-core</artifactId> + <version>${jsieve.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-mime4j-core</artifactId> + <version>${apache-mime4j.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-mime4j-dom</artifactId> + <version>${apache-mime4j.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-data-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-util</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-util-java8</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>metrics-api</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/POP3StartTlsResponseTest.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/POP3StartTlsResponseTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/POP3StartTlsResponseTest.java index bcdfa36..8fda248 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/POP3StartTlsResponseTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/POP3StartTlsResponseTest.java @@ -19,11 +19,11 @@ package org.apache.james.protocols.pop3; +import static org.junit.Assert.assertTrue; + import org.apache.james.protocols.api.StartTlsResponse; import org.junit.Test; -import static junit.framework.Assert.*; - public class POP3StartTlsResponseTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPStartTlsResponseTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPStartTlsResponseTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPStartTlsResponseTest.java index ccdd7e3..332d48d 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPStartTlsResponseTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPStartTlsResponseTest.java @@ -19,11 +19,11 @@ package org.apache.james.protocols.smtp; +import static org.junit.Assert.assertTrue; + import org.apache.james.protocols.api.StartTlsResponse; import org.junit.Test; -import static junit.framework.Assert.*; - public class SMTPStartTlsResponseTest { /** http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java index 25ddd96..fb798e4 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java @@ -20,9 +20,9 @@ package org.apache.james.protocols.smtp.core.fastfail; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import java.net.InetSocketAddress; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java index 3808835..345cf09 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java @@ -17,12 +17,9 @@ * under the License. * ****************************************************************/ - - - package org.apache.james.protocols.smtp.core.fastfail; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.util.HashMap; import java.util.Map; @@ -34,8 +31,6 @@ import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession; import org.junit.Test; - - public class MaxRcptHandlerTest { private SMTPSession setupMockedSession(final int rcptCount) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java index 0df0aeb..70606f9 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java @@ -20,7 +20,7 @@ package org.apache.james.protocols.smtp.core.fastfail; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java index 782ce18..ec7ea8a 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java @@ -17,13 +17,11 @@ * under the License. * ****************************************************************/ - - package org.apache.james.protocols.smtp.core.fastfail; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import java.net.InetAddress; import java.net.UnknownHostException; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java index d339a98..c12df5a 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java @@ -20,8 +20,8 @@ package org.apache.james.protocols.smtp.core.fastfail; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.net.InetSocketAddress; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java index 436528b..9dee55c 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java @@ -19,7 +19,7 @@ package org.apache.james.protocols.smtp.core.fastfail; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java index 9ab258b..b20d4a2 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java @@ -30,8 +30,6 @@ import java.util.concurrent.Future; import javax.inject.Inject; -import com.google.common.base.CharMatcher; -import org.apache.http.Header; import org.apache.http.HttpResponse; import org.apache.http.client.fluent.Async; import org.apache.http.client.fluent.Content; @@ -43,9 +41,11 @@ import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.util.CountDownConsumeInputStream; import org.apache.james.util.ZeroedInputStream; +import com.google.common.base.CharMatcher; import com.google.common.base.Charsets; import com.jayway.jsonpath.DocumentContext; import com.jayway.jsonpath.JsonPath; + import cucumber.api.java.en.Given; import cucumber.api.java.en.Then; import cucumber.api.java.en.When; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
