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 no...@apache.org on 2006/05/30 15:20:43 UTC
svn commit: r410274 - in
/james/server/trunk/src/test/org/apache/james/transport: mailets/ matchers/
Author: norman
Date: Tue May 30 06:20:42 2006
New Revision: 410274
URL: http://svn.apache.org/viewvc?rev=410274&view=rev
Log:
-Fix typo in license
-Add junit test for HasMailAttributeWithValue matcher
-Add junit test for HasMailAttributeWithValueRegex matcher
Added:
james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java
Modified:
james/server/trunk/src/test/org/apache/james/transport/mailets/AddHeaderTest.java
james/server/trunk/src/test/org/apache/james/transport/matchers/AllTest.java
james/server/trunk/src/test/org/apache/james/transport/matchers/FetchedFromTest.java
james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java
james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeTest.java
Modified: james/server/trunk/src/test/org/apache/james/transport/mailets/AddHeaderTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/mailets/AddHeaderTest.java?rev=410274&r1=410273&r2=410274&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/transport/mailets/AddHeaderTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/transport/mailets/AddHeaderTest.java Tue May 30 06:20:42 2006
@@ -1,5 +1,5 @@
/***********************************************************************
- * Copyright (c) 2006 The Apache Software Foundation. *
+ * Copyright (c) 2006 The Apache Software Foundation. *
* All rights reserved. *
* ------------------------------------------------------------------- *
* Licensed under the Apache License, Version 2.0 (the "License"); you *
Modified: james/server/trunk/src/test/org/apache/james/transport/matchers/AllTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/AllTest.java?rev=410274&r1=410273&r2=410274&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/transport/matchers/AllTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/transport/matchers/AllTest.java Tue May 30 06:20:42 2006
@@ -1,5 +1,5 @@
/***********************************************************************
- * Copyright (c) 2006 The Apache Software Foundation. *
+ * Copyright (c) 2006 The Apache Software Foundation. *
* All rights reserved. *
* ------------------------------------------------------------------- *
* Licensed under the Apache License, Version 2.0 (the "License"); you *
Modified: james/server/trunk/src/test/org/apache/james/transport/matchers/FetchedFromTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/FetchedFromTest.java?rev=410274&r1=410273&r2=410274&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/transport/matchers/FetchedFromTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/transport/matchers/FetchedFromTest.java Tue May 30 06:20:42 2006
@@ -1,5 +1,5 @@
/***********************************************************************
- * Copyright (c) 2006 The Apache Software Foundation. *
+ * Copyright (c) 2006 The Apache Software Foundation. *
* All rights reserved. *
* ------------------------------------------------------------------- *
* Licensed under the Apache License, Version 2.0 (the "License"); you *
Modified: james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java?rev=410274&r1=410273&r2=410274&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java Tue May 30 06:20:42 2006
@@ -1,5 +1,5 @@
/***********************************************************************
- * Copyright (c) 2006 The Apache Software Foundation. *
+ * Copyright (c) 2006 The Apache Software Foundation. *
* All rights reserved. *
* ------------------------------------------------------------------- *
* Licensed under the Apache License, Version 2.0 (the "License"); you *
Modified: james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeTest.java?rev=410274&r1=410273&r2=410274&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeTest.java Tue May 30 06:20:42 2006
@@ -1,5 +1,5 @@
/***********************************************************************
- * Copyright (c) 2006 The Apache Software Foundation. *
+ * Copyright (c) 2006 The Apache Software Foundation. *
* All rights reserved. *
* ------------------------------------------------------------------- *
* Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -96,7 +96,7 @@
}
// test if the mail attribute was matched
- public void testHeaderIsMatched() throws MessagingException {
+ public void testAttributeIsMatched() throws MessagingException {
setMailAttributeName(MAIL_ATTRIBUTE_NAME);
setMailAttributeValue(MAIL_ATTRIBUTE_VALUE);
@@ -112,7 +112,7 @@
}
// test if the mail attribute was not matched
- public void testHeaderIsNotMatched() throws MessagingException {
+ public void testAttributeIsNotMatched() throws MessagingException {
setupMockedMimeMessage();
setupMockedMail(mockedMimeMessage);
setupMatcher();
Added: james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java?rev=410274&view=auto
==============================================================================
--- james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java (added)
+++ james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java Tue May 30 06:20:42 2006
@@ -0,0 +1,157 @@
+/***********************************************************************
+ * Copyright (c) 2006 The Apache Software Foundation. *
+ * All rights reserved. *
+ * ------------------------------------------------------------------- *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you *
+ * may not use this file except in compliance with the License. You *
+ * may obtain a copy of the License at: *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, software *
+ * distributed under the License is distributed on an "AS IS" BASIS, *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or *
+ * implied. See the License for the specific language governing *
+ * permissions and limitations under the License. *
+ ***********************************************************************/
+
+package org.apache.james.transport.matchers;
+
+import org.apache.james.test.mock.javaxmail.MockMimeMessage;
+import org.apache.james.test.mock.mailet.MockMail;
+import org.apache.james.test.mock.mailet.MockMailContext;
+import org.apache.james.test.mock.mailet.MockMatcherConfig;
+
+import org.apache.mailet.Matcher;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMessage.RecipientType;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import junit.framework.TestCase;
+
+public class HasMailAttributeWithValueRegexTest extends TestCase {
+
+ private MimeMessage mockedMimeMessage;
+
+ private MockMail mockedMail;
+
+ private Matcher matcher;
+
+ private final String MAIL_ATTRIBUTE_NAME = "org.apache.james.test.junit";
+
+ private final String MAIL_ATTRIBUTE_VALUE = "true";
+
+ private String mailAttributeName = "org.apache.james";
+
+ private String mailAttributeValue = "false";
+
+ private String regex = ".*";
+
+ public HasMailAttributeWithValueRegexTest(String arg0)
+ throws UnsupportedEncodingException {
+ super(arg0);
+ }
+
+ private void setMailAttributeName(String mailAttributeName) {
+ this.mailAttributeName = mailAttributeName;
+ }
+
+ private void setMailAttributeValue(String mailAttributeValue) {
+ this.mailAttributeValue = mailAttributeValue;
+ }
+
+ private void setRegex(String regex) {
+ this.regex = regex;
+ }
+
+ private void setupMockedMimeMessage() throws MessagingException {
+ String sender = "test@james.apache.org";
+ String rcpt = "test2@james.apache.org";
+
+ mockedMimeMessage = new MockMimeMessage();
+ mockedMimeMessage.setFrom(new InternetAddress(sender));
+ mockedMimeMessage.setRecipients(RecipientType.TO, rcpt);
+ mockedMimeMessage.setSubject("testmail");
+ mockedMimeMessage.setText("testtext");
+ mockedMimeMessage.saveChanges();
+
+ }
+
+ private void setupMockedMail(MimeMessage m) {
+ mockedMail = new MockMail();
+ mockedMail.setMessage(m);
+ mockedMail.setRecipients(Arrays.asList(new String[] {
+ "test@james.apache.org", "test2@james.apache.org" }));
+ mockedMail.setAttribute(mailAttributeName,
+ (Serializable) mailAttributeValue);
+
+ }
+
+ private void setupMatcher() throws MessagingException {
+ setupMockedMimeMessage();
+ matcher = new HasMailAttributeWithValueRegex();
+ MockMatcherConfig mci = new MockMatcherConfig("HasMailAttribute="
+ + MAIL_ATTRIBUTE_NAME + ", " + regex, new MockMailContext());
+ matcher.init(mci);
+ }
+
+ // test if the mail attribute was matched
+ public void testAttributeIsMatched() throws MessagingException {
+ setMailAttributeName(MAIL_ATTRIBUTE_NAME);
+ setMailAttributeValue(MAIL_ATTRIBUTE_VALUE);
+ setRegex(".*");
+
+ setupMockedMimeMessage();
+ setupMockedMail(mockedMimeMessage);
+ setupMatcher();
+
+ Collection matchedRecipients = matcher.match(mockedMail);
+
+ assertNotNull(matchedRecipients);
+ assertEquals(matchedRecipients.size(), mockedMail.getRecipients()
+ .size());
+ }
+
+ // test if the mail attribute was not matched
+ public void testHeaderIsNotMatched() throws MessagingException {
+ setRegex("\\d");
+ setupMockedMimeMessage();
+ setupMockedMail(mockedMimeMessage);
+ setupMatcher();
+
+ Collection matchedRecipients = matcher.match(mockedMail);
+
+ assertNull(matchedRecipients);
+ }
+
+ // test if an exception was thrown cause the regex was invalid
+ public void testHeaderIsNotMatchedCauseValue() throws MessagingException {
+
+ String invalidRegex = "(!(";
+ String regexException = null;
+ String exception = "Malformed pattern: " + invalidRegex;
+
+ setRegex(invalidRegex);
+ setupMockedMimeMessage();
+ setupMockedMail(mockedMimeMessage);
+
+ try {
+ setupMatcher();
+ } catch (MessagingException m) {
+ regexException = m.getMessage();
+ }
+
+ Collection matchedRecipients = matcher.match(mockedMail);
+
+ assertNull(matchedRecipients);
+ assertEquals(regexException, exception);
+
+ }
+}
Added: james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java?rev=410274&view=auto
==============================================================================
--- james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java (added)
+++ james/server/trunk/src/test/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java Tue May 30 06:20:42 2006
@@ -0,0 +1,138 @@
+/***********************************************************************
+ * Copyright (c) 2006 The Apache Software Foundation. *
+ * All rights reserved. *
+ * ------------------------------------------------------------------- *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you *
+ * may not use this file except in compliance with the License. You *
+ * may obtain a copy of the License at: *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, software *
+ * distributed under the License is distributed on an "AS IS" BASIS, *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or *
+ * implied. See the License for the specific language governing *
+ * permissions and limitations under the License. *
+ ***********************************************************************/
+
+package org.apache.james.transport.matchers;
+
+import org.apache.james.test.mock.javaxmail.MockMimeMessage;
+import org.apache.james.test.mock.mailet.MockMail;
+import org.apache.james.test.mock.mailet.MockMailContext;
+import org.apache.james.test.mock.mailet.MockMatcherConfig;
+
+import org.apache.mailet.Matcher;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMessage.RecipientType;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import junit.framework.TestCase;
+
+public class HasMailAttributeWithValueTest extends TestCase {
+
+ private MimeMessage mockedMimeMessage;
+
+ private MockMail mockedMail;
+
+ private Matcher matcher;
+
+ private final String MAIL_ATTRIBUTE_NAME = "org.apache.james.test.junit";
+
+ private final String MAIL_ATTRIBUTE_VALUE = "true";
+
+ private String mailAttributeName = "org.apache.james";
+
+ private String mailAttributeValue = "false";
+
+ public HasMailAttributeWithValueTest(String arg0)
+ throws UnsupportedEncodingException {
+ super(arg0);
+ }
+
+ private void setMailAttributeName(String mailAttributeName) {
+ this.mailAttributeName = mailAttributeName;
+ }
+
+ private void setMailAttributeValue(String mailAttributeValue) {
+ this.mailAttributeValue = mailAttributeValue;
+ }
+
+ private void setupMockedMimeMessage() throws MessagingException {
+ String sender = "test@james.apache.org";
+ String rcpt = "test2@james.apache.org";
+
+ mockedMimeMessage = new MockMimeMessage();
+ mockedMimeMessage.setFrom(new InternetAddress(sender));
+ mockedMimeMessage.setRecipients(RecipientType.TO, rcpt);
+ mockedMimeMessage.setSubject("testmail");
+ mockedMimeMessage.setText("testtext");
+ mockedMimeMessage.saveChanges();
+
+ }
+
+ private void setupMockedMail(MimeMessage m) {
+ mockedMail = new MockMail();
+ mockedMail.setMessage(m);
+ mockedMail.setRecipients(Arrays.asList(new String[] {
+ "test@james.apache.org", "test2@james.apache.org" }));
+ mockedMail.setAttribute(mailAttributeName,
+ (Serializable) mailAttributeValue);
+
+ }
+
+ private void setupMatcher() throws MessagingException {
+ setupMockedMimeMessage();
+ matcher = new HasMailAttributeWithValue();
+ MockMatcherConfig mci = new MockMatcherConfig("HasMailAttribute="
+ + MAIL_ATTRIBUTE_NAME + ", " + MAIL_ATTRIBUTE_VALUE,
+ new MockMailContext());
+ matcher.init(mci);
+ }
+
+ // test if the mail attribute was matched
+ public void testHeaderIsMatched() throws MessagingException {
+ setMailAttributeName(MAIL_ATTRIBUTE_NAME);
+ setMailAttributeValue(MAIL_ATTRIBUTE_VALUE);
+
+ setupMockedMimeMessage();
+ setupMockedMail(mockedMimeMessage);
+ setupMatcher();
+
+ Collection matchedRecipients = matcher.match(mockedMail);
+
+ assertNotNull(matchedRecipients);
+ assertEquals(matchedRecipients.size(), mockedMail.getRecipients()
+ .size());
+ }
+
+ // test if the mail attribute was not matched
+ public void testHeaderIsNotMatched() throws MessagingException {
+ setupMockedMimeMessage();
+ setupMockedMail(mockedMimeMessage);
+ setupMatcher();
+
+ Collection matchedRecipients = matcher.match(mockedMail);
+
+ assertNull(matchedRecipients);
+ }
+
+ // test if the mail attribute was not matched cause diffrent value
+ public void testHeaderIsNotMatchedCauseValue() throws MessagingException {
+ setMailAttributeName(MAIL_ATTRIBUTE_NAME);
+ setupMockedMimeMessage();
+ setupMockedMail(mockedMimeMessage);
+ setupMatcher();
+
+ Collection matchedRecipients = matcher.match(mockedMail);
+
+ assertNull(matchedRecipients);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org