This is an automated email from the ASF dual-hosted git repository.
matthieu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit eb7430c9efd244161d79d042370d44ff5aa3eb3e
Author: Matthieu Baechler <matth...@apache.org>
AuthorDate: Thu Nov 7 22:40:14 2019 +0100
[Refactoring] move createMimeMessage to SetMimeHeaderHandlerTest
---
.../james/smtpserver/SetMimeHeaderHandlerTest.java | 15 +++++++-
.../java/org/apache/james/smtpserver/Util.java | 42 ----------------------
2 files changed, 14 insertions(+), 43 deletions(-)
diff --git
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
index 2315524..3681970 100644
---
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
+++
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
@@ -25,6 +25,7 @@ import java.util.concurrent.ThreadLocalRandom;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
+import org.apache.james.core.builder.MimeMessageBuilder;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
import org.apache.james.server.core.MailImpl;
@@ -57,7 +58,7 @@ public class SetMimeHeaderHandlerTest {
}
private void setupMockedMimeMessage() throws MessagingException {
- mockedMimeMessage = Util.createMimeMessage(headerName, headerValue);
+ mockedMimeMessage = createMimeMessage(headerName, headerValue);
}
private void setupMockedSMTPSession() {
@@ -114,4 +115,16 @@ public class SetMimeHeaderHandlerTest {
assertThat(mail.getMessage().getHeader(HEADER_NAME)[0]).isEqualTo(HEADER_VALUE);
}
+ private static MimeMessage createMimeMessage(String headerName, String
headerValue) throws MessagingException {
+ String sender = "t...@james.apache.org";
+ String rcpt = "te...@james.apache.org";
+ return MimeMessageBuilder.mimeMessageBuilder()
+ .addHeader(headerName, headerValue)
+ .setSubject("testmail")
+ .setText("testtext")
+ .addToRecipient(rcpt)
+ .addFrom(sender)
+ .build();
+ }
+
}
diff --git
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java
deleted file mode 100644
index 5413c8b..0000000
---
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-package org.apache.james.smtpserver;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-
-import org.apache.james.core.builder.MimeMessageBuilder;
-
-/**
- * some utilities for James unit testing
- */
-public class Util {
-
- public static MimeMessage createMimeMessage(String headerName, String
headerValue) throws MessagingException {
- String sender = "t...@james.apache.org";
- String rcpt = "te...@james.apache.org";
- return MimeMessageBuilder.mimeMessageBuilder()
- .addHeader(headerName, headerValue)
- .setSubject("testmail")
- .setText("testtext")
- .addToRecipient(rcpt)
- .addFrom(sender)
- .build();
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
