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 2011/12/23 08:28:02 UTC
svn commit: r1222593 - in /james/protocols/trunk: ./ api/
api/src/test/java/org/apache/james/protocols/api/
smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/
Author: norman
Date: Fri Dec 23 07:28:02 2011
New Revision: 1222593
URL: http://svn.apache.org/viewvc?rev=1222593&view=rev
Log:
Upgrade to junit 4.10. See PROTOCOLS-67
Modified:
james/protocols/trunk/api/pom.xml
james/protocols/trunk/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
james/protocols/trunk/pom.xml
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
Modified: james/protocols/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1222593&r1=1222592&r2=1222593&view=diff
==============================================================================
--- james/protocols/trunk/api/pom.xml (original)
+++ james/protocols/trunk/api/pom.xml Fri Dec 23 07:28:02 2011
@@ -40,7 +40,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: james/protocols/trunk/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java?rev=1222593&r1=1222592&r2=1222593&view=diff
==============================================================================
--- james/protocols/trunk/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java (original)
+++ james/protocols/trunk/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java Fri Dec 23 07:28:02 2011
@@ -30,17 +30,19 @@ import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import org.apache.james.protocols.api.handler.LineHandler;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static junit.framework.Assert.*;
/**
* Test-case for PROTOCOLS-62
*
*/
-public class AbstractProtocolTransportTest extends TestCase{
+public class AbstractProtocolTransportTest {
private final static String US_ASCII = "US-ASCII";
+ @Test
public void testWriteOrder() throws InterruptedException, UnsupportedEncodingException {
final List<Response> messages = new ArrayList<Response>();
for (int i = 0; i < 2000; i++) {
@@ -50,6 +52,7 @@ public class AbstractProtocolTransportTe
checkWrittenResponses(messages);
}
+ @Test
public void testWriteOrderFutureResponseAllReady() throws InterruptedException, UnsupportedEncodingException {
final List<Response> messages = new ArrayList<Response>();
for (int i = 0; i < 2000; i++) {
@@ -61,7 +64,7 @@ public class AbstractProtocolTransportTe
}
-
+ @Test
public void testWriteOrderFutureResponse() throws InterruptedException, UnsupportedEncodingException {
final List<Response> messages = new ArrayList<Response>();
for (int i = 0; i < 2000; i++) {
@@ -73,6 +76,7 @@ public class AbstractProtocolTransportTe
checkWrittenResponses(messages);
}
+ @Test
public void testWriteOrderFutureResponseReverseNotify() throws InterruptedException, UnsupportedEncodingException {
final List<Response> messages = new ArrayList<Response>();
for (int i = 0; i < 2000; i++) {
@@ -82,6 +86,8 @@ public class AbstractProtocolTransportTe
checkWrittenResponses(messages);
}
+
+ @Test
public void testWriteOrderMixedResponse() throws InterruptedException, UnsupportedEncodingException {
final List<Response> messages = new ArrayList<Response>();
for (int i = 0; i < 2000; i++) {
Modified: james/protocols/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1222593&r1=1222592&r2=1222593&view=diff
==============================================================================
--- james/protocols/trunk/pom.xml (original)
+++ james/protocols/trunk/pom.xml Fri Dec 23 07:28:02 2011
@@ -110,7 +110,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.10</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java?rev=1222593&r1=1222592&r2=1222593&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java Fri Dec 23 07:28:02 2011
@@ -30,7 +30,7 @@ import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
+import static junit.framework.Assert.*;
import org.apache.james.protocols.api.ProtocolSession.State;
import org.apache.james.protocols.smtp.BaseFakeDNSService;
@@ -40,8 +40,10 @@ import org.apache.james.protocols.smtp.M
import org.apache.james.protocols.smtp.MailAddressException;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.fastfail.DNSRBLHandler;
+import org.junit.Before;
+import org.junit.Test;
-public class DNSRBLHandlerTest extends TestCase {
+public class DNSRBLHandlerTest {
private DNSService mockedDnsServer;
@@ -55,8 +57,8 @@ public class DNSRBLHandlerTest extends T
public static final String RBL_DETAIL_MAIL_ATTRIBUTE_NAME = "org.apache.james.smtpserver.rbl.detail";
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
setupMockedDnsServer();
setRelayingAllowed(false);
}
@@ -174,6 +176,7 @@ public class DNSRBLHandlerTest extends T
}
// ip is blacklisted and has txt details
+ @Test
public void testBlackListedTextPresent() throws MailAddressException {
DNSRBLHandler rbl = new DNSRBLHandler();
@@ -189,6 +192,7 @@ public class DNSRBLHandlerTest extends T
}
// ip is blacklisted and has txt details but we don'T want to retrieve the txt record
+ @Test
public void testGetNoDetail() throws MailAddressException {
DNSRBLHandler rbl = new DNSRBLHandler();
setupMockedSMTPSession(new MailAddress("any@domain"));
@@ -202,6 +206,7 @@ public class DNSRBLHandlerTest extends T
}
// ip is allowed to relay
+ @Test
public void testRelayAllowed() throws MailAddressException {
DNSRBLHandler rbl = new DNSRBLHandler();
setRelayingAllowed(true);
@@ -217,6 +222,7 @@ public class DNSRBLHandlerTest extends T
}
// ip not on blacklist
+ @Test
public void testNotBlackListed() throws MailAddressException {
DNSRBLHandler rbl = new DNSRBLHandler();
@@ -233,6 +239,7 @@ public class DNSRBLHandlerTest extends T
}
// ip on blacklist without txt details
+ @Test
public void testBlackListedNoTxt() throws MailAddressException {
DNSRBLHandler rbl = new DNSRBLHandler();
@@ -249,6 +256,7 @@ public class DNSRBLHandlerTest extends T
}
// ip on whitelist
+ @Test
public void testWhiteListed() throws MailAddressException {
DNSRBLHandler rbl = new DNSRBLHandler();
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java?rev=1222593&r1=1222592&r2=1222593&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java Fri Dec 23 07:28:02 2011
@@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
+import static junit.framework.Assert.*;
import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.MailAddress;
@@ -34,10 +34,11 @@ import org.apache.james.protocols.smtp.M
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.fastfail.MaxRcptHandler;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.junit.Test;
-public class MaxRcptHandlerTest extends TestCase{
+public class MaxRcptHandlerTest {
private SMTPSession setupMockedSession(final int rcptCount) {
SMTPSession session = new BaseFakeSMTPSession() {
@@ -59,6 +60,7 @@ public class MaxRcptHandlerTest extends
return session;
}
+ @Test
public void testRejectMaxRcpt() throws MailAddressException {
SMTPSession session = setupMockedSession(3);
MaxRcptHandler handler = new MaxRcptHandler();
@@ -69,7 +71,8 @@ public class MaxRcptHandlerTest extends
assertEquals("Rejected.. To many recipients", resp, HookReturnCode.DENY);
}
-
+
+ @Test
public void testNotRejectMaxRcpt() throws MailAddressException {
SMTPSession session = setupMockedSession(3);
MaxRcptHandler handler = new MaxRcptHandler();
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java?rev=1222593&r1=1222592&r2=1222593&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java Fri Dec 23 07:28:02 2011
@@ -28,12 +28,14 @@ import org.apache.james.protocols.smtp.B
import org.apache.james.protocols.smtp.MailAddressException;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static junit.framework.Assert.*;
-public class MaxUnknownCmdHandlerTest extends TestCase{
+public class MaxUnknownCmdHandlerTest {
+ @Test
public void testRejectAndClose() throws MailAddressException {
SMTPSession session = new BaseFakeSMTPSession() {
private final HashMap<String,Object> map = new HashMap<String,Object>();
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java?rev=1222593&r1=1222592&r2=1222593&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java Fri Dec 23 07:28:02 2011
@@ -27,7 +27,7 @@ import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
+import static junit.framework.Assert.*;
import org.apache.james.protocols.api.ProtocolSession.State;
import org.apache.james.protocols.smtp.BaseFakeDNSService;
@@ -38,8 +38,9 @@ import org.apache.james.protocols.smtp.M
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.fastfail.ResolvableEhloHeloHandler;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.junit.Test;
-public class ResolvableEhloHeloHandlerTest extends TestCase {
+public class ResolvableEhloHeloHandlerTest {
public final static String INVALID_HOST = "foo.bar";
@@ -123,6 +124,7 @@ public class ResolvableEhloHeloHandlerTe
return dns;
}
+ @Test
public void testRejectInvalidHelo() throws MailAddressException {
MailAddress mailAddress = new MailAddress("test@localhost");
SMTPSession session = setupMockSession(INVALID_HOST,false,false,null,mailAddress);
@@ -136,7 +138,7 @@ public class ResolvableEhloHeloHandlerTe
assertEquals("Reject", result,HookReturnCode.DENY);
}
-
+ @Test
public void testNotRejectValidHelo() throws MailAddressException {
MailAddress mailAddress = new MailAddress("test@localhost");
SMTPSession session = setupMockSession(VALID_HOST,false,false,null,mailAddress);
@@ -151,7 +153,7 @@ public class ResolvableEhloHeloHandlerTe
assertEquals("Not reject", result,HookReturnCode.DECLINED);
}
-
+ @Test
public void testRejectInvalidHeloAuthUser() throws MailAddressException {
MailAddress mailAddress = new MailAddress("test@localhost");
SMTPSession session = setupMockSession(INVALID_HOST,false,true,"valid@user",mailAddress);
@@ -168,7 +170,7 @@ public class ResolvableEhloHeloHandlerTe
}
-
+ @Test
public void testRejectRelay() throws MailAddressException {
MailAddress mailAddress = new MailAddress("test@localhost");
SMTPSession session = setupMockSession(INVALID_HOST,true,false,null,mailAddress);
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java?rev=1222593&r1=1222592&r2=1222593&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java Fri Dec 23 07:28:02 2011
@@ -29,10 +29,11 @@ import org.apache.james.protocols.smtp.M
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.fastfail.SpamTrapHandler;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static junit.framework.Assert.*;
-public class SpamTrapHandlerTest extends TestCase {
+public class SpamTrapHandlerTest {
private static final String SPAM_TRAP_RECIP1 = "spamtrap1@localhost";
private static final String RECIP1 = "recip@localhost";
@@ -50,6 +51,7 @@ public class SpamTrapHandlerTest extends
};
}
+ @Test
public void testSpamTrap() throws MailAddressException {
String ip = "192.168.100.1";
String ip2 = "192.168.100.2";
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java?rev=1222593&r1=1222592&r2=1222593&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java Fri Dec 23 07:28:02 2011
@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
+import static junit.framework.Assert.*;
import org.apache.james.protocols.api.ProtocolSession.State;
import org.apache.james.protocols.smtp.BaseFakeDNSService;
@@ -36,8 +36,9 @@ import org.apache.james.protocols.smtp.M
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.fastfail.ValidSenderDomainHandler;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.junit.Test;
-public class ValidSenderDomainHandlerTest extends TestCase {
+public class ValidSenderDomainHandlerTest {
private DNSService setupDNSServer() {
DNSService dns = new BaseFakeDNSService(){
@@ -103,6 +104,7 @@ public class ValidSenderDomainHandlerTes
// Test for JAMES-580
+ @Test
public void testNullSenderNotReject() {
ValidSenderDomainHandler handler = new ValidSenderDomainHandler();
handler.setDNSService(setupDNSServer());
@@ -111,6 +113,7 @@ public class ValidSenderDomainHandlerTes
assertEquals("Not blocked cause its a nullsender",response,HookReturnCode.DECLINED);
}
+ @Test
public void testInvalidSenderDomainReject() throws MailAddressException {
ValidSenderDomainHandler handler = new ValidSenderDomainHandler();
SMTPSession session = setupMockedSession(new MailAddress("invalid@invalid"));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org