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 rd...@apache.org on 2008/09/04 23:49:53 UTC
svn commit: r692268 [2/2] - in /james/jsieve/trunk/src:
main/java/org/apache/jsieve/ main/java/org/apache/jsieve/commands/
main/java/org/apache/jsieve/commands/extensions/
main/java/org/apache/jsieve/commands/optional/
main/java/org/apache/jsieve/compa...
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java Thu Sep 4 14:49:51 2008
@@ -30,14 +30,19 @@
public class SieveParserVisitorImplQuoteTest extends TestCase {
SieveParserVisitorImpl visitor;
+
List data;
+
ASTstring node;
-
+
protected void setUp() throws Exception {
super.setUp();
final ConfigurationManager configurationManager = new ConfigurationManager();
- visitor = new SieveParserVisitorImpl(new BaseSieveContext(configurationManager.getCommandManager(), configurationManager.getComparatorManager(),
- configurationManager.getTestManager(), LogFactory.getLog(SieveParserVisitorImplQuoteTest.class)));
+ visitor = new SieveParserVisitorImpl(new BaseSieveContext(
+ configurationManager.getCommandManager(), configurationManager
+ .getComparatorManager(), configurationManager
+ .getTestManager(), LogFactory
+ .getLog(SieveParserVisitorImplQuoteTest.class)));
data = new ArrayList();
node = new ASTstring(100);
}
@@ -47,7 +52,8 @@
node.setValue("\"value\"");
visitor.visit(node, data);
assertEquals("Data value added after quotes stripped", 1, data.size());
- assertEquals("Data value added after quotes stripped", "value", data.get(0));
+ assertEquals("Data value added after quotes stripped", "value", data
+ .get(0));
}
public void testVisitASTstringObjectQuoteInQuoted() {
@@ -55,26 +61,28 @@
node.setValue("\"val\\\"ue\"");
visitor.visit(node, data);
assertEquals("Data value added after quotes stripped", 1, data.size());
- assertEquals("Data value added after quotes stripped", "val\"ue", data.get(0));
+ assertEquals("Data value added after quotes stripped", "val\"ue", data
+ .get(0));
}
-
+
public void testVisitASTstringObjectDoubleSlashQuoted() {
node.setValue("\"val\\\\ue\"");
visitor.visit(node, data);
assertEquals("Data value added after quotes stripped", 1, data.size());
- assertEquals("Data value added after quotes stripped", "val\\ue", data.get(0));
+ assertEquals("Data value added after quotes stripped", "val\\ue", data
+ .get(0));
}
-
-
+
public void testVisitASTstringObjectSlashQuoted() {
node.setValue("\"val\\ue\"");
visitor.visit(node, data);
assertEquals("Data value added after quotes stripped", 1, data.size());
- assertEquals("Data value added after quotes stripped", "value", data.get(0));
+ assertEquals("Data value added after quotes stripped", "value", data
+ .get(0));
}
-
+
public void testVisitASTstringEmptyQuoted() {
node.setValue("\"\"");
@@ -82,12 +90,13 @@
assertEquals("Data value added after quotes stripped", 1, data.size());
assertEquals("Data value added after quotes stripped", "", data.get(0));
}
-
+
public void testVisitASTstringObjectMultiSlashQuoted() {
node.setValue("\"v\\\\al\\\\u\\e\\\\\"");
visitor.visit(node, data);
assertEquals("Data value added after quotes stripped", 1, data.size());
- assertEquals("Data value added after quotes stripped", "v\\al\\ue\\", data.get(0));
+ assertEquals("Data value added after quotes stripped", "v\\al\\ue\\",
+ data.get(0));
}
}
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java Thu Sep 4 14:49:51 2008
@@ -34,6 +34,7 @@
private static final String SOLO_ADDRESS_VALUES = "coyote@desert.example.org";
BaseSieveContext context;
+
SieveMailAdapter mail;
OpenedAddress address;
@@ -41,9 +42,11 @@
protected void setUp() throws Exception {
super.setUp();
ConfigurationManager configurationManager = new ConfigurationManager();
- context = new BaseSieveContext(configurationManager.getCommandManager(), configurationManager.getComparatorManager(),
- configurationManager.getTestManager(),
- LogFactory.getLog(AddressParseTest.class));
+ context = new BaseSieveContext(
+ configurationManager.getCommandManager(), configurationManager
+ .getComparatorManager(), configurationManager
+ .getTestManager(), LogFactory
+ .getLog(AddressParseTest.class));
mail = (SieveMailAdapter) JUnitUtils.createMail();
address = new OpenedAddress();
}
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java Thu Sep 4 14:49:51 2008
@@ -19,14 +19,14 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.commands.ThrowTestException;
import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class AllOfTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java Thu Sep 4 14:49:51 2008
@@ -19,14 +19,14 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.commands.ThrowTestException;
import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class AnyOfTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java Thu Sep 4 14:49:51 2008
@@ -19,14 +19,14 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.commands.ThrowTestException;
import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class FalseTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java Thu Sep 4 14:49:51 2008
@@ -19,6 +19,8 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.utils.JUnitUtils;
@@ -26,8 +28,6 @@
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class FileIntoTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java Thu Sep 4 14:49:51 2008
@@ -19,16 +19,16 @@
package org.apache.jsieve.junit;
+import javax.mail.MessagingException;
+
+import junit.framework.TestCase;
+
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.junit.commands.ThrowTestException;
import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.junit.utils.SieveMailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
-import javax.mail.MessagingException;
-
-import junit.framework.TestCase;
-
/**
* Class HeaderTest
*/
@@ -301,10 +301,10 @@
}
assertTrue(isTestPassed);
}
-
+
/**
- * Test for square brackets in matching headers
- * When the "[" is in the first char of the pattern it does not matches.
+ * Test for square brackets in matching headers When the "[" is in the first
+ * char of the pattern it does not matches.
*
* @see http://issues.apache.org/jira/browse/JSIEVE-19
*/
@@ -332,7 +332,8 @@
String script = "if header :matches \"X-Caffeine\" \"my,\\\\,?,\\?,\\\\?,*,\\*,\\\\*,pattern\" {throwTestException;}";
try {
SieveMailAdapter mail = (SieveMailAdapter) JUnitUtils.createMail();
- mail.getMessage().addHeader("X-Caffeine", "my,\\,x,x,?,foo,bar,*,pattern");
+ mail.getMessage().addHeader("X-Caffeine",
+ "my,\\,x,x,?,foo,bar,*,pattern");
JUnitUtils.interpret(mail, script);
} catch (MessagingException e) {
} catch (ThrowTestException.TestException e) {
@@ -351,7 +352,8 @@
String script = "if header :matches \"X-Caffeine\" \"my,?,\\?,\\\\?,*,\\*,\\\\*,pattern\" {throwTestException;}";
try {
SieveMailAdapter mail = (SieveMailAdapter) JUnitUtils.createMail();
- mail.getMessage().addHeader("X-Caffeine", "my,x,x,q,foo,bar,*,pattern");
+ mail.getMessage().addHeader("X-Caffeine",
+ "my,x,x,q,foo,bar,*,pattern");
JUnitUtils.interpret(mail, script);
isTestPassed = true;
} catch (MessagingException e) {
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java Thu Sep 4 14:49:51 2008
@@ -19,6 +19,8 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.utils.JUnitUtils;
@@ -26,8 +28,6 @@
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class KeepTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java Thu Sep 4 14:49:51 2008
@@ -19,12 +19,12 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class LogTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java Thu Sep 4 14:49:51 2008
@@ -28,18 +28,11 @@
private static final String MINIMAL_SIEVE = "require [\"fileinto\", \"reject\"];\n";
- private static final String MULTIPLE_REQUIRED_SIEVE = "# \n" +
- "# Start with some comments\n" +
- "# Whatever\n" +
- "#\n" +
- "\n" +
- MINIMAL_SIEVE +
- "\n" +
- "#\n" +
- "# Lets have some more comments\n" +
- "#\n" +
- "\n";
-
+ private static final String MULTIPLE_REQUIRED_SIEVE = "# \n"
+ + "# Start with some comments\n" + "# Whatever\n" + "#\n" + "\n"
+ + MINIMAL_SIEVE + "\n" + "#\n" + "# Lets have some more comments\n"
+ + "#\n" + "\n";
+
MailAdapter mail;
protected void setUp() throws Exception {
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleToTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleToTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleToTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleToTest.java Thu Sep 4 14:49:51 2008
@@ -32,17 +32,13 @@
private static final String SOLO_TO_EMAIL = "Date: Sun, 1 Apr 2007 1100:00:00 +0100 (BST)\r\f"
+ "From: roadrunner@acme.example.com\r\f"
+ "To: coyote@desert.example.org\r\f"
- + "Subject: Who's The Fool?\r\f"
- + "\r\f"
- + "Beep-Beep\r\f";
+ + "Subject: Who's The Fool?\r\f" + "\r\f" + "Beep-Beep\r\f";
private static final String MULTIPLE_TO_EMAIL = "Date: Sun, 1 Apr 2007 1100:00:00 +0100 (BST)\r\f"
+ "From: roadrunner@acme.example.com\r\f"
+ "To: coyote@desert.example.org, bugs@example.org, "
+ " elmer@hunters.example.org,\r\f"
- + "Subject: Who's The Fool?\r\f"
- + "\r\f"
- + "Beep-Beep\r\f";
+ + "Subject: Who's The Fool?\r\f" + "\r\f" + "Beep-Beep\r\f";
private static final String FILTER_SCRIPT = "require \"fileinto\";\r\f"
+ "if address :is :all \"to\" \"coyote@desert.example.org\" {\r\f"
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java Thu Sep 4 14:49:51 2008
@@ -19,14 +19,14 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.commands.ThrowTestException;
import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class NotTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/OpenedAddress.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/OpenedAddress.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/OpenedAddress.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/OpenedAddress.java Thu Sep 4 14:49:51 2008
@@ -27,8 +27,8 @@
final class OpenedAddress extends Address {
protected boolean match(MailAdapter mail, String addressPart,
- String comparator, String matchType, String headerName, String key, SieveContext context)
- throws SieveException {
+ String comparator, String matchType, String headerName, String key,
+ SieveContext context) throws SieveException {
return super.match(mail, addressPart, comparator, matchType,
headerName, key, context);
}
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/QuotingTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/QuotingTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/QuotingTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/QuotingTest.java Thu Sep 4 14:49:51 2008
@@ -29,8 +29,9 @@
public void testQuoteInQuotedString() throws Exception {
String script = "if header :is \"X-Test\" \"Before\\\"After\" {throwTestException;}";
-
- final SieveMailAdapter mail = (SieveMailAdapter) JUnitUtils.createMail();
+
+ final SieveMailAdapter mail = (SieveMailAdapter) JUnitUtils
+ .createMail();
mail.getMessage().addHeader("X-Test", "Before\"After");
try {
JUnitUtils.interpret(mail, script);
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java Thu Sep 4 14:49:51 2008
@@ -19,6 +19,8 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.exception.CommandException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
@@ -27,8 +29,6 @@
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class RejectTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java Thu Sep 4 14:49:51 2008
@@ -19,18 +19,18 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class AddressTest
*/
public class RequireMissingTest extends TestCase {
-
+
/**
- * Tests that unsupported requires are caught before script execution.
+ * Tests that unsupported requires are caught before script execution.
*/
public void testUnsupportedRequireNoBrackets() throws Exception {
String script = "require \"whatever\"; if address :contains [\"To\", \"From\"] \"Fish!\"{ fileinto \"aFolder\"; }";
@@ -38,12 +38,12 @@
JUnitUtils.parse(script);
fail("Expect exception to be throw during parse since command is unsupported");
} catch (ParseException e) {
-// expected
+ // expected
}
}
-
+
/**
- * Tests that unsupported requires are caught before script execution.
+ * Tests that unsupported requires are caught before script execution.
*/
public void testUnsupportedRequireMultiple() throws Exception {
String script = "require [\"fileinto\",\"whatever\"]; if address :contains [\"To\", \"From\"] \"Fish!\"{ fileinto \"aFolder\"; }";
@@ -51,12 +51,12 @@
JUnitUtils.parse(script);
fail("Expect exception to be throw during parse since command is unsupported");
} catch (ParseException e) {
-// expected
+ // expected
}
}
-
+
/**
- * Tests that unsupported requires are caught before script execution.
+ * Tests that unsupported requires are caught before script execution.
*/
public void testUnsupportedRequire() throws Exception {
String script = "require [\"whatever\"]; if address :contains [\"To\", \"From\"] \"Fish!\"{ fileinto \"aFolder\"; }";
@@ -64,13 +64,14 @@
JUnitUtils.parse(script);
fail("Expect exception to be throw during parse since command is unsupported");
} catch (ParseException e) {
-// expected
+ // expected
}
}
/**
- * Tests 2.10.5 Extensions and Optional Features: If an extension is not enabled with "required"
- * they must treat it as if they do not support it at all.
+ * Tests 2.10.5 Extensions and Optional Features: If an extension is not
+ * enabled with "required" they must treat it as if they do not support it
+ * at all.
*/
public void testMissingRequire() throws Exception {
String script = "if address :contains [\"To\", \"From\"] \"Fish!\"{ bogus \"aFolder\"; }";
@@ -78,12 +79,13 @@
JUnitUtils.parse(script);
fail("Expect exception to be throw during parse since command is missing");
} catch (ParseException e) {
-// expected
+ // expected
}
}
/**
- * Tests 3.2 Control Structure Require: Require MUST NOT be used after any other command.
+ * Tests 3.2 Control Structure Require: Require MUST NOT be used after any
+ * other command.
*/
public void testRequireAfterOtherCommand() throws Exception {
String script = "if address :contains [\"To\", \"From\"] \"Fish!\"{ fileinto \"aFolder\"; } require [\"whatever\"]; ";
@@ -91,7 +93,7 @@
JUnitUtils.parse(script);
fail("Expect exception to be throw during parse");
} catch (ParseException e) {
- //expected
+ // expected
}
}
}
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java Thu Sep 4 14:49:51 2008
@@ -19,13 +19,13 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class RequireTest
*/
@@ -58,7 +58,7 @@
/**
* Test for Command 'require' with multiple commands that are present
*/
- public void testMultipleCommandSatisfied() throws Exception {
+ public void testMultipleCommandSatisfied() throws Exception {
String script = "require [\"if\", \"elsif\", \"else\"];";
JUnitUtils.interpret(JUnitUtils.createMail(), script);
}
@@ -112,7 +112,7 @@
JUnitUtils.interpret(JUnitUtils.createMail(), script);
} catch (SyntaxException e) {
isTestPassed = true;
- }
+ }
assertTrue(isTestPassed);
}
@@ -134,7 +134,7 @@
/**
* Test for Command 'require' rejecting Blocks
*/
- public void testRejectBlock() throws Exception {
+ public void testRejectBlock() throws Exception {
boolean isTestPassed = false;
String script = "require \"if\" {stop;}";
@@ -142,7 +142,7 @@
JUnitUtils.interpret(JUnitUtils.createMail(), script);
} catch (SyntaxException e) {
isTestPassed = true;
- }
+ }
assertTrue(isTestPassed);
}
@@ -180,7 +180,7 @@
* Test for Command 'require' with a multiple commands of which one is
* absent
*/
- public void testMultipleCommandsUnsatisfied() throws Exception {
+ public void testMultipleCommandsUnsatisfied() throws Exception {
boolean isTestPassed = false;
String script = "require [\"if\", \"elsif\", \"absent\"];";
@@ -195,7 +195,7 @@
/**
* Test for Command 'require' with a multiple tests of which one is absent
*/
- public void testMultipleTestsUnsatisfied() throws Exception {
+ public void testMultipleTestsUnsatisfied() throws Exception {
boolean isTestPassed = false;
String script = "require [\"true\", \"false\", \"absent\"];";
@@ -203,7 +203,7 @@
JUnitUtils.interpret(JUnitUtils.createMail(), script);
} catch (ParseException e) {
isTestPassed = true;
- }
+ }
assertTrue(isTestPassed);
}
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java Thu Sep 4 14:49:51 2008
@@ -19,6 +19,10 @@
package org.apache.jsieve.junit;
+import javax.mail.MessagingException;
+
+import junit.framework.TestCase;
+
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.junit.commands.ThrowTestException;
import org.apache.jsieve.junit.utils.JUnitUtils;
@@ -26,10 +30,6 @@
import org.apache.jsieve.mail.SieveMailException;
import org.apache.jsieve.parser.generated.ParseException;
-import javax.mail.MessagingException;
-
-import junit.framework.TestCase;
-
/**
* Class SizeTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java Thu Sep 4 14:49:51 2008
@@ -19,6 +19,8 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.commands.ThrowTestException;
@@ -27,8 +29,6 @@
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class StopTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java Thu Sep 4 14:49:51 2008
@@ -19,14 +19,14 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.commands.ThrowTestException;
import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class TrueTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/commands/ThrowTestException.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/commands/ThrowTestException.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/commands/ThrowTestException.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/commands/ThrowTestException.java Thu Sep 4 14:49:51 2008
@@ -17,7 +17,6 @@
* under the License. *
****************************************************************/
-
package org.apache.jsieve.junit.commands;
import org.apache.jsieve.Arguments;
@@ -30,67 +29,64 @@
/**
* Class ThrowTestException implements a Sieve Command to throw a TestException.
*/
-public class ThrowTestException implements ExecutableCommand
-{
+public class ThrowTestException implements ExecutableCommand {
/**
* Class TestException
*/
- public class TestException extends SieveException
- {
+ public class TestException extends SieveException {
/**
* Constructor for TestException.
*/
- public TestException()
- {
+ public TestException() {
super();
}
/**
* Constructor for TestException.
+ *
* @param message
*/
- public TestException(String message)
- {
+ public TestException(String message) {
super(message);
}
/**
* Constructor for TestException.
+ *
* @param message
* @param cause
*/
- public TestException(String message, Throwable cause)
- {
+ public TestException(String message, Throwable cause) {
super(message, cause);
}
/**
* Constructor for TestException.
+ *
* @param cause
*/
- public TestException(Throwable cause)
- {
+ public TestException(Throwable cause) {
super(cause);
}
}
+
/**
* Constructor for ThrowTestException.
*/
- public ThrowTestException()
- {
+ public ThrowTestException() {
super();
}
/**
- * @see org.apache.jsieve.ExecutableCommand#execute(MailAdapter, Arguments, Block, SieveContext)
+ * @see org.apache.jsieve.ExecutableCommand#execute(MailAdapter, Arguments,
+ * Block, SieveContext)
*/
- public Object execute(MailAdapter mail, Arguments arguments, Block block, SieveContext context)
- throws SieveException
- {
+ public Object execute(MailAdapter mail, Arguments arguments, Block block,
+ SieveContext context) throws SieveException {
throw new TestException();
}
-
+
}
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java Thu Sep 4 14:49:51 2008
@@ -42,18 +42,17 @@
sievematch));
assertFalse(ComparatorUtils.matches("[test] a\\xafoo\\bar*\\",
sievematch));
- assertTrue(ComparatorUtils.matches("[test] a\\x?\\bar*\\",
- sievematch));
+ assertTrue(ComparatorUtils.matches("[test] a\\x?\\bar*\\", sievematch));
assertTrue(ComparatorUtils.matches("[test] a\\x?foo\\\\bar*\\",
sievematch));
- assertFalse(ComparatorUtils.matches("[test] a\\x?foobar*\\",
- sievematch));
+ assertFalse(ComparatorUtils
+ .matches("[test] a\\x?foobar*\\", sievematch));
assertFalse(ComparatorUtils.matches("[test] a\\x?foo\\bar.\\",
sievematch));
assertFalse(ComparatorUtils.matches("[test] a\\x?foo\\bar*\\\\",
sievematch));
- assertFalse(ComparatorUtils.matches("[test] a\\x?foo\\bar*",
- sievematch));
+ assertFalse(ComparatorUtils
+ .matches("[test] a\\x?foo\\bar*", sievematch));
}
/**
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/JUnitUtils.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/JUnitUtils.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/JUnitUtils.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/JUnitUtils.java Thu Sep 4 14:49:51 2008
@@ -17,7 +17,6 @@
* under the License. *
****************************************************************/
-
package org.apache.jsieve.junit.utils;
import java.io.ByteArrayInputStream;
@@ -34,55 +33,52 @@
/**
* Class JUnitUtils implements utility methods used during unit testing.
*/
-public class JUnitUtils
-{
+public class JUnitUtils {
/**
* Method interpret parses a script and evaluates it against a MailAdapter.
+ *
* @param mail
* @param script
* @throws SieveException
* @throws ParseException
*/
static public void interpret(MailAdapter mail, String script)
- throws SieveException, ParseException
- {
- new ConfigurationManager().build().interpret(
- mail,
- new ByteArrayInputStream(script.getBytes()));
+ throws SieveException, ParseException {
+ new ConfigurationManager().build().interpret(mail,
+ new ByteArrayInputStream(script.getBytes()));
}
-
+
/**
* Method interpret parses a script and evaluates it against a MailAdapter.
+ *
* @param mail
* @param script
* @throws SieveException
* @throws ParseException
*/
- static public void parse(String script)
- throws SieveException, ParseException
- {
+ static public void parse(String script) throws SieveException,
+ ParseException {
new ConfigurationManager().build().parse(
- new ByteArrayInputStream(script.getBytes()));
+ new ByteArrayInputStream(script.getBytes()));
}
-
/**
* Method createMimeMessage answers an empty MimeMessage.
+ *
* @return MimeMessage
*/
- static public MimeMessage createMimeMessage()
- {
- return new MimeMessage(
- Session.getDefaultInstance(System.getProperties()));
+ static public MimeMessage createMimeMessage() {
+ return new MimeMessage(Session.getDefaultInstance(System
+ .getProperties()));
}
/**
- * Method createMail answers a SieveMailAdapter wrapping an empty MimeMessage.
+ * Method createMail answers a SieveMailAdapter wrapping an empty
+ * MimeMessage.
*
* @return SieveEnvelopeMailAdapter
*/
- static public MailAdapter createMail()
- {
+ static public MailAdapter createMail() {
return new SieveMailAdapter(createMimeMessage());
}
@@ -92,31 +88,27 @@
*
* @return SieveEnvelopeMailAdapter
*/
- static public SieveEnvelopeMailAdapter createEnvelopeMail()
- {
+ static public SieveEnvelopeMailAdapter createEnvelopeMail() {
return new SieveEnvelopeMailAdapter(createMimeMessage());
}
-
+
/**
* Method copyMail answers a copy of our mock MailAdapter.
+ *
* @param mail
* @return MailAdapter
* @throws MessagingException
*/
static public MailAdapter copyMail(SieveMailAdapter mail)
- throws MessagingException
- {
+ throws MessagingException {
MimeMessage message = new MimeMessage(mail.getMessage());
return new SieveMailAdapter(message);
- }
-
-
+ }
/**
* Constructor for JUnitUtils.
*/
- private JUnitUtils()
- {
+ private JUnitUtils() {
super();
}
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveEnvelopeMailAdapter.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveEnvelopeMailAdapter.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveEnvelopeMailAdapter.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveEnvelopeMailAdapter.java Thu Sep 4 14:49:51 2008
@@ -17,7 +17,6 @@
* under the License. *
****************************************************************/
-
package org.apache.jsieve.junit.utils;
import java.util.ArrayList;
@@ -32,42 +31,44 @@
import org.apache.jsieve.mail.optional.EnvelopeAccessors;
/**
- * <p>Class SieveEnvelopeMailAdapter extends class SieveMailAdapter, a mock
- * implementation of a MailAdapter, to add support for EnvelopeAccessors.<p>
+ * <p>
+ * Class SieveEnvelopeMailAdapter extends class SieveMailAdapter, a mock
+ * implementation of a MailAdapter, to add support for EnvelopeAccessors.
+ * <p>
*
- * <p>As the Envelope Test is an optional Sieve test, MailAdapter support for the
- * interface is optional too.</p>
+ * <p>
+ * As the Envelope Test is an optional Sieve test, MailAdapter support for the
+ * interface is optional too.
+ * </p>
*/
-public class SieveEnvelopeMailAdapter
- extends SieveMailAdapter
- implements EnvelopeAccessors
-{
+public class SieveEnvelopeMailAdapter extends SieveMailAdapter implements
+ EnvelopeAccessors {
/**
* The FROM address used in the SMTP MAIL command.
*/
private String fieldEnvelopeFrom;
-
+
/**
- * The TO address used in the SMTP RCPT command that resulted in this message
- * getting delivered to this user.
- */
+ * The TO address used in the SMTP RCPT command that resulted in this
+ * message getting delivered to this user.
+ */
private String fieldEnvelopeTo;
/**
* Constructor for SieveEnvelopeMailAdapter.
+ *
* @param message
*/
- public SieveEnvelopeMailAdapter(MimeMessage message)
- {
+ public SieveEnvelopeMailAdapter(MimeMessage message) {
super(message);
}
-
+
/**
* Method getEnvelopes.
+ *
* @return Map
*/
- protected Map getEnvelopes()
- {
+ protected Map getEnvelopes() {
Map envelopes = new HashMap(2);
if (null != getEnvelopeFrom())
envelopes.put("From", getEnvelopeFrom());
@@ -75,12 +76,11 @@
envelopes.put("To", getEnvelopeTo());
return envelopes;
}
-
+
/**
* @see org.apache.jsieve.mail.optional.EnvelopeAccessors#getEnvelope(String)
*/
- public List getEnvelope(String name) throws SieveMailException
- {
+ public List getEnvelope(String name) throws SieveMailException {
List values = new ArrayList(1);
Object value = getEnvelopes().get(name);
if (null != value)
@@ -91,20 +91,17 @@
/**
* @see org.apache.jsieve.mail.optional.EnvelopeAccessors#getEnvelopeNames()
*/
- public List getEnvelopeNames() throws SieveMailException
- {
+ public List getEnvelopeNames() throws SieveMailException {
return new ArrayList(getEnvelopes().keySet());
}
/**
* @see org.apache.jsieve.mail.optional.EnvelopeAccessors#getMatchingEnvelope(String)
*/
- public List getMatchingEnvelope(String name) throws SieveMailException
- {
+ public List getMatchingEnvelope(String name) throws SieveMailException {
Iterator envelopeNamesIter = getEnvelopeNames().iterator();
List matchedEnvelopeValues = new ArrayList(32);
- while (envelopeNamesIter.hasNext())
- {
+ while (envelopeNamesIter.hasNext()) {
String envelopeName = (String) envelopeNamesIter.next();
if (envelopeName.trim().equalsIgnoreCase(name))
matchedEnvelopeValues.addAll(getEnvelope(envelopeName));
@@ -115,37 +112,39 @@
/**
* Returns the from.
+ *
* @return String
*/
- public String getEnvelopeFrom()
- {
+ public String getEnvelopeFrom() {
return fieldEnvelopeFrom;
}
/**
* Returns the recipient.
+ *
* @return String
*/
- public String getEnvelopeTo()
- {
+ public String getEnvelopeTo() {
return fieldEnvelopeTo;
}
/**
* Sets the from.
- * @param from The from to set
+ *
+ * @param from
+ * The from to set
*/
- public void setEnvelopeFrom(String from)
- {
+ public void setEnvelopeFrom(String from) {
fieldEnvelopeFrom = from;
}
/**
* Sets the recipient.
- * @param recipient The recipient to set
+ *
+ * @param recipient
+ * The recipient to set
*/
- public void setEnvelopeTo(String recipient)
- {
+ public void setEnvelopeTo(String recipient) {
fieldEnvelopeTo = recipient;
}
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java Thu Sep 4 14:49:51 2008
@@ -17,7 +17,6 @@
* under the License. *
****************************************************************/
-
package org.apache.jsieve.junit.utils;
import java.io.IOException;
@@ -44,114 +43,114 @@
import org.apache.jsieve.parser.address.SieveAddressBuilder;
/**
- * <p>Class SieveMailAdapter implements a mock MailAdapter for testing purposes.</p>
+ * <p>
+ * Class SieveMailAdapter implements a mock MailAdapter for testing purposes.
+ * </p>
*
- * <p>Being a mock object, Actions are not performed against a mail server, but in
- * most other respects it behaves as would expect a MailAdapter wrapping a JavaMail
- * message should. To this extent, it is a useful demonstration of how to create an
- * implementation of a MailAdapter.
+ * <p>
+ * Being a mock object, Actions are not performed against a mail server, but in
+ * most other respects it behaves as would expect a MailAdapter wrapping a
+ * JavaMail message should. To this extent, it is a useful demonstration of how
+ * to create an implementation of a MailAdapter.
*/
-public class SieveMailAdapter implements MailAdapter
-{
+public class SieveMailAdapter implements MailAdapter {
private Log log = LogFactory.getLog(SieveMailAdapter.class);
-
+
/**
* The message being adapted.
- */
+ */
private MimeMessage fieldMessage;
-
+
/**
* List of Actions to perform.
- */
+ */
private List fieldActions;
/**
* Constructor for SieveMailAdapter.
*/
- private SieveMailAdapter()
- {
+ private SieveMailAdapter() {
super();
}
-
+
/**
* Constructor for SieveMailAdapter.
+ *
* @param message
*/
- public SieveMailAdapter(MimeMessage message)
- {
+ public SieveMailAdapter(MimeMessage message) {
this();
setMessage(message);
- }
+ }
/**
* Returns the message.
+ *
* @return MimeMessage
*/
- public MimeMessage getMessage()
- {
+ public MimeMessage getMessage() {
return fieldMessage;
}
/**
* Sets the message.
- * @param message The message to set
+ *
+ * @param message
+ * The message to set
*/
- protected void setMessage(MimeMessage message)
- {
+ protected void setMessage(MimeMessage message) {
fieldMessage = message;
}
/**
* Returns the List of actions.
+ *
* @return List
*/
- public List getActions()
- {
+ public List getActions() {
List actions = null;
- if (null == (actions = getActionsBasic()))
- {
+ if (null == (actions = getActionsBasic())) {
updateActions();
return getActions();
- }
+ }
return actions;
}
-
+
/**
* Returns a new List of actions.
+ *
* @return List
*/
- protected List computeActions()
- {
+ protected List computeActions() {
return new ArrayList();
- }
-
+ }
+
/**
* Returns the List of actions.
+ *
* @return List
*/
- private List getActionsBasic()
- {
+ private List getActionsBasic() {
return fieldActions;
- }
+ }
/**
* Adds an Action.
- * @param action The action to set
+ *
+ * @param action
+ * The action to set
*/
- public void addAction(Action action)
- {
+ public void addAction(Action action) {
getActions().add(action);
}
-
+
/**
* @see org.apache.jsieve.mail.MailAdapter#executeActions()
*/
- public void executeActions() throws SieveException
- {
+ public void executeActions() throws SieveException {
boolean isDebugEnabled = log.isDebugEnabled();
ListIterator actionsIter = getActionsIterator();
- while (actionsIter.hasNext())
- {
+ while (actionsIter.hasNext()) {
Action action = (Action) actionsIter.next();
if (isDebugEnabled)
log.debug("Executing " + action.toString());
@@ -161,42 +160,36 @@
/**
* Sets the actions.
- * @param actions The actions to set
+ *
+ * @param actions
+ * The actions to set
*/
- protected void setActions(List actions)
- {
+ protected void setActions(List actions) {
fieldActions = actions;
}
-
+
/**
* Updates the actions.
*/
- protected void updateActions()
- {
+ protected void updateActions() {
setActions(computeActions());
- }
+ }
/**
* @see org.apache.jsieve.mail.MailAdapter#getActionsIterator()
*/
- public ListIterator getActionsIterator()
- {
+ public ListIterator getActionsIterator() {
return getActions().listIterator();
}
/**
* @see org.apache.jsieve.mail.MailAdapter#getHeader(String)
*/
- public List getHeader(String name) throws SieveMailException
- {
- try
- {
+ public List getHeader(String name) throws SieveMailException {
+ try {
String[] headers = getMessage().getHeader(name);
- return (
- headers == null ? new ArrayList(0) : Arrays.asList(headers));
- }
- catch (MessagingException ex)
- {
+ return (headers == null ? new ArrayList(0) : Arrays.asList(headers));
+ } catch (MessagingException ex) {
throw new SieveMailException(ex);
}
}
@@ -204,20 +197,15 @@
/**
* @see org.apache.jsieve.mail.MailAdapter#getHeaderNames()
*/
- public List getHeaderNames() throws SieveMailException
- {
+ public List getHeaderNames() throws SieveMailException {
Set headerNames = new HashSet();
- try
- {
+ try {
Enumeration allHeaders = getMessage().getAllHeaders();
- while (allHeaders.hasMoreElements())
- {
+ while (allHeaders.hasMoreElements()) {
headerNames.add(((Header) allHeaders.nextElement()).getName());
}
return new ArrayList(headerNames);
- }
- catch (MessagingException ex)
- {
+ } catch (MessagingException ex) {
throw new SieveMailException(ex);
}
}
@@ -225,23 +213,17 @@
/**
* @see org.apache.jsieve.mail.MailAdapter#getMatchingHeader(String)
*/
- public List getMatchingHeader(String name)
- throws SieveMailException
- {
+ public List getMatchingHeader(String name) throws SieveMailException {
return MailUtils.getMatchingHeader(this, name);
}
/**
* @see org.apache.jsieve.mail.MailAdapter#getSize()
*/
- public int getSize() throws SieveMailException
- {
- try
- {
+ public int getSize() throws SieveMailException {
+ try {
return getMessage().getSize();
- }
- catch (MessagingException ex)
- {
+ } catch (MessagingException ex) {
throw new SieveMailException(ex);
}
}
@@ -249,14 +231,10 @@
/**
* @see org.apache.jsieve.mail.MailAdapter#getContentType()
*/
- public String getContentType() throws SieveMailException
- {
- try
- {
+ public String getContentType() throws SieveMailException {
+ try {
return getMessage().getContentType();
- }
- catch (MessagingException ex)
- {
+ } catch (MessagingException ex) {
throw new SieveMailException(ex);
}
}
@@ -264,40 +242,35 @@
/**
* @see org.apache.jsieve.mail.MailAdapter#getContent()
*/
- public Object getContent() throws SieveMailException
- {
- try
- {
+ public Object getContent() throws SieveMailException {
+ try {
return getMessage().getContent();
- }
- catch (MessagingException ex)
- {
+ } catch (MessagingException ex) {
throw new SieveMailException(ex);
- }
- catch (IOException ex)
- {
+ } catch (IOException ex) {
throw new SieveMailException(ex);
}
}
- public Address[] parseAddresses(final String headerName) throws SieveMailException {
- return parseAddresses(headerName, getMessage());
+ public Address[] parseAddresses(final String headerName)
+ throws SieveMailException {
+ return parseAddresses(headerName, getMessage());
}
/**
* Parses the value from the given message into addresses.
*
* @param headerName
- * header name, to be matched case insensitively
+ * header name, to be matched case insensitively
* @param message
- * <code>Message</code>, not null
+ * <code>Message</code>, not null
* @return <code>Address</code> array, not null possibly empty
* @throws SieveMailException
*/
public Address[] parseAddresses(final String headerName,
final Message message) throws SieveMailException {
try {
- final SieveAddressBuilder builder = new SieveAddressBuilder();
+ final SieveAddressBuilder builder = new SieveAddressBuilder();
for (Enumeration en = message.getAllHeaders(); en.hasMoreElements();) {
final Header header = (Header) en.nextElement();
@@ -311,11 +284,10 @@
return results;
} catch (MessagingException ex) {
- throw new SieveMailException(ex);
+ throw new SieveMailException(ex);
} catch (org.apache.jsieve.parser.generated.address.ParseException ex) {
throw new SieveMailException(ex);
}
}
-
}
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java Thu Sep 4 14:49:51 2008
@@ -70,7 +70,7 @@
* execution.
*
* @param mail
- * <code>Message</code>, possibly null
+ * <code>Message</code>, possibly null
*/
public void setMail(Message mail) {
this.mail = mail;
@@ -285,16 +285,16 @@
* Parses the value from the given message into addresses.
*
* @param headerName
- * header name, to be matched case insensitively
+ * header name, to be matched case insensitively
* @param message
- * <code>Message</code>, not null
+ * <code>Message</code>, not null
* @return <code>Address</code> array, not null possibly empty
* @throws SieveMailException
*/
public Address[] parseAddresses(final String headerName,
final Message message) throws SieveMailException {
try {
- final SieveAddressBuilder builder = new SieveAddressBuilder();
+ final SieveAddressBuilder builder = new SieveAddressBuilder();
for (Enumeration en = message.getAllHeaders(); en.hasMoreElements();) {
final Header header = (Header) en.nextElement();
@@ -308,7 +308,7 @@
return results;
} catch (MessagingException ex) {
- throw new SieveMailException(ex);
+ throw new SieveMailException(ex);
} catch (org.apache.jsieve.parser.generated.address.ParseException ex) {
throw new SieveMailException(ex);
}
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptChecker.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptChecker.java?rev=692268&r1=692267&r2=692268&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptChecker.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptChecker.java Thu Sep 4 14:49:51 2008
@@ -29,7 +29,6 @@
import javax.mail.internet.MimeMessage;
import org.apache.jsieve.ConfigurationManager;
-import org.apache.jsieve.SieveFactory;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.mail.ActionFileInto;
import org.apache.jsieve.mail.ActionKeep;
@@ -54,10 +53,10 @@
* executing it against the given message.
*
* @param message
- * <code>File</code> containing the mail message to be fed
- * to the script, not null
+ * <code>File</code> containing the mail message to be fed to
+ * the script, not null
* @param script
- * <code>File</code> containing the script to be checked
+ * <code>File</code> containing the script to be checked
* @return <code>Results</code> of that execution
* @throws IOException
* @throws MessageException
@@ -75,7 +74,7 @@
* executing it against the given message.
*
* @param script
- * <code>InputStream</code>, not null
+ * <code>InputStream</code>, not null
* @return <code>Results</code> of the check, not null
* @throws IOException
* @throws MessagingException
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org