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 er...@apache.org on 2010/09/22 17:40:35 UTC
svn commit: r1000046 - in /james/server/trunk:
core-library/src/test/java/org/apache/james/services/
core-library/src/test/java/org/apache/james/test/mock/james/
core-library/src/test/java/org/apache/james/test/util/
core-library/src/test/java/org/apac...
Author: eric
Date: Wed Sep 22 15:40:34 2010
New Revision: 1000046
URL: http://svn.apache.org/viewvc?rev=1000046&view=rev
Log:
Don't use test package anymore. Rename Util to TestUtil.
Added:
james/server/trunk/core-library/src/test/java/org/apache/james/services/InMemorySpoolRepository.java
- copied, changed from r1000042, james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java
james/server/trunk/core-library/src/test/java/org/apache/james/util/
james/server/trunk/core-library/src/test/java/org/apache/james/util/TestUtil.java
- copied, changed from r1000042, james/server/trunk/core-library/src/test/java/org/apache/james/test/util/Util.java
Removed:
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/util/Util.java
Modified:
james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java
james/server/trunk/domain-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java
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/AbstractSMTPServerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
Copied: james/server/trunk/core-library/src/test/java/org/apache/james/services/InMemorySpoolRepository.java (from r1000042, james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/services/InMemorySpoolRepository.java?p2=james/server/trunk/core-library/src/test/java/org/apache/james/services/InMemorySpoolRepository.java&p1=james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java&r1=1000042&r2=1000046&rev=1000046&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/services/InMemorySpoolRepository.java Wed Sep 22 15:40:34 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.test.mock.james;
+package org.apache.james.services;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.impl.SimpleLog;
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java?rev=1000046&r1=1000045&r2=1000046&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java Wed Sep 22 15:40:34 2010
@@ -25,7 +25,6 @@ import org.apache.james.lifecycle.Dispos
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.mailrepository.MailRepository;
import org.apache.james.services.MailServer;
-import org.apache.james.test.mock.james.InMemorySpoolRepository;
import org.apache.mailet.base.test.MailUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Copied: james/server/trunk/core-library/src/test/java/org/apache/james/util/TestUtil.java (from r1000042, james/server/trunk/core-library/src/test/java/org/apache/james/test/util/Util.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/util/TestUtil.java?p2=james/server/trunk/core-library/src/test/java/org/apache/james/util/TestUtil.java&p1=james/server/trunk/core-library/src/test/java/org/apache/james/test/util/Util.java&r1=1000042&r2=1000046&rev=1000046&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/test/util/Util.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/util/TestUtil.java Wed Sep 22 15:40:34 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.test.util;
+package org.apache.james.util;
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.derby.jdbc.EmbeddedDriver;
@@ -32,7 +32,7 @@ import javax.sql.DataSource;
/**
* some utilities for James unit testing
*/
-public class Util {
+public class TestUtil {
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/domain-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java?rev=1000046&r1=1000045&r2=1000046&view=diff
==============================================================================
--- james/server/trunk/domain-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java (original)
+++ james/server/trunk/domain-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java Wed Sep 22 15:40:34 2010
@@ -40,7 +40,7 @@ import org.apache.james.api.dnsservice.A
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.MockFileSystem;
-import org.apache.james.test.util.Util;
+import org.apache.james.util.TestUtil;
import org.apache.james.util.sql.JDBCUtil;
public class JDBCDomainListTest extends TestCase {
@@ -50,7 +50,7 @@ public class JDBCDomainListTest extends
private DataSource data;
public void setUp() throws Exception {
- dataSource = Util.getDataSourceSelector();
+ dataSource = TestUtil.getDataSourceSelector();
data = dataSource.getDataSource("maildb");
sqlQuery("create table " + table + " (domain VARCHAR (255))");
Modified: james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java?rev=1000046&r1=1000045&r2=1000046&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java (original)
+++ james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java Wed Sep 22 15:40:34 2010
@@ -26,7 +26,7 @@ import org.apache.james.filepair.FilePer
import org.apache.james.mailstore.MockMailStore;
import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.MockFileSystem;
-import org.apache.james.test.util.Util;
+import org.apache.james.util.TestUtil;
public class JDBCMailRepositoryTest extends AbstractMailRepositoryTest {
@@ -38,7 +38,7 @@ public class JDBCMailRepositoryTest exte
*/
protected MailRepository getMailRepository() throws Exception {
MockFileSystem fs = new MockFileSystem();
- DataSourceSelector selector = Util.getDataSourceSelector();
+ DataSourceSelector selector = TestUtil.getDataSourceSelector();
JDBCMailRepository mr = new JDBCMailRepository();
// only used for dbfile
Modified: james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java?rev=1000046&r1=1000045&r2=1000046&view=diff
==============================================================================
--- james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java (original)
+++ james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java Wed Sep 22 15:40:34 2010
@@ -31,7 +31,7 @@ import org.apache.james.lifecycle.Lifecy
import org.apache.james.mailstore.MockMailStore;
import org.apache.james.management.SpoolFilter;
import org.apache.james.management.SpoolManagementException;
-import org.apache.james.test.mock.james.InMemorySpoolRepository;
+import org.apache.james.services.InMemorySpoolRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMimeMessage;
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=1000046&r1=1000045&r2=1000046&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 Wed Sep 22 15:40:34 2010
@@ -52,13 +52,13 @@ import org.apache.james.lifecycle.Lifecy
import org.apache.james.mailbox.store.Authenticator;
import org.apache.james.services.MailServer;
import org.apache.james.socket.netty.ProtocolHandlerChainImpl;
-import org.apache.james.test.util.Util;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.util.POP3BeforeSMTPHelper;
+import org.apache.james.util.TestUtil;
public abstract class AbstractAsyncPOP3ServerTest extends TestCase {
- private int m_pop3ListenerPort = Util.getNonPrivilegedPort();
+ private int m_pop3ListenerPort = TestUtil.getNonPrivilegedPort();
protected MockMailServer m_mailServer;
private POP3TestConfiguration m_testConfiguration;
private MockUsersRepository m_usersRepository = new MockUsersRepository();
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=1000046&r1=1000045&r2=1000046&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 Wed Sep 22 15:40:34 2010
@@ -60,12 +60,12 @@ import org.apache.james.management.Spool
import org.apache.james.services.MailServer;
import org.apache.james.socket.netty.ProtocolHandlerChainImpl;
import org.apache.james.test.mock.james.MockUsersStore;
-import org.apache.james.test.util.Util;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.util.InternetPrintWriter;
+import org.apache.james.util.TestUtil;
public abstract class AbstractRemoteManagerTest extends TestCase {
- private int m_remoteManagerListenerPort = Util.getNonPrivilegedPort();
+ private int m_remoteManagerListenerPort = TestUtil.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/AbstractSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java?rev=1000046&r1=1000045&r2=1000046&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java Wed Sep 22 15:40:34 2010
@@ -53,8 +53,8 @@ import org.apache.james.services.MockFil
import org.apache.james.services.MockMailServer;
import org.apache.james.socket.netty.ProtocolHandlerChainImpl;
import org.apache.james.test.mock.DummyVirtualUserTableStore;
-import org.apache.james.test.util.Util;
import org.apache.james.userrepository.MockUsersRepository;
+import org.apache.james.util.TestUtil;
import org.apache.james.util.codec.Base64;
import org.apache.mailet.HostAddress;
import org.apache.mailet.Mail;
@@ -154,7 +154,7 @@ public abstract class AbstractSMTPServer
public AbstractSMTPServerTest() {
super("AsyncSMTPServerTest");
- m_smtpListenerPort = Util.getNonPrivilegedPort();
+ m_smtpListenerPort = TestUtil.getNonPrivilegedPort();
}
protected void setUp() throws Exception {
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=1000046&r1=1000045&r2=1000046&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 Wed Sep 22 15:40:34 2010
@@ -37,7 +37,7 @@ import org.apache.james.smtpserver.fastf
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.test.util.Util;
+import org.apache.james.util.TestUtil;
import org.apache.james.util.scanner.SpamAssassinInvoker;
import org.apache.mailet.Mail;
@@ -103,7 +103,7 @@ public class SpamAssassinHandlerTest ext
public void testNonSpam() throws IOException, MessagingException {
- int port = Util.getNonPrivilegedPort();
+ int port = TestUtil.getNonPrivilegedPort();
MockSpamd spamd = new MockSpamd(port);
new Thread(spamd).start();
@@ -126,7 +126,7 @@ public class SpamAssassinHandlerTest ext
public void testSpam() throws IOException, MessagingException {
- int port = Util.getNonPrivilegedPort();
+ int port = TestUtil.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 = Util.getNonPrivilegedPort();
+ int port = TestUtil.getNonPrivilegedPort();
new Thread(new MockSpamd(port)).start();
SMTPSession session = setupMockedSMTPSession(setupMockedMail(setupMockedMimeMessage(MockSpamd.GTUBE)));
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java?rev=1000046&r1=1000045&r2=1000046&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java Wed Sep 22 15:40:34 2010
@@ -26,7 +26,7 @@ import org.apache.james.api.user.UsersRe
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.MockFileSystem;
-import org.apache.james.test.util.Util;
+import org.apache.james.util.TestUtil;
import java.util.Iterator;
@@ -56,7 +56,7 @@ public class DefaultUsersJdbcRepositoryT
*/
protected void configureAbstractJdbcUsersRepository(AbstractJdbcUsersRepository res, String tableString) throws Exception, ConfigurationException {
res.setFileSystem(new MockFileSystem());
- DataSourceSelector dataSourceSelector = Util.getDataSourceSelector();
+ DataSourceSelector dataSourceSelector = TestUtil.getDataSourceSelector();
res.setDatasources(dataSourceSelector );
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java?rev=1000046&r1=1000045&r2=1000046&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java Wed Sep 22 15:40:34 2010
@@ -28,7 +28,7 @@ import org.apache.james.api.user.UsersRe
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.MockFileSystem;
-import org.apache.james.test.util.Util;
+import org.apache.james.util.TestUtil;
import org.apache.mailet.MailAddress;
import java.util.Collection;
@@ -60,7 +60,7 @@ public class JamesUsersJdbcRepositoryTes
*/
protected void configureAbstractJdbcUsersRepository(AbstractJdbcUsersRepository res, String tableString) throws Exception, ConfigurationException {
res.setFileSystem(new MockFileSystem());
- res.setDatasources(Util.getDataSourceSelector());
+ res.setDatasources(TestUtil.getDataSourceSelector());
DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder();
configuration.addProperty("[@destinationURL]", "db://maildb/"+tableString);
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java?rev=1000046&r1=1000045&r2=1000046&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java Wed Sep 22 15:40:34 2010
@@ -25,7 +25,7 @@ import org.apache.commons.logging.impl.S
import org.apache.james.api.user.UsersRepository;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.MockFileSystem;
-import org.apache.james.test.util.Util;
+import org.apache.james.util.TestUtil;
import java.util.Iterator;
@@ -64,7 +64,7 @@ public class ListUsersJdbcRepositoryTest
*/
protected void configureAbstractJdbcUsersRepository(AbstractJdbcUsersRepository res, String tableString) throws Exception, ConfigurationException {
res.setFileSystem(new MockFileSystem());
- res.setDatasources(Util.getDataSourceSelector());
+ res.setDatasources(TestUtil.getDataSourceSelector());
DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder();
configuration.addProperty("[@destinationURL]", "db://maildb/"+tableString);
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java?rev=1000046&r1=1000045&r2=1000046&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java Wed Sep 22 15:40:34 2010
@@ -23,7 +23,7 @@ import org.apache.commons.logging.impl.S
import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.services.MockFileSystem;
-import org.apache.james.test.util.Util;
+import org.apache.james.util.TestUtil;
/**
* Test the JDBC Virtual User Table implementation.
@@ -36,7 +36,7 @@ public class JDBCVirtualUserTableTest ex
protected AbstractVirtualUserTable getVirtualUserTable() throws Exception {
JDBCVirtualUserTable virtualUserTable = new JDBCVirtualUserTable();
virtualUserTable.setLog(new SimpleLog("MockLog"));
- virtualUserTable.setDataSourceSelector(Util.getDataSourceSelector());
+ virtualUserTable.setDataSourceSelector(TestUtil.getDataSourceSelector());
virtualUserTable.setFileSystem(new MockFileSystem());
DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder();
defaultConfiguration.addProperty("[@destinationURL]","db://maildb/VirtualUserTable");
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org