Modified: james/mailet/trunk/standard/src/test/java/org/apache/james/mailet/standard/matchers/NESSpamCheckTest.java URL: http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/mailet/standard/matchers/NESSpamCheckTest.java?rev=1425932&r1=1425931&r2=1425932&view=diff ============================================================================== --- james/mailet/trunk/standard/src/test/java/org/apache/james/mailet/standard/matchers/NESSpamCheckTest.java (original) +++ james/mailet/trunk/standard/src/test/java/org/apache/james/mailet/standard/matchers/NESSpamCheckTest.java Wed Dec 26 14:54:48 2012 @@ -20,21 +20,21 @@ package org.apache.james.mailet.standard.matchers; -import junit.framework.TestCase; +import org.apache.mailet.MailAddress; +import org.apache.mailet.Matcher; +import org.apache.mailet.base.RFC2822Headers; 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 org.apache.mailet.MailAddress; -import org.apache.mailet.Matcher; -import org.apache.mailet.base.RFC2822Headers; +import org.junit.Assert; +import org.junit.Test; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import java.io.UnsupportedEncodingException; import java.util.Collection; -public class NESSpamCheckTest extends TestCase { +public class NESSpamCheckTest { private MimeMessage mockedMimeMessage; @@ -46,10 +46,6 @@ public class NESSpamCheckTest extends Te private String headerValue = "defaultHeaderValue"; - public NESSpamCheckTest(String arg0) throws UnsupportedEncodingException { - super(arg0); - } - private void setHeaderName(String headerName) { this.headerName = headerName; } @@ -69,6 +65,7 @@ public class NESSpamCheckTest extends Te matcher.init(mci); } + @Test public void testNESSpamCheckMatched() throws MessagingException { setHeaderName(RFC2822Headers.RECEIVED); setHeaderValue("xxxxxxxxxxxxxxxxxxxxx"); @@ -79,10 +76,11 @@ public class NESSpamCheckTest extends Te Collection<MailAddress> matchedRecipients = matcher.match(mockedMail); - assertNotNull(matchedRecipients); - assertEquals(matchedRecipients.size(), mockedMail.getRecipients().size()); + Assert.assertNotNull(matchedRecipients); + Assert.assertEquals(matchedRecipients.size(), mockedMail.getRecipients().size()); } + @Test public void testNESSpamCheckNotMatched() throws MessagingException { setupMockedMimeMessage(); mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage); @@ -90,6 +88,6 @@ public class NESSpamCheckTest extends Te Collection<MailAddress> matchedRecipients = matcher.match(mockedMail); - assertNull(matchedRecipients); + Assert.assertNull(matchedRecipients); } }
Modified: james/mailet/trunk/standard/src/test/java/org/apache/james/mailet/standard/matchers/SMTPIsAuthNetworkTest.java URL: http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/mailet/standard/matchers/SMTPIsAuthNetworkTest.java?rev=1425932&r1=1425931&r2=1425932&view=diff ============================================================================== --- james/mailet/trunk/standard/src/test/java/org/apache/james/mailet/standard/matchers/SMTPIsAuthNetworkTest.java (original) +++ james/mailet/trunk/standard/src/test/java/org/apache/james/mailet/standard/matchers/SMTPIsAuthNetworkTest.java Wed Dec 26 14:54:48 2012 @@ -20,22 +20,20 @@ package org.apache.james.mailet.standard.matchers; -import java.io.UnsupportedEncodingException; -import java.util.Collection; - -import javax.mail.MessagingException; -import javax.mail.internet.ParseException; - -import junit.framework.TestCase; - -import org.apache.mailet.base.test.MailUtil; +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.MailAddress; -import org.apache.mailet.Matcher; +import org.apache.mailet.base.test.MailUtil; +import org.junit.Assert; +import org.junit.Test; -public class SMTPIsAuthNetworkTest extends TestCase { +import javax.mail.MessagingException; +import javax.mail.internet.ParseException; +import java.util.Collection; + +public class SMTPIsAuthNetworkTest { private FakeMail mockedMail; @@ -43,11 +41,6 @@ public class SMTPIsAuthNetworkTest exten private boolean isAuthorized = false; - public SMTPIsAuthNetworkTest(String arg0) - throws UnsupportedEncodingException { - super(arg0); - } - private void setIsAuthorized(boolean isAuthorized) { this.isAuthorized = isAuthorized; } @@ -67,6 +60,7 @@ public class SMTPIsAuthNetworkTest exten matcher.init(mci); } + @Test public void testIsAuthNetwork() throws MessagingException { setIsAuthorized(true); setupMockedMail(); @@ -74,11 +68,12 @@ public class SMTPIsAuthNetworkTest exten Collection<MailAddress> matchedRecipients = matcher.match(mockedMail); - assertNotNull(matchedRecipients); - assertEquals(matchedRecipients.size(), mockedMail.getRecipients() + Assert.assertNotNull(matchedRecipients); + Assert.assertEquals(matchedRecipients.size(), mockedMail.getRecipients() .size()); } + @Test public void testIsNotAuthNetwork() throws MessagingException { setIsAuthorized(false); setupMockedMail(); @@ -86,6 +81,6 @@ public class SMTPIsAuthNetworkTest exten Collection<MailAddress> matchedRecipients = matcher.match(mockedMail); - assertNull(matchedRecipients); + Assert.assertNull(matchedRecipients); } } Modified: james/mailet/trunk/standard/src/test/java/org/apache/james/mailet/standard/matchers/SizeGreaterThanTest.java URL: http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/mailet/standard/matchers/SizeGreaterThanTest.java?rev=1425932&r1=1425931&r2=1425932&view=diff ============================================================================== --- james/mailet/trunk/standard/src/test/java/org/apache/james/mailet/standard/matchers/SizeGreaterThanTest.java (original) +++ james/mailet/trunk/standard/src/test/java/org/apache/james/mailet/standard/matchers/SizeGreaterThanTest.java Wed Dec 26 14:54:48 2012 @@ -20,32 +20,25 @@ package org.apache.james.mailet.standard.matchers; +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.MailAddress; -import org.apache.mailet.Matcher; +import org.junit.Assert; +import org.junit.Test; import javax.mail.MessagingException; import javax.mail.internet.ParseException; - -import java.io.UnsupportedEncodingException; import java.util.Arrays; import java.util.Collection; -import junit.framework.TestCase; - -public class SizeGreaterThanTest extends TestCase { +public class SizeGreaterThanTest { private FakeMail mockedMail; private Matcher matcher; - public SizeGreaterThanTest(String arg0) throws UnsupportedEncodingException { - super(arg0); - } - private void setupMockedMail(long size) throws ParseException { mockedMail = new FakeMail(); mockedMail.setMessageSize(size); @@ -60,33 +53,36 @@ public class SizeGreaterThanTest extends matcher.init(mci); } - + + @Test public void testSizeGreater() throws MessagingException { - setupMockedMail(2000000); + setupMockedMail(2000000); setupMatcher("1m"); Collection<MailAddress> matchedRecipients = matcher.match(mockedMail); - assertNotNull(matchedRecipients); - assertEquals(matchedRecipients.size(), mockedMail.getRecipients().size()); + Assert.assertNotNull(matchedRecipients); + Assert.assertEquals(matchedRecipients.size(), mockedMail.getRecipients().size()); } - + + @Test public void testSizeNotGreater() throws MessagingException { setupMockedMail(200000); setupMatcher("1m"); Collection<MailAddress> matchedRecipients = matcher.match(mockedMail); - assertNull(matchedRecipients); + Assert.assertNull(matchedRecipients); } - - public void testThrowExceptionOnInvalidAmount(){ + + @Test + public void testThrowExceptionOnInvalidAmount() { boolean exception = false; try { setupMatcher("1mb"); } catch (MessagingException e) { exception = true; } - assertTrue("Exception thrown", exception); + Assert.assertTrue("Exception thrown", exception); } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
