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 2010/12/25 22:13:46 UTC
svn commit: r1052806 - in /james/server/trunk:
core/src/test/java/org/apache/james/util/
nio-netty/src/test/java/org/apache/james/server/
pop3server/src/test/java/org/apache/james/pop3server/
remotemanager/src/test/java/org/apache/james/remotemanager/ ...
Author: norman
Date: Sat Dec 25 21:13:45 2010
New Revision: 1052806
URL: http://svn.apache.org/viewvc?rev=1052806&view=rev
Log:
Rename TestUtil to PortUtil and move it to nio-netty as it is only used by our server tests
Added:
james/server/trunk/nio-netty/src/test/java/org/apache/james/server/PortUtil.java
- copied, changed from r1050030, james/server/trunk/core/src/test/java/org/apache/james/util/TestUtil.java
Removed:
james/server/trunk/core/src/test/java/org/apache/james/util/TestUtil.java
Modified:
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
Copied: james/server/trunk/nio-netty/src/test/java/org/apache/james/server/PortUtil.java (from r1050030, james/server/trunk/core/src/test/java/org/apache/james/util/TestUtil.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/test/java/org/apache/james/server/PortUtil.java?p2=james/server/trunk/nio-netty/src/test/java/org/apache/james/server/PortUtil.java&p1=james/server/trunk/core/src/test/java/org/apache/james/util/TestUtil.java&r1=1050030&r2=1052806&rev=1052806&view=diff
==============================================================================
--- james/server/trunk/core/src/test/java/org/apache/james/util/TestUtil.java (original)
+++ james/server/trunk/nio-netty/src/test/java/org/apache/james/server/PortUtil.java Sat Dec 25 21:13:45 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.util;
+package org.apache.james.server;
@@ -28,7 +28,7 @@ import java.net.ServerSocket;
/**
* some utilities for James unit testing
*/
-public class TestUtil {
+public class PortUtil {
private static final int PORT_RANGE_START = 8000; // the lowest possible port number assigned for testing
private static final int PORT_RANGE_END = 11000; // the highest possible port number assigned for testing
Modified: james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java?rev=1052806&r1=1052805&r2=1052806&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java (original)
+++ james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java Sat Dec 25 21:13:45 2010
@@ -37,6 +37,7 @@ import org.apache.commons.logging.impl.S
import org.apache.commons.net.pop3.POP3Client;
import org.apache.commons.net.pop3.POP3MessageInfo;
import org.apache.commons.net.pop3.POP3Reply;
+import org.apache.james.server.PortUtil;
import org.apache.james.server.mock.MockJSR250Loader;
import org.apache.james.server.mock.MockProtocolHandlerChain;
import org.apache.james.dnsservice.api.DNSService;
@@ -52,11 +53,10 @@ import org.apache.james.mailbox.MailboxS
import org.apache.james.mailbox.store.Authenticator;
import org.apache.james.user.lib.mock.MockUsersRepository;
import org.apache.james.util.POP3BeforeSMTPHelper;
-import org.apache.james.util.TestUtil;
public abstract class AbstractAsyncPOP3ServerTest extends TestCase {
- private int m_pop3ListenerPort = TestUtil.getNonPrivilegedPort();
+ private int m_pop3ListenerPort = PortUtil.getNonPrivilegedPort();
private POP3TestConfiguration m_testConfiguration;
private MockUsersRepository m_usersRepository = new MockUsersRepository();
private POP3Client m_pop3Protocol = null;
Modified: james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java?rev=1052806&r1=1052805&r2=1052806&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java Sat Dec 25 21:13:45 2010
@@ -34,6 +34,7 @@ import junit.framework.TestCase;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.commons.net.telnet.TelnetClient;
+import org.apache.james.server.PortUtil;
import org.apache.james.server.mock.MockJSR250Loader;
import org.apache.james.server.mock.MockProtocolHandlerChain;
import org.apache.james.dnsservice.api.DNSService;
@@ -44,11 +45,10 @@ import org.apache.james.filesystem.api.m
import org.apache.james.mailrepository.mock.MockMailRepositoryStore;
import org.apache.james.user.lib.mock.MockUsersRepository;
import org.apache.james.util.InternetPrintWriter;
-import org.apache.james.util.TestUtil;
import org.apache.james.vut.lib.mock.MockVirtualUserTableManagementImpl;
public abstract class AbstractRemoteManagerTest extends TestCase {
- private int m_remoteManagerListenerPort = TestUtil.getNonPrivilegedPort();
+ private int m_remoteManagerListenerPort = PortUtil.getNonPrivilegedPort();
private RemoteManagerTestConfiguration m_testConfiguration;
private String m_host = "127.0.0.1";
private BufferedReader m_reader;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?rev=1052806&r1=1052805&r2=1052806&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java Sat Dec 25 21:13:45 2010
@@ -33,11 +33,11 @@ import org.apache.james.protocols.smtp.B
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.server.PortUtil;
import org.apache.james.smtpserver.fastfail.SpamAssassinHandler;
import org.apache.james.test.mock.MockMimeMessage;
import org.apache.james.test.mock.mailet.MockMail;
import org.apache.james.test.mock.util.MockSpamd;
-import org.apache.james.util.TestUtil;
import org.apache.james.util.scanner.SpamAssassinInvoker;
import org.apache.mailet.Mail;
@@ -126,7 +126,7 @@ public class SpamAssassinHandlerTest ext
public void testSpam() throws IOException, MessagingException {
- int port = TestUtil.getNonPrivilegedPort();
+ int port = PortUtil.getNonPrivilegedPort();
new Thread(new MockSpamd(port)).start();
SMTPSession session = setupMockedSMTPSession(setupMockedMail(setupMockedMimeMessage(MockSpamd.GTUBE)));
@@ -147,7 +147,7 @@ public class SpamAssassinHandlerTest ext
public void testSpamReject() throws IOException, MessagingException {
- int port = TestUtil.getNonPrivilegedPort();
+ int port = PortUtil.getNonPrivilegedPort();
new Thread(new MockSpamd(port)).start();
SMTPSession session = setupMockedSMTPSession(setupMockedMail(setupMockedMimeMessage(MockSpamd.GTUBE)));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org