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 ma...@apache.org on 2016/08/30 14:56:53 UTC
[1/5] james-project git commit: MAILET-111 correct space in FakeMail
builder
Repository: james-project
Updated Branches:
refs/heads/master 3f528b84d -> 094d62776
MAILET-111 correct space in FakeMail builder
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4d97b061
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4d97b061
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4d97b061
Branch: refs/heads/master
Commit: 4d97b0617087a8bd8a61ea05e566b6b34c7d7139
Parents: 3776137
Author: Benoit Tellier <bt...@linagora.com>
Authored: Tue Aug 30 11:44:30 2016 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Aug 30 11:48:27 2016 +0700
----------------------------------------------------------------------
.../base/src/test/java/org/apache/mailet/base/test/FakeMail.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/4d97b061/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
index c534f32..01740ce 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
@@ -84,7 +84,7 @@ public class FakeMail implements Mail {
public FakeMail build() throws MessagingException {
FakeMail mail = new FakeMail();
- mail.setMessage(new MimeMessage(Session.getInstance(new Properties()) ,ClassLoader.getSystemResourceAsStream(fileName)));
+ mail.setMessage(new MimeMessage(Session.getInstance(new Properties()), ClassLoader.getSystemResourceAsStream(fileName)));
mail.setSender(sender);
mail.setRecipients(recipients);
return mail;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/5] james-project git commit: MAILET-111 Fake mail should accept
mail without MimeMessage
Posted by ma...@apache.org.
MAILET-111 Fake mail should accept mail without MimeMessage
Some mailets / matcher only have actions on Mail object and not on the embedded MimeMessage.
Thus making compulsory to have a MimeMessage makes these tests more complex.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ce007907
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ce007907
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ce007907
Branch: refs/heads/master
Commit: ce00790797cd871f9d5c6c8cb874d97607e28822
Parents: 4d97b06
Author: Benoit Tellier <bt...@linagora.com>
Authored: Tue Aug 30 11:48:09 2016 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Aug 30 11:49:05 2016 +0700
----------------------------------------------------------------------
.../test/java/org/apache/mailet/base/test/FakeMail.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ce007907/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
index 01740ce..1adbf2a 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
@@ -39,6 +39,8 @@ import javax.mail.internet.MimeMessage;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import com.google.common.base.Optional;
+
public class FakeMail implements Mail {
public static FakeMail fromMime(String text, String javaEncodingCharset, String javamailDefaultEncodingCharset) throws MessagingException, UnsupportedEncodingException {
@@ -58,12 +60,12 @@ public class FakeMail implements Mail {
public static class Builder {
- private String fileName;
+ private Optional<String> fileName = Optional.absent();
private List<MailAddress> recipients = new ArrayList<MailAddress>();
private MailAddress sender;
public Builder fileName(String fileName) {
- this.fileName = fileName;
+ this.fileName = Optional.of(fileName);
return this;
}
@@ -84,7 +86,9 @@ public class FakeMail implements Mail {
public FakeMail build() throws MessagingException {
FakeMail mail = new FakeMail();
- mail.setMessage(new MimeMessage(Session.getInstance(new Properties()), ClassLoader.getSystemResourceAsStream(fileName)));
+ if (fileName.isPresent()) {
+ mail.setMessage(new MimeMessage(Session.getInstance(new Properties()), ClassLoader.getSystemResourceAsStream(fileName.get())));
+ }
mail.setSender(sender);
mail.setRecipients(recipients);
return mail;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[5/5] james-project git commit: Merge remote-tracking branch
'benoit/MAILET-111'
Posted by ma...@apache.org.
Merge remote-tracking branch 'benoit/MAILET-111'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/094d6277
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/094d6277
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/094d6277
Branch: refs/heads/master
Commit: 094d62776011a276c4b287cc5714f9a597ff7879
Parents: 3f528b8 caff5d2
Author: Matthieu Baechler <ma...@linagora.com>
Authored: Tue Aug 30 16:55:52 2016 +0200
Committer: Matthieu Baechler <ma...@linagora.com>
Committed: Tue Aug 30 16:55:52 2016 +0200
----------------------------------------------------------------------
.../org/apache/mailet/base/test/FakeMail.java | 16 +++++++++++++---
.../james/transport/matchers/AllTest.java | 20 ++++++++++----------
2 files changed, 23 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/094d6277/mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java
----------------------------------------------------------------------
diff --cc mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java
index 98552b2,e59f69f..ecf4b61
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java
@@@ -44,19 -43,20 +43,20 @@@ public class AllTest
public void setupMatcher() throws MessagingException {
matcher = new All();
FakeMatcherConfig mci = new FakeMatcherConfig("All",
- new FakeMailContext());
+ FakeMailContext.defaultContext());
matcher.init(mci);
+
+ mailAddress1 = new MailAddress("me@apache.org");
+ mailAddress2 = new MailAddress("you@apache.org");
}
- // test if all recipients was returned
@Test
public void testAllRecipientsReturned() throws MessagingException {
- FakeMail mockedMail = MailUtil.createMockMail2Recipients(null);
-
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
+ FakeMail mockedMail = FakeMail.builder()
+ .recipients(mailAddress1, mailAddress2)
+ .build();
- assertNotNull(matchedRecipients);
- assertEquals(matchedRecipients.size(), mockedMail.getRecipients().size());
+ assertThat(matcher.match(mockedMail)).containsExactly(mailAddress1, mailAddress2);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/5] james-project git commit: MAILET-111 FakeMail builder should
make it easy to have multiple recipients
Posted by ma...@apache.org.
MAILET-111 FakeMail builder should make it easy to have multiple recipients
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ebb4b303
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ebb4b303
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ebb4b303
Branch: refs/heads/master
Commit: ebb4b303d91818249978813d6ef7f496aff79e30
Parents: ce00790
Author: Benoit Tellier <bt...@linagora.com>
Authored: Tue Aug 30 11:51:07 2016 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Aug 30 11:51:07 2016 +0700
----------------------------------------------------------------------
.../src/test/java/org/apache/mailet/base/test/FakeMail.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ebb4b303/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
index 1adbf2a..31f0ebb 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
@@ -40,6 +40,7 @@ import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
public class FakeMail implements Mail {
@@ -74,6 +75,11 @@ public class FakeMail implements Mail {
return this;
}
+ public Builder recipients(MailAddress... recipients) {
+ this.recipients.addAll(ImmutableList.copyOf(recipients));
+ return this;
+ }
+
public Builder recipient(MailAddress recipient) {
this.recipients.add(recipient);
return this;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/5] james-project git commit: MAILET-111 AllTest should use assertj
Posted by ma...@apache.org.
MAILET-111 AllTest should use assertj
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/caff5d2d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/caff5d2d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/caff5d2d
Branch: refs/heads/master
Commit: caff5d2d506cba5eedd05cbdf86e9e495fdd3cc5
Parents: ebb4b30
Author: Benoit Tellier <bt...@linagora.com>
Authored: Tue Aug 30 11:51:34 2016 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Aug 30 11:51:34 2016 +0700
----------------------------------------------------------------------
.../james/transport/matchers/AllTest.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/caff5d2d/mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java
index e019357..e59f69f 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java
@@ -20,10 +20,7 @@
package org.apache.james.transport.matchers;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Collection;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.MessagingException;
@@ -39,6 +36,8 @@ import org.junit.Test;
public class AllTest {
private Matcher matcher;
+ private MailAddress mailAddress1;
+ private MailAddress mailAddress2;
@Before
public void setupMatcher() throws MessagingException {
@@ -46,17 +45,18 @@ public class AllTest {
FakeMatcherConfig mci = new FakeMatcherConfig("All",
new FakeMailContext());
matcher.init(mci);
+
+ mailAddress1 = new MailAddress("me@apache.org");
+ mailAddress2 = new MailAddress("you@apache.org");
}
- // test if all recipients was returned
@Test
public void testAllRecipientsReturned() throws MessagingException {
- FakeMail mockedMail = MailUtil.createMockMail2Recipients(null);
-
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
+ FakeMail mockedMail = FakeMail.builder()
+ .recipients(mailAddress1, mailAddress2)
+ .build();
- assertNotNull(matchedRecipients);
- assertEquals(matchedRecipients.size(), mockedMail.getRecipients().size());
+ assertThat(matcher.match(mockedMail)).containsExactly(mailAddress1, mailAddress2);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org