Modified: james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java URL: http://svn.apache.org/viewvc/james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java?rev=1425738&r1=1425737&r2=1425738&view=diff ============================================================================== --- james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java (original) +++ james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java Tue Dec 25 11:13:00 2012 @@ -19,13 +19,14 @@ package org.apache.jsieve.util.check; -import java.util.List; - -import junit.framework.TestCase; - import org.apache.jsieve.javaxmail.MockMimeMessage; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.util.List; -public class ScriptCheckMailAdapterHeadersTest extends TestCase { +public class ScriptCheckMailAdapterHeadersTest { private static final String BCC = "Bcc"; private static final String TO = "To"; @@ -55,8 +56,8 @@ public class ScriptCheckMailAdapterHeade MockMimeMessage message; - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { adapter = new ScriptCheckMailAdapter(); message = new MockMimeMessage(); message.addHeader(FROM, FROM_ADDRESS); @@ -71,66 +72,70 @@ public class ScriptCheckMailAdapterHeade adapter.setMail(message); } + @Test public void testGetHeader() throws Exception { List<String> headers = adapter.getHeader(FROM); - assertNotNull(headers); - assertEquals("From header", 1, headers.size()); - assertEquals("From header", FROM_ADDRESS, headers.get(0)); + Assert.assertNotNull(headers); + Assert.assertEquals("From header", 1, headers.size()); + Assert.assertEquals("From header", FROM_ADDRESS, headers.get(0)); headers = adapter.getHeader(BCC); - assertEquals("Bcc headers", 2, headers.size()); - assertTrue("Bcc headers", headers.contains(BCC_ADDRESS_ONE)); - assertTrue("Bcc headers", headers.contains(BCC_ADDRESS_TWO)); + Assert.assertEquals("Bcc headers", 2, headers.size()); + Assert.assertTrue("Bcc headers", headers.contains(BCC_ADDRESS_ONE)); + Assert.assertTrue("Bcc headers", headers.contains(BCC_ADDRESS_TWO)); headers = adapter.getHeader(X_HEADER_NAME); - assertEquals("Case and whitespace sensitive", 1, headers.size()); - assertEquals("Case and whitespace sensitive", X_HEADER_VALUE, headers + Assert.assertEquals("Case and whitespace sensitive", 1, headers.size()); + Assert.assertEquals("Case and whitespace sensitive", X_HEADER_VALUE, headers .get(0)); headers = adapter.getHeader(X_HEADER_NAME.toLowerCase()); - assertEquals("Case and whitespace sensitive", 1, headers.size()); - assertEquals("Case and whitespace sensitive", X_HEADER_VALUE + Assert.assertEquals("Case and whitespace sensitive", 1, headers.size()); + Assert.assertEquals("Case and whitespace sensitive", X_HEADER_VALUE .toLowerCase(), headers.get(0)); headers = adapter.getHeader(X_HEADER_WITH_WS); - assertEquals("Case and whitespace sensitive", 1, headers.size()); - assertEquals("Case and whitespace sensitive", X_HEADER_VALUE_ALT, + Assert.assertEquals("Case and whitespace sensitive", 1, headers.size()); + Assert.assertEquals("Case and whitespace sensitive", X_HEADER_VALUE_ALT, headers.get(0)); } + @Test public void testGetHeaderNames() throws Exception { List headers = adapter.getHeaderNames(); - assertNotNull(headers); - assertEquals("All headers set returned", 6, headers.size()); - assertTrue("All headers set returned", headers.contains(BCC)); - assertTrue("All headers set returned", headers.contains(TO)); - assertTrue("All headers set returned", headers.contains(FROM)); - assertTrue("All headers set returned", headers.contains(X_HEADER_NAME)); - assertTrue("All headers set returned", headers.contains(X_HEADER_NAME + Assert.assertNotNull(headers); + Assert.assertEquals("All headers set returned", 6, headers.size()); + Assert.assertTrue("All headers set returned", headers.contains(BCC)); + Assert.assertTrue("All headers set returned", headers.contains(TO)); + Assert.assertTrue("All headers set returned", headers.contains(FROM)); + Assert.assertTrue("All headers set returned", headers.contains(X_HEADER_NAME)); + Assert.assertTrue("All headers set returned", headers.contains(X_HEADER_NAME .toLowerCase())); - assertTrue("All headers set returned", headers + Assert.assertTrue("All headers set returned", headers .contains(X_HEADER_WITH_WS)); } + @Test public void testGetMatchingHeader() throws Exception { List<String> headers = adapter.getMatchingHeader(FROM); - assertNotNull(headers); - assertEquals("From headers set returned", 1, headers.size()); - assertTrue("From headers set returned", headers.contains(FROM_ADDRESS)); + Assert.assertNotNull(headers); + Assert.assertEquals("From headers set returned", 1, headers.size()); + Assert.assertTrue("From headers set returned", headers.contains(FROM_ADDRESS)); headers = adapter.getMatchingHeader(X_HEADER_NAME); - assertNotNull(headers); - assertEquals( + Assert.assertNotNull(headers); + Assert.assertEquals( "Matches ignoring whitespace and capitalisation headers set returned", 3, headers.size()); - assertTrue( + Assert.assertTrue( "Matches ignoring whitespace and capitalisation headers set returned", headers.contains(X_HEADER_VALUE)); - assertTrue( + Assert.assertTrue( "Matches ignoring whitespace and capitalisation headers set returned", headers.contains(X_HEADER_VALUE_ALT)); - assertTrue( + Assert.assertTrue( "Matches ignoring whitespace and capitalisation headers set returned", headers.contains(X_HEADER_VALUE.toLowerCase())); } + @Test public void testGetSize() throws Exception { int size = adapter.getSize(); - assertEquals("Message size set", MESSAGE_SIZE, size); + Assert.assertEquals("Message size set", MESSAGE_SIZE, size); } }
Modified: james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterMailTest.java URL: http://svn.apache.org/viewvc/james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterMailTest.java?rev=1425738&r1=1425737&r2=1425738&view=diff ============================================================================== --- james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterMailTest.java (original) +++ james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterMailTest.java Tue Dec 25 11:13:00 2012 @@ -19,11 +19,12 @@ package org.apache.jsieve.util.check; -import junit.framework.TestCase; - import org.apache.jsieve.mail.Action; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; -public class ScriptCheckMailAdapterMailTest extends TestCase { +public class ScriptCheckMailAdapterMailTest { ScriptCheckMailAdapter adapter; @@ -31,23 +32,24 @@ public class ScriptCheckMailAdapterMailT Action anotherAction; - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { adapter = new ScriptCheckMailAdapter(); action = new MockAction(); anotherAction = new MockAction(); } + @Test public void testSetMail() throws Exception { adapter.addAction(action); adapter.addAction(anotherAction); adapter.executeActions(); - assertEquals("Two actions executed", 2, adapter.getExecutedActions() + Assert.assertEquals("Two actions executed", 2, adapter.getExecutedActions() .size()); - assertEquals("Two actions", 2, adapter.getActions().size()); + Assert.assertEquals("Two actions", 2, adapter.getActions().size()); adapter.setMail(null); - assertEquals("Set mail resets", 0, adapter.getExecutedActions().size()); - assertEquals("Set mail resets", 0, adapter.getActions().size()); + Assert.assertEquals("Set mail resets", 0, adapter.getExecutedActions().size()); + Assert.assertEquals("Set mail resets", 0, adapter.getActions().size()); } } Modified: james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterNoMessageSetTest.java URL: http://svn.apache.org/viewvc/james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterNoMessageSetTest.java?rev=1425738&r1=1425737&r2=1425738&view=diff ============================================================================== --- james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterNoMessageSetTest.java (original) +++ james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterNoMessageSetTest.java Tue Dec 25 11:13:00 2012 @@ -19,36 +19,42 @@ package org.apache.jsieve.util.check; -import java.util.List; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; -import junit.framework.TestCase; +import java.util.List; -public class ScriptCheckMailAdapterNoMessageSetTest extends TestCase { +public class ScriptCheckMailAdapterNoMessageSetTest { ScriptCheckMailAdapter adapter; - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { adapter = new ScriptCheckMailAdapter(); } + @Test public void testGetHeader() throws Exception { List<String> headers = adapter.getHeader("From"); - assertNotNull(headers); + Assert.assertNotNull(headers); } + @Test public void testGetHeaderNames() throws Exception { List headers = adapter.getHeaderNames(); - assertNotNull(headers); + Assert.assertNotNull(headers); } + @Test public void testGetMatchingHeader() throws Exception { List headers = adapter.getMatchingHeader("From"); - assertNotNull(headers); + Assert.assertNotNull(headers); } - public void tesGetSize() throws Exception { + @Test + public void testGetSize() throws Exception { int size = adapter.getSize(); - assertEquals("When mail not set, size is zero", 0, size); + Assert.assertEquals("When mail not set, size is zero", 0, size); } } Modified: james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java URL: http://svn.apache.org/viewvc/james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java?rev=1425738&r1=1425737&r2=1425738&view=diff ============================================================================== --- james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java (original) +++ james/jsieve/trunk/core/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java Tue Dec 25 11:13:00 2012 @@ -19,17 +19,18 @@ package org.apache.jsieve.util.check; -import java.util.Arrays; - -import junit.framework.TestCase; - import org.apache.jsieve.mail.Action; import org.apache.jsieve.mail.ActionFileInto; import org.apache.jsieve.mail.ActionKeep; import org.apache.jsieve.mail.ActionRedirect; import org.apache.jsieve.mail.ActionReject; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.util.Arrays; -public class ScriptCheckerTestActionsTest extends TestCase { +public class ScriptCheckerTestActionsTest { private static final String REDIRECT_ADDRESS_TWO = "[email protected]"; @@ -43,120 +44,124 @@ public class ScriptCheckerTestActionsTes private static final String DESTINATION_ONE = "org.apache.james"; - static final Action[] ACTIONS = { new ActionFileInto(DESTINATION_ONE), + static final Action[] ACTIONS = {new ActionFileInto(DESTINATION_ONE), new ActionKeep(), new ActionFileInto(DESTINATION_TWO), new ActionReject(REJECT_MESSAGE_ONE), new ActionRedirect(REDIRECT_ADDRESS_ONE), new ActionRedirect(REDIRECT_ADDRESS_TWO), - new ActionReject(REJECT_MESSAGE_TWO), }; + new ActionReject(REJECT_MESSAGE_TWO),}; ScriptChecker.Results result; - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { result = new ScriptChecker.Results(Arrays.asList(ACTIONS)); } + @Test public void testFileInto() throws Exception { - assertTrue("Check for file into action with right destination", result + Assert.assertTrue("Check for file into action with right destination", result .isActionFileInto(DESTINATION_ONE, 0)); - assertFalse("Check for file into action with right destination", result + Assert.assertFalse("Check for file into action with right destination", result .isActionFileInto(DESTINATION_ONE, 1)); - assertFalse("Check for file into action with right destination", result + Assert.assertFalse("Check for file into action with right destination", result .isActionFileInto(DESTINATION_ONE, 2)); - assertFalse("Check for file into action with right destination", result + Assert.assertFalse("Check for file into action with right destination", result .isActionFileInto(DESTINATION_ONE, 3)); - assertFalse("Check for file into action with right destination", result + Assert.assertFalse("Check for file into action with right destination", result .isActionFileInto(DESTINATION_ONE, 4)); - assertFalse("Check for file into action with right destination", result + Assert.assertFalse("Check for file into action with right destination", result .isActionFileInto(DESTINATION_ONE, 5)); - assertFalse("Check for file into action with right destination", result + Assert.assertFalse("Check for file into action with right destination", result .isActionFileInto(DESTINATION_ONE, 6)); - assertFalse("Check for file into action with right destination", result + Assert.assertFalse("Check for file into action with right destination", result .isActionFileInto(DESTINATION_TWO, 0)); - assertFalse("Check for file into action with right destination", result + Assert.assertFalse("Check for file into action with right destination", result .isActionFileInto(DESTINATION_TWO, 1)); - assertTrue("Check for file into action with right destination", result + Assert.assertTrue("Check for file into action with right destination", result .isActionFileInto(DESTINATION_TWO, 2)); - assertFalse("Check for file into action with right destination", result + Assert.assertFalse("Check for file into action with right destination", result .isActionFileInto(DESTINATION_TWO, 3)); - assertFalse("Check for file into action with right destination", result + Assert.assertFalse("Check for file into action with right destination", result .isActionFileInto(DESTINATION_TWO, 4)); - assertFalse("Check for file into action with right destination", result + Assert.assertFalse("Check for file into action with right destination", result .isActionFileInto(DESTINATION_TWO, 5)); - assertFalse("Check for file into action with right destination", result + Assert.assertFalse("Check for file into action with right destination", result .isActionFileInto(DESTINATION_TWO, 6)); } + @Test public void testRedirect() throws Exception { - assertFalse("Check for redirect action with right message", result + Assert.assertFalse("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_ONE, 0)); - assertFalse("Check for redirect action with right message", result + Assert.assertFalse("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_ONE, 1)); - assertFalse("Check for redirect action with right message", result + Assert.assertFalse("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_ONE, 2)); - assertFalse("Check for redirect action with right message", result + Assert.assertFalse("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_ONE, 3)); - assertTrue("Check for redirect action with right message", result + Assert.assertTrue("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_ONE, 4)); - assertFalse("Check for redirect action with right message", result + Assert.assertFalse("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_ONE, 5)); - assertFalse("Check for redirect action with right message", result + Assert.assertFalse("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_ONE, 6)); - assertFalse("Check for redirect action with right message", result + Assert.assertFalse("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_TWO, 0)); - assertFalse("Check for redirect action with right message", result + Assert.assertFalse("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_TWO, 1)); - assertFalse("Check for redirect action with right message", result + Assert.assertFalse("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_TWO, 2)); - assertFalse("Check for redirect action with right message", result + Assert.assertFalse("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_TWO, 3)); - assertFalse("Check for redirect action with right message", result + Assert.assertFalse("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_TWO, 4)); - assertTrue("Check for redirect action with right message", result + Assert.assertTrue("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_TWO, 5)); - assertFalse("Check for redirect action with right message", result + Assert.assertFalse("Check for redirect action with right message", result .isActionRedirect(REDIRECT_ADDRESS_TWO, 6)); } + @Test public void testReject() throws Exception { - assertFalse("Check for reject action with right message", result + Assert.assertFalse("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_ONE, 0)); - assertFalse("Check for reject action with right message", result + Assert.assertFalse("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_ONE, 1)); - assertFalse("Check for reject action with right message", result + Assert.assertFalse("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_ONE, 2)); - assertTrue("Check for reject action with right message", result + Assert.assertTrue("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_ONE, 3)); - assertFalse("Check for reject action with right message", result + Assert.assertFalse("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_ONE, 4)); - assertFalse("Check for reject action with right message", result + Assert.assertFalse("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_ONE, 5)); - assertFalse("Check for reject action with right message", result + Assert.assertFalse("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_ONE, 6)); - assertFalse("Check for reject action with right message", result + Assert.assertFalse("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_TWO, 0)); - assertFalse("Check for reject action with right message", result + Assert.assertFalse("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_TWO, 1)); - assertFalse("Check for reject action with right message", result + Assert.assertFalse("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_TWO, 2)); - assertFalse("Check for reject action with right message", result + Assert.assertFalse("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_TWO, 3)); - assertFalse("Check for reject action with right message", result + Assert.assertFalse("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_TWO, 4)); - assertFalse("Check for reject action with right message", result + Assert.assertFalse("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_TWO, 5)); - assertTrue("Check for reject action with right message", result + Assert.assertTrue("Check for reject action with right message", result .isActionReject(REJECT_MESSAGE_TWO, 6)); } + @Test public void testKeep() throws Exception { - assertFalse("Check for keep action ", result.isActionKeep(0)); - assertTrue("Check for keep action ", result.isActionKeep(1)); - assertFalse("Check for keep action ", result.isActionKeep(2)); - assertFalse("Check for keep action ", result.isActionKeep(3)); - assertFalse("Check for keep action ", result.isActionKeep(4)); - assertFalse("Check for keep action ", result.isActionKeep(5)); - assertFalse("Check for keep action ", result.isActionKeep(6)); + Assert.assertFalse("Check for keep action ", result.isActionKeep(0)); + Assert.assertTrue("Check for keep action ", result.isActionKeep(1)); + Assert.assertFalse("Check for keep action ", result.isActionKeep(2)); + Assert.assertFalse("Check for keep action ", result.isActionKeep(3)); + Assert.assertFalse("Check for keep action ", result.isActionKeep(4)); + Assert.assertFalse("Check for keep action ", result.isActionKeep(5)); + Assert.assertFalse("Check for keep action ", result.isActionKeep(6)); } } Modified: james/jsieve/trunk/manager/pom.xml URL: http://svn.apache.org/viewvc/james/jsieve/trunk/manager/pom.xml?rev=1425738&r1=1425737&r2=1425738&view=diff ============================================================================== --- james/jsieve/trunk/manager/pom.xml (original) +++ james/jsieve/trunk/manager/pom.xml Tue Dec 25 11:13:00 2012 @@ -36,7 +36,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.10</version> <scope>test</scope> </dependency> </dependencies> Modified: james/jsieve/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/jsieve/trunk/pom.xml?rev=1425738&r1=1425737&r2=1425738&view=diff ============================================================================== --- james/jsieve/trunk/pom.xml (original) +++ james/jsieve/trunk/pom.xml Tue Dec 25 11:13:00 2012 @@ -78,7 +78,7 @@ <target.jdk>1.6</target.jdk> <mime4j.version>0.7.2</mime4j.version> <apache-mailet.version>2.5.0-SNAPSHOT</apache-mailet.version> - <junit.version>3.8.2</junit.version> + <junit.version>4.10</junit.version> <jmock.version>1.2.0</jmock.version> <log4j.version>1.2.14</log4j.version> <mail.version>1.4.4</mail.version> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
