You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2017/01/12 16:33:00 UTC
[3/3] james-project git commit: MAILET-145: Make NESSpamCheck readable
MAILET-145: Make NESSpamCheck readable
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/35858f70
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/35858f70
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/35858f70
Branch: refs/heads/master
Commit: 35858f70d2b98942eec7018b2f4c1fa0b6fa2bee
Parents: 883edef
Author: Benoit Tellier <bt...@linagora.com>
Authored: Wed Dec 28 15:55:05 2016 +0700
Committer: Quynh Nguyen <qn...@linagora.com>
Committed: Thu Jan 12 11:09:26 2017 +0700
----------------------------------------------------------------------
.../transport/matchers/NESSpamCheckTest.java | 62 +++++---------------
1 file changed, 14 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/35858f70/mailet/standard/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java
index adf387c..da0be46 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java
@@ -17,80 +17,46 @@
* under the License. *
****************************************************************/
-
package org.apache.james.transport.matchers;
-import java.util.Collection;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.Matcher;
+import org.apache.mailet.Mail;
import org.apache.mailet.base.RFC2822Headers;
-import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMatcherConfig;
import org.apache.mailet.base.test.MailUtil;
-import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
public class NESSpamCheckTest {
- private MimeMessage mockedMimeMessage;
-
- private FakeMail mockedMail;
-
- private Matcher matcher;
-
- private String headerName = "defaultHeaderName";
-
- private String headerValue = "defaultHeaderValue";
-
- private void setHeaderName(String headerName) {
- this.headerName = headerName;
- }
-
- private void setHeaderValue(String headerValue) {
- this.headerValue = headerValue;
- }
-
- private void setupMockedMimeMessage() throws MessagingException {
- mockedMimeMessage = MailUtil.createMimeMessage(headerName, headerValue);
- }
+ private NESSpamCheck matcher;
- private void setupMatcher() throws MessagingException {
- setupMockedMimeMessage();
+ @Before
+ public void setUp() throws Exception {
matcher = new NESSpamCheck();
FakeMatcherConfig mci = FakeMatcherConfig.builder()
- .matcherName("NESSpamCheck")
- .build();
+ .matcherName("NESSpamCheck")
+ .build();
matcher.init(mci);
}
@Test
public void testNESSpamCheckMatched() throws MessagingException {
- setHeaderName(RFC2822Headers.RECEIVED);
- setHeaderValue("xxxxxxxxxxxxxxxxxxxxx");
+ Mail mail = MailUtil.createMockMail2Recipients(
+ MailUtil.createMimeMessage(RFC2822Headers.RECEIVED, "xxxxxxxxxxxxxxxxxxxxx"));
- setupMockedMimeMessage();
- mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
- setupMatcher();
-
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
-
- Assert.assertNotNull(matchedRecipients);
- Assert.assertEquals(matchedRecipients.size(), mockedMail.getRecipients().size());
+ assertThat(matcher.match(mail)).hasSize(2);
}
@Test
public void testNESSpamCheckNotMatched() throws MessagingException {
- setupMockedMimeMessage();
- mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
- setupMatcher();
-
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
+ Mail mail = MailUtil.createMockMail2Recipients(
+ MailUtil.createMimeMessage("defaultHeaderName", "defaultHeaderValue"));
- Assert.assertNull(matchedRecipients);
+ assertThat(matcher.match(mail)).isNull();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org