You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by se...@apache.org on 2011/05/31 16:45:05 UTC
svn commit: r1129713 [2/2] - in
/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver: clienttests/
commands/impl/listing/ filesystem/nativefs/impl/ ftpletcontainer/ impl/
ssl/ ssl/impl/ usermanager/impl/
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtplet.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtplet.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtplet.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtplet.java Tue May 31 14:45:03 2011
@@ -40,113 +40,135 @@ public class MockFtplet extends DefaultF
public FtpletContext context;
public boolean destroyed = false;
+ @Override
public void destroy() {
destroyed = true;
callback.destroy();
}
+ @Override
public void init(FtpletContext ftpletContext) throws FtpException {
this.context = ftpletContext;
callback.init(ftpletContext);
}
+ @Override
public FtpletResult onAppendEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onAppendEnd(session, request);
}
+ @Override
public FtpletResult onAppendStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onAppendStart(session, request);
}
+ @Override
public FtpletResult onConnect(FtpSession session) throws FtpException,
IOException {
return callback.onConnect(session);
}
+ @Override
public FtpletResult onDeleteEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onDeleteEnd(session, request);
}
+ @Override
public FtpletResult onDeleteStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onDeleteStart(session, request);
}
+ @Override
public FtpletResult onDisconnect(FtpSession session) throws FtpException,
IOException {
return callback.onDisconnect(session);
}
+ @Override
public FtpletResult onDownloadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onDownloadEnd(session, request);
}
+ @Override
public FtpletResult onDownloadStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onDownloadStart(session, request);
}
+ @Override
public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onLogin(session, request);
}
+ @Override
public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onMkdirEnd(session, request);
}
+ @Override
public FtpletResult onMkdirStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onMkdirStart(session, request);
}
+ @Override
public FtpletResult onRenameEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onRenameEnd(session, request);
}
+ @Override
public FtpletResult onRenameStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onRenameStart(session, request);
}
+ @Override
public FtpletResult onRmdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onRmdirEnd(session, request);
}
+ @Override
public FtpletResult onRmdirStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onRmdirStart(session, request);
}
+ @Override
public FtpletResult onSite(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onSite(session, request);
}
+ @Override
public FtpletResult onUploadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onUploadEnd(session, request);
}
+ @Override
public FtpletResult onUploadStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onUploadStart(session, request);
}
+ @Override
public FtpletResult onUploadUniqueEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onUploadUniqueEnd(session, request);
}
+ @Override
public FtpletResult onUploadUniqueStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onUploadUniqueStart(session, request);
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtpletCallback.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtpletCallback.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtpletCallback.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtpletCallback.java Tue May 31 14:45:03 2011
@@ -37,107 +37,129 @@ public class MockFtpletCallback extends
public static FtpletResult returnValue;
+ @Override
public void destroy() {
}
+ @Override
public void init(FtpletContext ftpletContext) throws FtpException {
}
+ @Override
public FtpletResult onAppendEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onAppendStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onConnect(FtpSession session) throws FtpException,
IOException {
return returnValue;
}
+ @Override
public FtpletResult onDeleteEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onDeleteStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onDisconnect(FtpSession session) throws FtpException,
IOException {
return returnValue;
}
+ @Override
public FtpletResult onDownloadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onDownloadStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onMkdirStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onRenameEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onRenameStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onRmdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onRmdirStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onSite(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onUploadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onUploadStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onUploadUniqueEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
+ @Override
public FtpletResult onUploadUniqueStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/impl/FtpStatisticsImplTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/impl/FtpStatisticsImplTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/impl/FtpStatisticsImplTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/impl/FtpStatisticsImplTest.java Tue May 31 14:45:03 2011
@@ -27,6 +27,7 @@ package org.apache.ftpserver.impl;
*/
public class FtpStatisticsImplTest extends ServerFtpStatisticsTestTemplate {
+ @Override
protected DefaultFtpStatistics createStatistics() {
return new DefaultFtpStatistics();
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java Tue May 31 14:45:03 2011
@@ -40,6 +40,7 @@ public abstract class ExplicitSecurityTe
protected static final byte[] TEST_DATA = "TESTDATA".getBytes();
+ @Override
protected void setUp() throws Exception {
super.setUp();
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ImplicitSecurityTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ImplicitSecurityTestTemplate.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ImplicitSecurityTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ImplicitSecurityTestTemplate.java Tue May 31 14:45:03 2011
@@ -27,6 +27,7 @@ package org.apache.ftpserver.ssl;
public abstract class ImplicitSecurityTestTemplate extends
ExplicitSecurityTestTemplate {
+ @Override
protected boolean useImplicit() {
return true;
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java Tue May 31 14:45:03 2011
@@ -30,14 +30,17 @@ import org.apache.commons.net.ftp.FTPSCl
*/
public class MinaCipherSuitesTest extends SSLTestTemplate {
+ @Override
protected String getAuthValue() {
return "TLS";
}
+ @Override
protected boolean useImplicit() {
return true;
}
+ @Override
protected SslConfigurationFactory createSslConfiguration() {
SslConfigurationFactory sslConfigFactory = super.createSslConfiguration();
@@ -47,10 +50,12 @@ public class MinaCipherSuitesTest extend
return sslConfigFactory;
}
+ @Override
protected FTPSClient createFTPClient() throws Exception {
return new FTPSClient(true);
}
+ @Override
protected boolean isConnectClient() {
return false;
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaClientAuthTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaClientAuthTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaClientAuthTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaClientAuthTest.java Tue May 31 14:45:03 2011
@@ -36,6 +36,7 @@ import org.apache.ftpserver.impl.FtpIoSe
*/
public class MinaClientAuthTest extends SSLTestTemplate {
+ @Override
protected FTPSClient createFTPClient() throws Exception {
FTPSClient client = new FTPSClient(useImplicit());
client.setNeedClientAuth(true);
@@ -54,10 +55,12 @@ public class MinaClientAuthTest extends
return client;
}
+ @Override
protected String getAuthValue() {
return "TLS";
}
+ @Override
protected String getClientAuth() {
return "true";
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitSSLTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitSSLTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitSSLTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitSSLTest.java Tue May 31 14:45:03 2011
@@ -26,6 +26,7 @@ package org.apache.ftpserver.ssl;
*/
public class MinaExplicitSSLTest extends ExplicitSecurityTestTemplate {
+ @Override
protected String getAuthValue() {
return "SSL";
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitTLSTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitTLSTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitTLSTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitTLSTest.java Tue May 31 14:45:03 2011
@@ -26,6 +26,7 @@ package org.apache.ftpserver.ssl;
*/
public class MinaExplicitTLSTest extends ExplicitSecurityTestTemplate {
+ @Override
protected String getAuthValue() {
return "TLS";
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitClientAuthTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitClientAuthTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitClientAuthTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitClientAuthTest.java Tue May 31 14:45:03 2011
@@ -26,6 +26,7 @@ package org.apache.ftpserver.ssl;
*/
public class MinaImplicitClientAuthTest extends MinaClientAuthTest {
+ @Override
protected boolean useImplicit() {
return true;
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitDataChannelTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitDataChannelTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitDataChannelTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitDataChannelTest.java Tue May 31 14:45:03 2011
@@ -38,14 +38,17 @@ import org.apache.ftpserver.impl.ServerD
*/
public class MinaImplicitDataChannelTest extends ImplicitSecurityTestTemplate {
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
+ @Override
protected String getAuthValue() {
return "SSL";
}
+ @Override
protected DataConnectionConfigurationFactory createDataConnectionConfigurationFactory() {
DataConnectionConfigurationFactory result = super
.createDataConnectionConfigurationFactory();
@@ -53,6 +56,7 @@ public class MinaImplicitDataChannelTest
return result;
}
+ @Override
protected boolean useImplicit() {
return true;
}
@@ -93,6 +97,7 @@ public class MinaImplicitDataChannelTest
* use implicit SSL for the data connection, without sending PROT P.
* In this case in active mode.
*/
+ @Override
public void testStoreWithProtPInPassiveMode() throws Exception {
secureClientDataConnection();
client.enterLocalPassiveMode();
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitSSLTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitSSLTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitSSLTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitSSLTest.java Tue May 31 14:45:03 2011
@@ -26,6 +26,7 @@ package org.apache.ftpserver.ssl;
*/
public class MinaImplicitSSLTest extends ImplicitSecurityTestTemplate {
+ @Override
protected String getAuthValue() {
return "SSL";
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitTLSTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitTLSTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitTLSTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitTLSTest.java Tue May 31 14:45:03 2011
@@ -26,6 +26,7 @@ package org.apache.ftpserver.ssl;
*/
public class MinaImplicitTLSTest extends ImplicitSecurityTestTemplate {
+ @Override
protected String getAuthValue() {
return "TLS";
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java Tue May 31 14:45:03 2011
@@ -66,6 +66,7 @@ public abstract class SSLTestTemplate ex
return sslConfigFactory;
}
+ @Override
protected FtpServerFactory createServer() throws Exception {
assertTrue(FTPSERVER_KEYSTORE.exists());
@@ -89,6 +90,7 @@ public abstract class SSLTestTemplate ex
return "false";
}
+ @Override
protected FTPSClient createFTPClient() throws Exception {
FTPSClient ftpsClient = new FTPSClient(useImplicit());
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java Tue May 31 14:45:03 2011
@@ -36,6 +36,7 @@ public class AliasKeymanagerTest extends
private KeyManager km;
+ @Override
protected void setUp() throws Exception {
KeyStore ks = KeyStore.getInstance("JKS");
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java Tue May 31 14:45:03 2011
@@ -36,6 +36,7 @@ public class ExtendedAliasKeymanagerTest
private KeyManager km;
+ @Override
protected void setUp() throws Exception {
KeyStore ks = KeyStore.getInstance("JKS");
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextDbUserManagerTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextDbUserManagerTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextDbUserManagerTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextDbUserManagerTest.java Tue May 31 14:45:03 2011
@@ -34,12 +34,14 @@ import org.apache.ftpserver.usermanager.
*/
public class ClearTextDbUserManagerTest extends DbUserManagerTest {
+ @Override
protected File getInitSqlScript() {
return new File(TestUtil.getBaseDir(),
"src/test/resources/dbusermanagertest-cleartext-hsql.sql");
}
+ @Override
protected UserManagerFactory createUserManagerFactory() throws FtpException {
DbUserManagerFactory manager = (DbUserManagerFactory) super.createUserManagerFactory();
manager.setPasswordEncryptor(new ClearTextPasswordEncryptor());
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/DbUserManagerTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/DbUserManagerTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/DbUserManagerTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/DbUserManagerTest.java Tue May 31 14:45:03 2011
@@ -57,6 +57,7 @@ public class DbUserManagerTest extends U
stm.execute(ddl);
}
+ @Override
protected UserManagerFactory createUserManagerFactory() throws FtpException {
DbUserManagerFactory manager = new DbUserManagerFactory();
@@ -85,6 +86,7 @@ public class DbUserManagerTest extends U
*
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
ds = new jdbcDataSource();
ds.setDatabase("jdbc:hsqldb:mem:ftpd");
@@ -96,6 +98,7 @@ public class DbUserManagerTest extends U
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
Statement stm = conn.createStatement();
stm.execute("SHUTDOWN");
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptorTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptorTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptorTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptorTest.java Tue May 31 14:45:03 2011
@@ -35,6 +35,7 @@ public class Md5PasswordEncryptorTest ex
return new Md5PasswordEncryptor();
}
+ @Override
public void testMatches() {
PasswordEncryptor encryptor = createPasswordEncryptor();
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManagerTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManagerTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManagerTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManagerTest.java Tue May 31 14:45:03 2011
@@ -68,6 +68,7 @@ public class PropertiesUserManagerTest e
fos.close();
}
+ @Override
protected UserManagerFactory createUserManagerFactory() throws FtpException {
PropertiesUserManagerFactory um = new PropertiesUserManagerFactory();
um.setFile(USERS_FILE);
@@ -76,6 +77,7 @@ public class PropertiesUserManagerTest e
return um;
}
+ @Override
protected void setUp() throws Exception {
TEST_DIR.mkdirs();
@@ -85,6 +87,7 @@ public class PropertiesUserManagerTest e
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptorTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptorTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptorTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptorTest.java Tue May 31 14:45:03 2011
@@ -35,6 +35,7 @@ public class SaltedPasswordEncryptorTest
return new SaltedPasswordEncryptor();
}
+ @Override
public void testMatches() {
PasswordEncryptor encryptor = createPasswordEncryptor();
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/VolatilePropertiesUserManagerTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/VolatilePropertiesUserManagerTest.java?rev=1129713&r1=1129712&r2=1129713&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/VolatilePropertiesUserManagerTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/impl/VolatilePropertiesUserManagerTest.java Tue May 31 14:45:03 2011
@@ -35,6 +35,7 @@ import org.apache.ftpserver.usermanager.
*/
public class VolatilePropertiesUserManagerTest extends UserManagerTestTemplate {
+ @Override
protected UserManagerFactory createUserManagerFactory() throws FtpException {
PropertiesUserManagerFactory um = new PropertiesUserManagerFactory();
@@ -45,6 +46,7 @@ public class VolatilePropertiesUserManag
return um;
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -81,6 +83,7 @@ public class VolatilePropertiesUserManag
}
// we do not save persistent in this case so this test is disabled
+ @Override
public void testSavePersistent() {
}