JAMES-2529 Apply basic refactoring to multi-rule testing
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/59b0e8b0 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/59b0e8b0 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/59b0e8b0 Branch: refs/heads/master Commit: 59b0e8b0e086dce4ce4999dd9593c22599c4ebd8 Parents: 9a2e06d Author: Benoit Tellier <[email protected]> Authored: Thu Aug 30 09:38:05 2018 +0700 Committer: Antoine Duprat <[email protected]> Committed: Thu Aug 30 15:07:01 2018 +0200 ---------------------------------------------------------------------- .../jmap/mailet/filter/JMAPFilteringTest.java | 91 ++++++++------------ 1 file changed, 37 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/59b0e8b0/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java index 0d697f8..57bec4a 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/filter/JMAPFilteringTest.java @@ -202,7 +202,7 @@ class JMAPFilteringTest { return StreamUtils.flatten( Stream.of(FROM, TO, CC) .flatMap(headerField -> Stream.of( - argumentBuilder(headerField) + argumentBuilder(headerField) .description("full address value") .headerForField(USER_1_FULL_ADDRESS) .valueToMatch(USER_1_USERNAME), @@ -614,36 +614,30 @@ class JMAPFilteringTest { MailboxId mailbox2Id = testSystem.createMailbox(mailboxManager, RECIPIENT_1_USERNAME, "RECIPIENT_1_MAILBOX_2"); MailboxId mailbox3Id = testSystem.createMailbox(mailboxManager, RECIPIENT_1_USERNAME, "RECIPIENT_1_MAILBOX_3"); - testSystem.defineRulesForRecipient1(); testSystem.getFilteringManagement().defineRulesForUser(User.fromUsername(RECIPIENT_1_USERNAME), - ImmutableList.of( - Rule.builder() - .id(Rule.Id.of("1")) - .name("rule 1") - .condition(Rule.Condition.of(SUBJECT, CONTAINS, UNSCRAMBLED_SUBJECT)) - .action(Rule.Action.of(Rule.Action.AppendInMailboxes.withMailboxIds(mailbox1Id.serialize()))) - .build(), - Rule.builder() - .id(Rule.Id.of("2")) - .name("rule 2") - .condition(Rule.Condition.of(FROM, NOT_CONTAINS, USER_1_USERNAME)) - .action(Rule.Action.of(Rule.Action.AppendInMailboxes.withMailboxIds(mailbox2Id.serialize()))) - .build(), - Rule.builder() - .id(Rule.Id.of("3")) - .name("rule 3") - .condition(Rule.Condition.of(TO, EXACTLY_EQUALS, USER_3_ADDRESS)) - .action(Rule.Action.of(Rule.Action.AppendInMailboxes.withMailboxIds(mailbox3Id.serialize()))) - .build())); - - FakeMail mail = FakeMail.builder() - .sender(USER_1_ADDRESS) - .recipients(RECIPIENT_1) - .mimeMessage(mimeMessageBuilder() + Rule.builder() + .id(Rule.Id.of("1")) + .name("rule 1") + .condition(Rule.Condition.of(SUBJECT, CONTAINS, UNSCRAMBLED_SUBJECT)) + .action(Rule.Action.of(Rule.Action.AppendInMailboxes.withMailboxIds(mailbox1Id.serialize()))) + .build(), + Rule.builder() + .id(Rule.Id.of("2")) + .name("rule 2") + .condition(Rule.Condition.of(FROM, NOT_CONTAINS, USER_1_USERNAME)) + .action(Rule.Action.of(Rule.Action.AppendInMailboxes.withMailboxIds(mailbox2Id.serialize()))) + .build(), + Rule.builder() + .id(Rule.Id.of("3")) + .name("rule 3") + .condition(Rule.Condition.of(TO, EXACTLY_EQUALS, USER_3_ADDRESS)) + .action(Rule.Action.of(Rule.Action.AppendInMailboxes.withMailboxIds(mailbox3Id.serialize()))) + .build()); + + FakeMail mail = testSystem.asMail(mimeMessageBuilder() .addFrom(USER_2_ADDRESS) .addToRecipient(USER_3_ADDRESS) - .setSubject(UNSCRAMBLED_SUBJECT)) - .build(); + .setSubject(UNSCRAMBLED_SUBJECT)); testSystem.getJmapFiltering().service(mail); @@ -659,23 +653,18 @@ class JMAPFilteringTest { MailboxId mailbox3Id = testSystem.createMailbox(mailboxManager, RECIPIENT_1_USERNAME, "RECIPIENT_1_MAILBOX_3"); testSystem.getFilteringManagement().defineRulesForUser(User.fromUsername(RECIPIENT_1_USERNAME), - ImmutableList.of( - Rule.builder() - .id(Rule.Id.of("1")) - .name("rule 1") - .condition(Rule.Condition.of(SUBJECT, CONTAINS, UNSCRAMBLED_SUBJECT)) - .action(Rule.Action.of(Rule.Action.AppendInMailboxes.withMailboxIds(ImmutableList.of( - mailbox3Id.serialize(), - mailbox2Id.serialize(), - mailbox1Id.serialize())))) - .build())); - - FakeMail mail = FakeMail.builder() - .sender(USER_1_ADDRESS) - .recipients(RECIPIENT_1) - .mimeMessage(mimeMessageBuilder() - .setSubject(UNSCRAMBLED_SUBJECT)) - .build(); + Rule.builder() + .id(Rule.Id.of("1")) + .name("rule 1") + .condition(Rule.Condition.of(SUBJECT, CONTAINS, UNSCRAMBLED_SUBJECT)) + .action(Rule.Action.of(Rule.Action.AppendInMailboxes.withMailboxIds(ImmutableList.of( + mailbox3Id.serialize(), + mailbox2Id.serialize(), + mailbox1Id.serialize())))) + .build()); + + FakeMail mail = testSystem.asMail(mimeMessageBuilder() + .setSubject(UNSCRAMBLED_SUBJECT)); testSystem.getJmapFiltering().service(mail); @@ -695,8 +684,7 @@ class JMAPFilteringTest { Rule.Condition.of(RECIPIENT, EXACTLY_EQUALS, USER_1_FULL_ADDRESS), Rule.Condition.of(RECIPIENT, EXACTLY_EQUALS, USER_1_FULL_ADDRESS), Rule.Condition.of(SUBJECT, CONTAINS, USER_1_FULL_ADDRESS), - Rule.Condition.of(SUBJECT, EXACTLY_EQUALS, USER_1_FULL_ADDRESS) - ); + Rule.Condition.of(SUBJECT, EXACTLY_EQUALS, USER_1_FULL_ADDRESS)); FakeMail mail = testSystem.asMail(mimeMessageBuilder()); testSystem.getJmapFiltering().service(mail); @@ -707,20 +695,15 @@ class JMAPFilteringTest { @Test void mailDirectiveShouldNotBeSetWhenNoneRulesValueIsContained(JMAPFilteringTestSystem testSystem) throws Exception { - testSystem.defineRulesForRecipient1( Rule.Condition.of(FROM, CONTAINS, SHOULD_NOT_MATCH), Rule.Condition.of(TO, CONTAINS, SHOULD_NOT_MATCH), Rule.Condition.of(CC, CONTAINS, SHOULD_NOT_MATCH)); - FakeMail mail = FakeMail.builder() - .sender(USER_1_ADDRESS) - .recipients(RECIPIENT_1) - .mimeMessage(mimeMessageBuilder() + FakeMail mail = testSystem.asMail(mimeMessageBuilder() .addFrom(USER_1_FULL_ADDRESS) .addToRecipient(USER_2_FULL_ADDRESS) - .addCcRecipient(USER_3_FULL_ADDRESS)) - .build(); + .addCcRecipient(USER_3_FULL_ADDRESS)); testSystem.getJmapFiltering().service(mail); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
