JAMES-2529 Correct MailetPreconditionTest for BCC_CHECK
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a8a8a905 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a8a8a905 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a8a8a905 Branch: refs/heads/master Commit: a8a8a905a63423ae48f48c1a15e5501ca874c4ba Parents: 8382d61 Author: Benoit Tellier <btell...@linagora.com> Authored: Wed Aug 29 12:23:48 2018 +0700 Committer: Antoine Duprat <adup...@linagora.com> Committed: Thu Aug 30 15:11:55 2018 +0200 ---------------------------------------------------------------------- .../james/jmap/MailetPreconditionTest.java | 32 +++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a8a8a905/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/MailetPreconditionTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/MailetPreconditionTest.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/MailetPreconditionTest.java index 72d74f2..04832d6 100644 --- a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/MailetPreconditionTest.java +++ b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/MailetPreconditionTest.java @@ -20,7 +20,6 @@ package org.apache.james.jmap; import java.util.List; -import java.util.Properties; import org.apache.commons.configuration.ConfigurationException; import org.apache.james.jmap.mailet.VacationMailet; @@ -39,7 +38,6 @@ import com.google.common.collect.Lists; public class MailetPreconditionTest { private static final MailetContext MAILET_CONTEXT = null; - private static final String WRONG_NAME = "wrong"; private static final String BCC = "bcc"; @Test(expected = ConfigurationException.class) @@ -83,40 +81,38 @@ public class MailetPreconditionTest { @Test(expected = ConfigurationException.class) public void bccMailetCheckShouldThrowOnWrongMatcher() throws Exception { List<MatcherMailetPair> pairs = Lists.newArrayList(new MatcherMailetPair(new RecipientIsLocal(), new RemoveMimeHeader())); - JMAPModule.VACATION_MAILET_CHECK.check(pairs); + CamelMailetContainerModule.BCC_Check.check(pairs); } @Test(expected = ConfigurationException.class) public void bccMailetCheckShouldThrowOnWrongMailet() throws Exception { List<MatcherMailetPair> pairs = Lists.newArrayList(new MatcherMailetPair(new All(), new Null())); - JMAPModule.VACATION_MAILET_CHECK.check(pairs); + CamelMailetContainerModule.BCC_Check.check(pairs); } @Test(expected = ConfigurationException.class) - public void bccMailetCheckShouldThrowOnWrongMailetName() throws Exception { - Properties properties = new Properties(); - properties.setProperty("name", WRONG_NAME); + public void bccMailetCheckShouldThrowOnWrongFieldName() throws Exception { RemoveMimeHeader removeMimeHeader = new RemoveMimeHeader(); removeMimeHeader.init(FakeMailetConfig.builder() - .mailetName(WRONG_NAME) - .mailetContext(MAILET_CONTEXT) - .setProperty("name", WRONG_NAME) - .build()); + .mailetName(BCC) + .mailetContext(MAILET_CONTEXT) + .setProperty("name", "bad") + .build()); List<MatcherMailetPair> pairs = Lists.newArrayList(new MatcherMailetPair(new All(), removeMimeHeader)); - JMAPModule.VACATION_MAILET_CHECK.check(pairs); + CamelMailetContainerModule.BCC_Check.check(pairs); } - @Test(expected = ConfigurationException.class) + @Test public void bccMailetCheckShouldNotThrowOnValidPair() throws Exception { RemoveMimeHeader removeMimeHeader = new RemoveMimeHeader(); removeMimeHeader.init(FakeMailetConfig.builder() - .mailetName(BCC) - .mailetContext(MAILET_CONTEXT) - .setProperty("name", BCC) - .build()); + .mailetName(BCC) + .mailetContext(MAILET_CONTEXT) + .setProperty("name", BCC) + .build()); List<MatcherMailetPair> pairs = Lists.newArrayList(new MatcherMailetPair(new All(), removeMimeHeader)); - JMAPModule.VACATION_MAILET_CHECK.check(pairs); + CamelMailetContainerModule.BCC_Check.check(pairs); } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
