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 bt...@apache.org on 2016/08/29 10:39:24 UTC
[1/5] james-project git commit: MAILET-108 Remove unused headers and
other intellij warnings
Repository: james-project
Updated Branches:
refs/heads/master 6d30e8db7 -> 18bca9849
MAILET-108 Remove unused headers and other intellij warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/19444cae
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/19444cae
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/19444cae
Branch: refs/heads/master
Commit: 19444cae6f8fc1cb4bad295945b78671240da93a
Parents: 6d30e8d
Author: Benoit Tellier <bt...@linagora.com>
Authored: Wed Aug 17 12:12:20 2016 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Mon Aug 29 17:38:18 2016 +0700
----------------------------------------------------------------------
.../james/transport/matchers/AllTest.java | 13 +++++++------
.../transport/matchers/FetchedFromTest.java | 12 ++++++------
.../matchers/HasMailAttributeTest.java | 1 -
.../HasMailAttributeWithValueRegexTest.java | 8 ++++----
.../matchers/HasMailAttributeWithValueTest.java | 8 ++++----
.../transport/matchers/HostIsLocalTest.java | 20 ++++++++++----------
.../james/transport/matchers/HostIsTest.java | 10 +++++-----
.../matchers/IsSingleRecipientTest.java | 10 +++++-----
.../transport/matchers/NESSpamCheckTest.java | 10 +++++-----
.../matchers/SMTPAuthSuccessfulTest.java | 1 -
.../matchers/SMTPIsAuthNetworkTest.java | 10 +++++-----
.../transport/matchers/SizeGreaterThanTest.java | 12 ++++++------
12 files changed, 57 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/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 803dccb..e019357 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,21 +20,22 @@
package org.apache.james.transport.matchers;
-import org.apache.james.transport.matchers.All;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Collection;
+
+import javax.mail.MessagingException;
+
import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMatcherConfig;
import org.apache.mailet.base.test.MailUtil;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import org.junit.Before;
import org.junit.Test;
-import javax.mail.MessagingException;
-import java.util.Collection;
-
public class AllTest {
private Matcher matcher;
http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java
index c6589d6..211403a 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java
@@ -20,7 +20,12 @@
package org.apache.james.transport.matchers;
-import org.apache.james.transport.matchers.FetchedFrom;
+import java.util.Collection;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.ParseException;
+
import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
import org.apache.mailet.base.test.FakeMail;
@@ -30,11 +35,6 @@ import org.apache.mailet.base.test.MailUtil;
import org.junit.Assert;
import org.junit.Test;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.ParseException;
-import java.util.Collection;
-
public class FetchedFromTest {
private MimeMessage mockedMimeMessage;
http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java
index ca69915..c5776b6 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java
@@ -20,7 +20,6 @@
package org.apache.james.transport.matchers;
-import org.apache.james.transport.matchers.HasMailAttribute;
import org.apache.mailet.base.GenericMatcher;
public class HasMailAttributeTest extends AbstractHasMailAttributeTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
index 9e3e8ea..d37c08a 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
@@ -20,12 +20,12 @@
package org.apache.james.transport.matchers;
-import org.apache.james.transport.matchers.HasMailAttributeWithValueRegex;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.base.GenericMatcher;
+import java.util.Collection;
import javax.mail.MessagingException;
-import java.util.Collection;
+
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.base.GenericMatcher;
import junit.framework.AssertionFailedError;
http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java
index 9b99617..cc7fabb 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java
@@ -20,12 +20,12 @@
package org.apache.james.transport.matchers;
-import org.apache.james.transport.matchers.HasMailAttributeWithValue;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.base.GenericMatcher;
+import java.util.Collection;
import javax.mail.MessagingException;
-import java.util.Collection;
+
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.base.GenericMatcher;
public class HasMailAttributeWithValueTest extends AbstractHasMailAttributeTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
index b4a363b..78e5cf3 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
@@ -20,7 +20,15 @@
package org.apache.james.transport.matchers;
-import org.apache.james.transport.matchers.HostIsLocal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+
import org.apache.mailet.HostAddress;
import org.apache.mailet.LookupException;
import org.apache.mailet.Mail;
@@ -33,14 +41,6 @@ import org.apache.mailet.base.test.FakeMatcherConfig;
import org.junit.Assert;
import org.junit.Test;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
@SuppressWarnings("deprecation")
public class HostIsLocalTest {
@@ -188,7 +188,7 @@ public class HostIsLocalTest {
"Unimplemented mock service");
}
- public List<String> dnsLookup(String name, RecordType type) throws TemporaryLookupException, LookupException {
+ public List<String> dnsLookup(String name, RecordType type) throws LookupException {
throw new UnsupportedOperationException(
"Unimplemented mock service");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
index 0ceacb1..65715a3 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
@@ -20,7 +20,11 @@
package org.apache.james.transport.matchers;
-import org.apache.james.transport.matchers.HostIs;
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.mail.MessagingException;
+
import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
import org.apache.mailet.base.test.FakeMail;
@@ -29,10 +33,6 @@ import org.apache.mailet.base.test.FakeMatcherConfig;
import org.junit.Assert;
import org.junit.Test;
-import javax.mail.MessagingException;
-import java.util.Arrays;
-import java.util.Collection;
-
public class HostIsTest {
private FakeMail mockedMail;
http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java
index 51de54c..1423fdb 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java
@@ -20,7 +20,11 @@
package org.apache.james.transport.matchers;
-import org.apache.james.transport.matchers.IsSingleRecipient;
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.mail.MessagingException;
+
import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
import org.apache.mailet.base.test.FakeMail;
@@ -29,10 +33,6 @@ import org.apache.mailet.base.test.FakeMatcherConfig;
import org.junit.Assert;
import org.junit.Test;
-import javax.mail.MessagingException;
-import java.util.Arrays;
-import java.util.Collection;
-
public class IsSingleRecipientTest {
private FakeMail mockedMail;
http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/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 c3b1b02..74a04a2 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
@@ -20,7 +20,11 @@
package org.apache.james.transport.matchers;
-import org.apache.james.transport.matchers.NESSpamCheck;
+import java.util.Collection;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+
import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
import org.apache.mailet.base.RFC2822Headers;
@@ -31,10 +35,6 @@ import org.apache.mailet.base.test.MailUtil;
import org.junit.Assert;
import org.junit.Test;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-import java.util.Collection;
-
public class NESSpamCheckTest {
private MimeMessage mockedMimeMessage;
http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java
index ead2e61..83df994 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java
@@ -20,7 +20,6 @@
package org.apache.james.transport.matchers;
-import org.apache.james.transport.matchers.SMTPAuthSuccessful;
import org.apache.mailet.base.GenericMatcher;
public class SMTPAuthSuccessfulTest extends AbstractHasMailAttributeTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java
index 4a30f75..2f2fb66 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java
@@ -20,7 +20,11 @@
package org.apache.james.transport.matchers;
-import org.apache.james.transport.matchers.SMTPIsAuthNetwork;
+import java.util.Collection;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.ParseException;
+
import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
import org.apache.mailet.base.test.FakeMail;
@@ -30,10 +34,6 @@ import org.apache.mailet.base.test.MailUtil;
import org.junit.Assert;
import org.junit.Test;
-import javax.mail.MessagingException;
-import javax.mail.internet.ParseException;
-import java.util.Collection;
-
public class SMTPIsAuthNetworkTest {
private FakeMail mockedMail;
http://git-wip-us.apache.org/repos/asf/james-project/blob/19444cae/mailet/standard/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java
index d494206..0fb6727 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java
@@ -20,7 +20,12 @@
package org.apache.james.transport.matchers;
-import org.apache.james.transport.matchers.SizeGreaterThan;
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.ParseException;
+
import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
import org.apache.mailet.base.test.FakeMail;
@@ -29,11 +34,6 @@ import org.apache.mailet.base.test.FakeMatcherConfig;
import org.junit.Assert;
import org.junit.Test;
-import javax.mail.MessagingException;
-import javax.mail.internet.ParseException;
-import java.util.Arrays;
-import java.util.Collection;
-
public class SizeGreaterThanTest {
private FakeMail mockedMail;
---------------------------------------------------------------------
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: MAILET-109 HostIsTest should match
our coding conventions
Posted by bt...@apache.org.
MAILET-109 HostIsTest should match our coding conventions
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/18bca984
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/18bca984
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/18bca984
Branch: refs/heads/master
Commit: 18bca984986fae7bfad9eda72865441dc0fb80ca
Parents: 262f0f2
Author: Benoit Tellier <bt...@linagora.com>
Authored: Wed Aug 17 13:15:08 2016 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Mon Aug 29 17:38:49 2016 +0700
----------------------------------------------------------------------
.../james/transport/matchers/HostIsTest.java | 77 +++++++-------------
1 file changed, 26 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/18bca984/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
index 65715a3..b2cb5d6 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
@@ -17,11 +17,9 @@
* under the License. *
****************************************************************/
-
package org.apache.james.transport.matchers;
-import java.util.Arrays;
-import java.util.Collection;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.MessagingException;
@@ -30,80 +28,57 @@ import org.apache.mailet.Matcher;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMatcherConfig;
-import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
-public class HostIsTest {
+import com.google.common.collect.ImmutableList;
- private FakeMail mockedMail;
+public class HostIsTest {
+ public static final String JAMES_APACHE_ORG = "james.apache.org";
+ public static final String JAMES2_APACHE_ORG = "james2.apache.org";
+ private FakeMail fakeMail;
private Matcher matcher;
- private MailAddress[] recipients;
-
- private void setRecipients(MailAddress[] recipients) {
- this.recipients = recipients;
- }
-
- private void setupMockedMail() {
- mockedMail = new FakeMail();
- mockedMail.setRecipients(Arrays.asList(recipients));
-
- }
+ @Before
+ public void setUp() throws Exception {
+ fakeMail = new FakeMail();
- private void setupMatcher() throws MessagingException {
matcher = new HostIs();
- String HOST_NAME = "james.apache.org";
- FakeMatcherConfig mci = new FakeMatcherConfig("HostIs=" + HOST_NAME,
- new FakeMailContext());
+ FakeMatcherConfig mci = new FakeMatcherConfig("HostIs=" + JAMES_APACHE_ORG, new FakeMailContext());
matcher.init(mci);
}
// test if all recipients get returned as matched
@Test
public void testHostIsMatchedAllRecipients() throws MessagingException {
- setRecipients(new MailAddress[]{
- new MailAddress("test@james.apache.org"),
- new MailAddress("test2@james.apache.org")});
-
- setupMockedMail();
- setupMatcher();
+ MailAddress mailAddress1 = new MailAddress("test@" + JAMES_APACHE_ORG);
+ MailAddress mailAddress2 = new MailAddress("test2@" + JAMES_APACHE_ORG);
+ fakeMail.setRecipients(ImmutableList.of(
+ mailAddress1,
+ mailAddress2));
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
-
- Assert.assertNotNull(matchedRecipients);
- Assert.assertEquals(matchedRecipients.size(), mockedMail.getRecipients()
- .size());
+ assertThat(matcher.match(fakeMail)).containsExactly(mailAddress1, mailAddress2);
}
// test if one recipients get returned as matched
@Test
public void testHostIsMatchedOneRecipient() throws MessagingException {
- setRecipients(new MailAddress[]{
- new MailAddress("test@james2.apache.org"),
- new MailAddress("test2@james.apache.org")});
-
- setupMockedMail();
- setupMatcher();
+ MailAddress matchingAddress = new MailAddress("test2@" + JAMES_APACHE_ORG);
+ fakeMail.setRecipients(ImmutableList.of(
+ new MailAddress("test@" + JAMES2_APACHE_ORG),
+ matchingAddress));
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
-
- Assert.assertNotNull(matchedRecipients);
- Assert.assertEquals(matchedRecipients.size(), 1);
+ assertThat(matcher.match(fakeMail)).containsExactly(matchingAddress);
}
// test if no recipient get returned cause it not match
@Test
public void testHostIsNotMatch() throws MessagingException {
- setRecipients(new MailAddress[]{
- new MailAddress("test@james2.apache.org"),
- new MailAddress("test2@james2.apache.org")});
-
- setupMockedMail();
- setupMatcher();
-
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
+ fakeMail.setRecipients(ImmutableList.of(
+ new MailAddress("test@" + JAMES2_APACHE_ORG),
+ new MailAddress("test2@" + JAMES2_APACHE_ORG)));
- Assert.assertEquals(matchedRecipients.size(), 0);
+ assertThat(matcher.match(fakeMail)).isEmpty();
}
}
---------------------------------------------------------------------
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-108 Re-order POM file for
mailet/standard
Posted by bt...@apache.org.
MAILET-108 Re-order POM file for mailet/standard
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/84fca1d7
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/84fca1d7
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/84fca1d7
Branch: refs/heads/master
Commit: 84fca1d75b76a3a92ad4ea281dcdf7933286b29b
Parents: 19444ca
Author: Benoit Tellier <bt...@linagora.com>
Authored: Mon Aug 29 12:53:51 2016 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Mon Aug 29 17:38:26 2016 +0700
----------------------------------------------------------------------
mailet/standard/pom.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/84fca1d7/mailet/standard/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index 2f5c0c5..3649439 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -40,14 +40,6 @@
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
@@ -59,13 +51,21 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
---------------------------------------------------------------------
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-108 HostIsLocalTest should
match our coding conventions
Posted by bt...@apache.org.
MAILET-108 HostIsLocalTest should match our coding conventions
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/262f0f2c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/262f0f2c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/262f0f2c
Branch: refs/heads/master
Commit: 262f0f2c2c5206278601525283dab497c61b921c
Parents: b1e0f3e
Author: Benoit Tellier <bt...@linagora.com>
Authored: Wed Aug 17 13:09:23 2016 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Mon Aug 29 17:38:41 2016 +0700
----------------------------------------------------------------------
mailet/pom.xml | 5 +
mailet/standard/pom.xml | 5 +
.../transport/matchers/HostIsLocalTest.java | 220 +++----------------
3 files changed, 41 insertions(+), 189 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/262f0f2c/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/pom.xml b/mailet/pom.xml
index f4ac702..8639392 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -156,6 +156,11 @@
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.9.5</version>
+ </dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/james-project/blob/262f0f2c/mailet/standard/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index 28cbf6d..5b9f776 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -63,6 +63,11 @@
<artifactId>mail</artifactId>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/262f0f2c/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
index 78e5cf3..11965ff 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
@@ -20,233 +20,75 @@
package org.apache.james.transport.matchers;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.util.List;
import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-import org.apache.mailet.HostAddress;
-import org.apache.mailet.LookupException;
-import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
import org.apache.mailet.Matcher;
-import org.apache.mailet.TemporaryLookupException;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMatcherConfig;
-import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
-@SuppressWarnings("deprecation")
+import com.google.common.collect.ImmutableList;
+
public class HostIsLocalTest {
- private FakeMail mockedMail;
+ public static final String JAMES_APACHE_ORG = "james.apache.org";
+ public static final String JAMES2_APACHE_ORG = "james2.apache.org";
+ private FakeMail mockedMail;
private Matcher matcher;
- private final String[] LOCALSERVER = new String[]{"james.apache.org"};
-
- private MailAddress[] recipients;
-
- private void setRecipients(MailAddress[] recipients) {
- this.recipients = recipients;
- }
-
- private void setupMockedMail() {
+ @Before
+ public void setUp() throws Exception {
mockedMail = new FakeMail();
- mockedMail.setRecipients(Arrays.asList(recipients));
- }
-
- private void setupMatcher() throws MessagingException {
-
- MailetContext FakeMailContext = new MailetContext() {
-
- Collection<String> localServer = new ArrayList<String>(Arrays.asList(LOCALSERVER));
-
- public void bounce(Mail mail, String message)
- throws MessagingException {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
-
- }
-
- public void bounce(Mail mail, String message, MailAddress bouncer)
- throws MessagingException {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
-
- }
-
- public Collection<String> getMailServers(String host) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public MailAddress getPostmaster() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Object getAttribute(String name) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Iterator<String> getAttributeNames() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public int getMajorVersion() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public int getMinorVersion() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public String getServerInfo() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public boolean isLocalServer(String serverName) {
- return localServer.contains(serverName);
- }
-
- public boolean isLocalUser(String userAccount) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public boolean isLocalEmail(MailAddress mailAddress) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void log(String message) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void log(String message, Throwable t) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void removeAttribute(String name) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void sendMail(MimeMessage msg) throws MessagingException {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void sendMail(MailAddress sender, Collection<MailAddress> recipients,
- MimeMessage msg) throws MessagingException {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void sendMail(MailAddress sender, Collection<MailAddress> recipients,
- MimeMessage msg, String state) throws MessagingException {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void sendMail(Mail mail) throws MessagingException {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setAttribute(String name, Object object) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Iterator<HostAddress> getSMTPHostAddresses(String domainName) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void log(LogLevel level, String message) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void log(LogLevel level, String message, Throwable t) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public List<String> dnsLookup(String name, RecordType type) throws LookupException {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
-
- };
+ MailetContext mailContext = mock(MailetContext.class);
+ when(mailContext.isLocalServer(JAMES_APACHE_ORG)).thenReturn(true);
+ when(mailContext.isLocalServer(JAMES2_APACHE_ORG)).thenReturn(false);
matcher = new HostIsLocal();
- FakeMatcherConfig mci = new FakeMatcherConfig("HostIsLocal",
- FakeMailContext);
+ FakeMatcherConfig mci = new FakeMatcherConfig("HostIsLocal", mailContext);
matcher.init(mci);
}
// test if all recipients get returned as matched
@Test
public void testHostIsMatchedAllRecipients() throws MessagingException {
- setRecipients(new MailAddress[]{
- new MailAddress("test@james.apache.org"),
- new MailAddress("test2@james.apache.org")});
-
- setupMockedMail();
- setupMatcher();
-
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
+ MailAddress mailAddress1 = new MailAddress("test@" + JAMES_APACHE_ORG);
+ MailAddress mailAddress2 = new MailAddress("test2@" + JAMES_APACHE_ORG);
+ mockedMail.setRecipients(ImmutableList.of(
+ mailAddress1,
+ mailAddress2));
- Assert.assertNotNull(matchedRecipients);
- Assert.assertEquals(matchedRecipients.size(), mockedMail.getRecipients()
- .size());
+ assertThat( matcher.match(mockedMail)).containsExactly(mailAddress1, mailAddress2);
}
// test if one recipients get returned as matched
@Test
public void testHostIsMatchedOneRecipient() throws MessagingException {
- setRecipients(new MailAddress[]{
- new MailAddress("test@james2.apache.org"),
- new MailAddress("test2@james.apache.org")});
+ MailAddress matchingAddress = new MailAddress("test2@" +JAMES_APACHE_ORG);
+ mockedMail.setRecipients(ImmutableList.of(
+ new MailAddress("test@" + JAMES2_APACHE_ORG),
+ matchingAddress));
- setupMockedMail();
- setupMatcher();
-
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
-
- Assert.assertNotNull(matchedRecipients);
- Assert.assertEquals(matchedRecipients.size(), 1);
+ assertThat( matcher.match(mockedMail)).containsExactly(matchingAddress);
}
// test if no recipient get returned cause it not match
@Test
public void testHostIsNotMatch() throws MessagingException {
- setRecipients(new MailAddress[]{
- new MailAddress("test@james2.apache.org"),
- new MailAddress("test2@james2.apache.org")});
-
- setupMockedMail();
- setupMatcher();
-
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
+ mockedMail.setRecipients(
+ ImmutableList.of(new MailAddress("test@" + JAMES2_APACHE_ORG),
+ new MailAddress("test2@" + JAMES2_APACHE_ORG)));
- Assert.assertEquals(matchedRecipients.size(), 0);
+ assertThat(matcher.match(mockedMail)).isEmpty();
}
}
---------------------------------------------------------------------
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-108 mailet/standard package
should use GUAVA
Posted by bt...@apache.org.
MAILET-108 mailet/standard package should use GUAVA
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b1e0f3e7
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b1e0f3e7
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b1e0f3e7
Branch: refs/heads/master
Commit: b1e0f3e7f4b4a4a70c0b1067109a8202ac999551
Parents: 84fca1d
Author: Benoit Tellier <bt...@linagora.com>
Authored: Mon Aug 29 13:08:36 2016 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Mon Aug 29 17:38:33 2016 +0700
----------------------------------------------------------------------
mailet/standard/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b1e0f3e7/mailet/standard/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index 3649439..28cbf6d 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -51,6 +51,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org