Add missing @Override annotations
git-svn-id: https://svn.apache.org/repos/asf/mina/ftpserver/trunk@1129713 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/ActiveModeReplyTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/ActiveModeReplyTest.java
index 4530320..9d1138f 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/ActiveModeReplyTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/ActiveModeReplyTest.java
@@ -40,6 +40,7 @@
private static byte[] testData;
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/CdCaseInsensitiveTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/CdCaseInsensitiveTest.java
index 3c2be07..e63c11e 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/CdCaseInsensitiveTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/CdCaseInsensitiveTest.java
@@ -28,6 +28,7 @@
*
*/
public class CdCaseInsensitiveTest extends CdTest {
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/CdTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/CdTest.java
index 3bd43f1..e343fff 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/CdTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/CdTest.java
@@ -41,6 +41,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java b/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java
index 753c8d0..6ec9608 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java
@@ -118,6 +118,7 @@
*
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
initDirs();
@@ -215,6 +216,7 @@
*
* @see junit.framework.TestCase#tearDown()
*/
+ @Override
protected void tearDown() throws Exception {
if (isConnectClient()) {
try {
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java
index 5e5cfee..205cb50 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java
@@ -35,6 +35,7 @@
private static final String UNKNOWN_PASSWORD = "bar";
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/DataTransferTimeoutTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/DataTransferTimeoutTest.java
index 07692c4..ebd47fc 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/DataTransferTimeoutTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/DataTransferTimeoutTest.java
@@ -55,6 +55,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/DecoderTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/DecoderTest.java
index e3dbbaa..616c52c 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/DecoderTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/DecoderTest.java
@@ -64,6 +64,7 @@
}
}
+ @Override
protected FTPClient createFTPClient() throws Exception {
FTPClient client = new MyFTPClient();
client.setDefaultTimeout(10000);
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/DeleteTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/DeleteTest.java
index 89feb59..acf8ecf 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/DeleteTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/DeleteTest.java
@@ -42,6 +42,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
index 976b8c7..2ee0d63 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
@@ -38,6 +38,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/FtpMd5Test.java b/core/src/test/java/org/apache/ftpserver/clienttests/FtpMd5Test.java
index 0febc67..ccaa47d 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/FtpMd5Test.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/FtpMd5Test.java
@@ -55,6 +55,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/HelpTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/HelpTest.java
index dd9fea9..b628d30 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/HelpTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/HelpTest.java
@@ -31,6 +31,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/I18NTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/I18NTest.java
index a904bf5..ea9658f 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/I18NTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/I18NTest.java
@@ -44,6 +44,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -52,6 +53,7 @@
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
}
+ @Override
protected FTPClient createFTPClient() throws Exception {
FTPClient client = new FTPClient();
client.setControlEncoding("UTF-8");
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java
index 3740ed5..ebcc32c 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java
@@ -33,6 +33,7 @@
*
*/
public class InetAddressBlacklistTest extends ClientTestTemplate {
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
@@ -48,6 +49,7 @@
return server;
}
+ @Override
protected boolean isConnectClient() {
return false;
}
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/IpFilterTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/IpFilterTest.java
index d1f3fc9..4e27e94 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/IpFilterTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/IpFilterTest.java
@@ -37,6 +37,7 @@
private RemoteIpFilter filter = new RemoteIpFilter(IpFilterType.DENY);
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
@@ -48,6 +49,7 @@
return server;
}
+ @Override
protected boolean isConnectClient() {
return false;
}
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java
index b096cf7..2ec1b55 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java
@@ -36,6 +36,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#createConfig()
*/
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
@@ -51,6 +52,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/ListPassiveTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/ListPassiveTest.java
index 9540efd..4ac22b4 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/ListPassiveTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/ListPassiveTest.java
@@ -30,6 +30,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java
index cf82058..4ed347b 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java
@@ -54,6 +54,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/LoginNoAnonTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/LoginNoAnonTest.java
index e718efa..d72afb9 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/LoginNoAnonTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/LoginNoAnonTest.java
@@ -34,6 +34,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#createConfig()
*/
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/MDTMTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/MDTMTest.java
index 53920ce..766179f 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/MDTMTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/MDTMTest.java
@@ -46,6 +46,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/MFMTTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/MFMTTest.java
index 36eeb4f..fe84b49 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/MFMTTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/MFMTTest.java
@@ -45,6 +45,7 @@
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/NLSTTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/NLSTTest.java
index 3a8c2a1..79408ab 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/NLSTTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/NLSTTest.java
@@ -50,6 +50,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressTest.java
index 324dce2..f6114d7 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressTest.java
@@ -38,6 +38,7 @@
private String passiveAddress;
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithHostnameTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithHostnameTest.java
index 5c0872b..a3f586b 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithHostnameTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithHostnameTest.java
@@ -32,6 +32,7 @@
*/
public class PasvAddressWithHostnameTest extends ClientTestTemplate {
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithOverridenHostnameGetter.java b/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithOverridenHostnameGetter.java
index 4ca8925..1d0419e 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithOverridenHostnameGetter.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithOverridenHostnameGetter.java
@@ -44,6 +44,7 @@
}
}
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/PasvTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/PasvTest.java
index 2f79c76..9c85517 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/PasvTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/PasvTest.java
@@ -34,6 +34,7 @@
*/
public class PasvTest extends ClientTestTemplate {
+ @Override
protected boolean isConnectClient() {
return false;
}
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/PortTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/PortTest.java
index 069b97d..425278f 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/PortTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/PortTest.java
@@ -28,6 +28,7 @@
*/
public class PortTest extends ClientTestTemplate {
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/RenameTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/RenameTest.java
index ad73760..f79f461 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/RenameTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/RenameTest.java
@@ -53,6 +53,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/RetrievePassiveTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/RetrievePassiveTest.java
index 9a56daa..ebb19a2 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/RetrievePassiveTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/RetrievePassiveTest.java
@@ -31,6 +31,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/RetrieveTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/RetrieveTest.java
index 6259fee..14d5065 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/RetrieveTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/RetrieveTest.java
@@ -48,6 +48,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/RmDirTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/RmDirTest.java
index 13eef3a..a576df0 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/RmDirTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/RmDirTest.java
@@ -36,6 +36,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/SizeTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/SizeTest.java
index 55ba02c..7178a9c 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/SizeTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/SizeTest.java
@@ -41,6 +41,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/StorePassiveTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/StorePassiveTest.java
index ffff3b3..955a0a2 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/StorePassiveTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/StorePassiveTest.java
@@ -30,6 +30,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/StoreTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/StoreTest.java
index 69f7883..a9b0261 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/StoreTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/StoreTest.java
@@ -55,6 +55,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java
index d835337..8483465 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java
@@ -34,6 +34,7 @@
*
*/
public class SubnetBlacklistTest extends ClientTestTemplate {
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
@@ -49,6 +50,7 @@
return server;
}
+ @Override
protected boolean isConnectClient() {
return false;
}
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/SymbolicLinkTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/SymbolicLinkTest.java
index 5d94eb0..43176c7 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/SymbolicLinkTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/SymbolicLinkTest.java
@@ -42,6 +42,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/SystTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/SystTest.java
index 64209b5..9ee702d 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/SystTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/SystTest.java
@@ -33,6 +33,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/TypeTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/TypeTest.java
index 421c895..3afea82 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/TypeTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/TypeTest.java
@@ -35,6 +35,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/UnlimitedMaxLoginTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/UnlimitedMaxLoginTest.java
index 923f7f6..c66dda0 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/UnlimitedMaxLoginTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/UnlimitedMaxLoginTest.java
@@ -32,6 +32,7 @@
private static final String UNKNOWN_PASSWORD = "bar";
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
diff --git a/core/src/test/java/org/apache/ftpserver/commands/impl/listing/DirectoryListerTest.java b/core/src/test/java/org/apache/ftpserver/commands/impl/listing/DirectoryListerTest.java
index 56c3a4f..25882f4 100644
--- a/core/src/test/java/org/apache/ftpserver/commands/impl/listing/DirectoryListerTest.java
+++ b/core/src/test/java/org/apache/ftpserver/commands/impl/listing/DirectoryListerTest.java
@@ -63,6 +63,7 @@
private FileSystemView fileSystemView;
+ @Override
protected void setUp() throws Exception {
BaseUser baseUser = new BaseUser();
baseUser.setHomeDirectory(ROOT_DIR.getAbsolutePath());
@@ -94,6 +95,7 @@
*
* @see junit.framework.TestCase#tearDown()
*/
+ @Override
protected void tearDown() throws Exception {
if (TEST_TMP_DIR.exists()) {
IoUtils.delete(TEST_TMP_DIR);
diff --git a/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java b/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java
index d78a7a2..28a07ca 100644
--- a/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java
+++ b/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java
@@ -144,14 +144,17 @@
public void testSingleDir() {
FtpFile dir = new MockFileObject() {
+ @Override
public int getLinkCount() {
return 3;
}
+ @Override
public boolean isDirectory() {
return true;
}
+ @Override
public boolean isFile() {
return false;
}
diff --git a/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java b/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java
index a1afaad..f3edb6d 100644
--- a/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java
+++ b/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java
@@ -148,14 +148,17 @@
public void testSingleDir() {
FtpFile dir = new MockFileObject() {
+ @Override
public boolean isDirectory() {
return true;
}
+ @Override
public boolean isFile() {
return false;
}
+ @Override
public long getSize() {
return 0;
}
diff --git a/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java b/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java
index 7105997..c76b543 100644
--- a/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java
+++ b/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java
@@ -137,10 +137,12 @@
public void testSingleDir() {
FtpFile dir = new MockFileObject() {
+ @Override
public boolean isDirectory() {
return true;
}
+ @Override
public boolean isFile() {
return false;
}
diff --git a/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java b/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java
index a11bbc7..a8216ad 100644
--- a/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java
+++ b/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java
@@ -48,6 +48,7 @@
protected static final User USER = new BaseUser() {
private static final long serialVersionUID = 4906315989316879758L;
+ @Override
public AuthorizationRequest authorize(AuthorizationRequest request) {
return request;
}
diff --git a/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java b/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java
index 4f0496e..f7bb18b 100644
--- a/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java
+++ b/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java
@@ -49,6 +49,7 @@
private static final String FULL_PATH_NO_CURRDIR = ROOT_DIR_PATH + "/"
+ TEST_FILE2_IN_DIR1.getName();
+ @Override
protected void setUp() throws Exception {
initDirs();
@@ -163,6 +164,7 @@
*
* @see junit.framework.TestCase#tearDown()
*/
+ @Override
protected void tearDown() throws Exception {
cleanTmpDirs();
}
diff --git a/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFileTest.java b/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFileTest.java
index 44e3a55..cce3047 100644
--- a/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFileTest.java
+++ b/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFileTest.java
@@ -62,6 +62,7 @@
+ @Override
protected void setUp() throws Exception {
initDirs();
@@ -71,6 +72,7 @@
TEST_FILE3.createNewFile();
}
+ @Override
protected FtpFile createFileObject(String fileName, User user) {
return new NativeFtpFile(fileName, FILE_MAPPINGS.get(fileName), user);
}
@@ -100,6 +102,7 @@
assertTrue(physicalFile.delete());
}
+ @Override
protected void tearDown() throws Exception {
cleanTmpDirs();
}
diff --git a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/DefaultFtpLetContainerTest.java b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/DefaultFtpLetContainerTest.java
index 93d06c7..6960652 100644
--- a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/DefaultFtpLetContainerTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/DefaultFtpLetContainerTest.java
@@ -31,6 +31,7 @@
*/
public class DefaultFtpLetContainerTest extends FtpLetContainerTestTemplate {
+ @Override
protected FtpletContainer createFtpletContainer(Map<String, Ftplet> ftplets) {
return new DefaultFtpletContainer(ftplets);
}
diff --git a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java
index 2843323..e79c154 100644
--- a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java
+++ b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java
@@ -47,6 +47,7 @@
private final List<String> calls = new ArrayList<String>();
+ @Override
protected void setUp() throws Exception {
MockFtplet.callback = new MockFtpletCallback();
MockFtpletCallback.returnValue = FtpletResult.DEFAULT;
@@ -110,6 +111,7 @@
public void testOnConnect() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onConnect(FtpSession session)
throws FtpException, IOException {
calls.add("ftplet1");
@@ -117,6 +119,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onConnect(FtpSession session)
throws FtpException, IOException {
calls.add("ftplet2");
@@ -139,6 +142,7 @@
public void testOnDisconnect() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onDisconnect(FtpSession session)
throws FtpException, IOException {
calls.add("ftplet1");
@@ -146,6 +150,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onDisconnect(FtpSession session)
throws FtpException, IOException {
calls.add("ftplet2");
@@ -168,6 +173,7 @@
public void testOnLogin() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
@@ -175,6 +181,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
@@ -198,6 +205,7 @@
public void testOnDeleteStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onDeleteStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
@@ -205,6 +213,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onDeleteStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
@@ -228,6 +237,7 @@
public void testOnDeleteEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onDeleteEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
@@ -235,6 +245,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onDeleteEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
@@ -258,6 +269,7 @@
public void testOnUploadStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onUploadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
@@ -265,6 +277,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onUploadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
@@ -288,6 +301,7 @@
public void testOnUploadEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onUploadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
@@ -295,6 +309,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onUploadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
@@ -318,6 +333,7 @@
public void testOnDownloadStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onDownloadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
@@ -325,6 +341,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onDownloadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
@@ -348,6 +365,7 @@
public void testOnDownloadEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onDownloadEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
@@ -355,6 +373,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onDownloadEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
@@ -378,6 +397,7 @@
public void testOnRmdirStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onRmdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
@@ -385,6 +405,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onRmdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
@@ -408,6 +429,7 @@
public void testOnRmdirEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onRmdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
@@ -415,6 +437,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onRmdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
@@ -438,6 +461,7 @@
public void testOnMkdirStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onMkdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
@@ -445,6 +469,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onMkdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
@@ -468,6 +493,7 @@
public void testOnMkdirEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
@@ -475,6 +501,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
@@ -498,6 +525,7 @@
public void testOnAppendStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onAppendStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
@@ -505,6 +533,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onAppendStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
@@ -528,6 +557,7 @@
public void testOnAppendEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onAppendEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
@@ -535,6 +565,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onAppendEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
@@ -558,6 +589,7 @@
public void testOnUploadUniqueStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onUploadUniqueStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
@@ -565,6 +597,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onUploadUniqueStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
@@ -588,6 +621,7 @@
public void testOnUploadUniqueEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onUploadUniqueEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
@@ -595,6 +629,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onUploadUniqueEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
@@ -618,6 +653,7 @@
public void testOnRenameStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onRenameStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
@@ -625,6 +661,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onRenameStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
@@ -648,6 +685,7 @@
public void testOnRenameEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onRenameEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
@@ -655,6 +693,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onRenameEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
@@ -678,6 +717,7 @@
public void testOnSite() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onSite(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
@@ -685,6 +725,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onSite(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
@@ -711,6 +752,7 @@
*/
public void testFtpletCallOrder1() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onConnect(FtpSession session)
throws FtpException, IOException {
calls.add("ftplet1");
@@ -718,6 +760,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onConnect(FtpSession session)
throws FtpException, IOException {
calls.add("ftplet2");
@@ -743,6 +786,7 @@
*/
public void testFtpletCallOrder2() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
+ @Override
public FtpletResult onConnect(FtpSession session)
throws FtpException, IOException {
calls.add("ftplet1");
@@ -750,6 +794,7 @@
}
};
MockFtplet ftplet2 = new MockFtplet() {
+ @Override
public FtpletResult onConnect(FtpSession session)
throws FtpException, IOException {
calls.add("ftplet2");
diff --git a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetOnConnectTest.java b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetOnConnectTest.java
index 5d4655a..e73bcdb 100644
--- a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetOnConnectTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetOnConnectTest.java
@@ -56,6 +56,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
MockFtplet.callback = new MockFtpletCallback();
@@ -64,6 +65,7 @@
initServer();
}
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
@@ -76,6 +78,7 @@
public void testDisconnectOnConnect() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onConnect(FtpSession session)
throws FtpException, IOException {
return mockReturnValue;
@@ -94,6 +97,7 @@
public void testExceptionOnConnect() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onConnect(FtpSession session)
throws FtpException, IOException {
throw new FtpException();
@@ -110,6 +114,7 @@
}
}
+ @Override
protected void doConnect() throws Exception {
client.connect("localhost", getListenerPort());
}
diff --git a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
index 81accd6..cca0c89 100644
--- a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
@@ -50,13 +50,14 @@
private static final File TEST_FILE2 = new File(ROOT_DIR, "test2.txt");
- private static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");;
+ private static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
/*
* (non-Javadoc)
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
MockFtplet.callback = new MockFtpletCallback();
MockFtpletCallback.returnValue = FtpletResult.DEFAULT;
@@ -69,6 +70,7 @@
}
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
@@ -82,6 +84,7 @@
public void testLogin() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
assertNotNull(session.getUserArgument());
diff --git a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDisconnectTest.java b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDisconnectTest.java
index e3c224a..09caad7 100644
--- a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDisconnectTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDisconnectTest.java
@@ -60,6 +60,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
MockFtplet.callback = new MockFtpletCallback();
@@ -70,6 +71,7 @@
connectClient();
}
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
@@ -82,6 +84,7 @@
public void testExceptionDuringLogin() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
@@ -102,6 +105,7 @@
public void testExceptionDuringDeleteStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onDeleteStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
@@ -126,6 +130,7 @@
public void testExceptionDuringDeleteEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onDeleteEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
@@ -151,6 +156,7 @@
public void testExceptionDuringMkdirStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onMkdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
@@ -173,6 +179,7 @@
public void testExceptionDuringMkdirEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
@@ -196,6 +203,7 @@
public void testExceptionDuringRmdirStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onRmdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
@@ -220,6 +228,7 @@
public void testExceptionDuringRmdirEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onRmdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
@@ -245,6 +254,7 @@
public void testExceptionDuringSite() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onSite(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
@@ -266,6 +276,7 @@
public void testExceptionDuringRenameStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onRenameStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
@@ -291,6 +302,7 @@
public void testExceptionDuringRenameEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onRenameEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
@@ -318,6 +330,7 @@
public void testExceptionDuringDownloadStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onDownloadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
@@ -340,6 +353,7 @@
public void testExceptionDuringDownloadEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onDownloadEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
@@ -366,6 +380,7 @@
public void testExceptionDuringAppendStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onAppendStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
@@ -391,6 +406,7 @@
public void testExceptionDuringAppendEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onAppendEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
// throwException();
@@ -417,6 +433,7 @@
public void testExceptionDuringUploadStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onUploadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
@@ -440,6 +457,7 @@
public void testExceptionDuringUploadEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onUploadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
@@ -464,6 +482,7 @@
public void testExceptionDuringUploadUniqueStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onUploadUniqueStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
@@ -487,6 +506,7 @@
public void testExceptionDuringUploadUniqueEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onUploadUniqueEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
diff --git a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java
index 4678cbd..4e59719 100644
--- a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java
@@ -52,7 +52,7 @@
private static final File TEST_FILE2 = new File(ROOT_DIR, "test2.txt");
- private static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");;
+ private static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
protected FtpletResult mockReturnValue = FtpletResult.SKIP;
@@ -61,6 +61,7 @@
*
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
+ @Override
protected void setUp() throws Exception {
MockFtplet.callback = new MockFtpletCallback();
@@ -71,6 +72,7 @@
connectClient();
}
+ @Override
protected FtpServerFactory createServer() throws Exception {
FtpServerFactory server = super.createServer();
@@ -83,6 +85,7 @@
public void testLogin() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
session.write(new DefaultFtpReply(
@@ -98,6 +101,7 @@
public void testExceptionDuringDeleteStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onDeleteStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
@@ -119,6 +123,7 @@
public void testExceptionDuringDeleteEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onDeleteEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
@@ -136,6 +141,7 @@
public void testExceptionDuringMkdirStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onMkdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
@@ -154,6 +160,7 @@
public void testExceptionDuringMkdirEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
@@ -169,6 +176,7 @@
public void testExceptionDuringRmdirStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onRmdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session.write(new DefaultFtpReply(
@@ -190,6 +198,7 @@
public void testExceptionDuringRmdirEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onRmdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
@@ -207,6 +216,7 @@
public void testExceptionDuringSite() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onSite(FtpSession session, FtpRequest request)
throws FtpException, IOException {
session
@@ -226,6 +236,7 @@
public void testExceptionDuringRenameStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onRenameStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session
@@ -249,6 +260,7 @@
public void testExceptionDuringRenameEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onRenameEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
@@ -268,6 +280,7 @@
public void testExceptionDuringDownloadStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onDownloadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session.write(new DefaultFtpReply(
@@ -288,6 +301,7 @@
public void testExceptionDuringDownloadEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onDownloadEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
@@ -306,6 +320,7 @@
public void testExceptionDuringAppendStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onAppendStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session.write(new DefaultFtpReply(
@@ -327,6 +342,7 @@
public void testExceptionDuringAppendEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onAppendEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
@@ -345,6 +361,7 @@
public void testExceptionDuringUploadStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onUploadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session.write(new DefaultFtpReply(
@@ -364,6 +381,7 @@
public void testExceptionDuringUploadEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onUploadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
@@ -380,6 +398,7 @@
public void testExceptionDuringUploadUniqueStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onUploadUniqueStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session.write(new DefaultFtpReply(
@@ -398,6 +417,7 @@
public void testExceptionDuringUploadUniqueEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
+ @Override
public FtpletResult onUploadUniqueEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
diff --git a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetThrowFtpExceptionTest.java b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetThrowFtpExceptionTest.java
index 1363bbf..3635614 100644
--- a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetThrowFtpExceptionTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetThrowFtpExceptionTest.java
@@ -30,6 +30,7 @@
*/
public class FtpLetThrowFtpExceptionTest extends FtpLetReturnDisconnectTest {
+ @Override
protected void throwException() throws FtpException, IOException {
throw new FtpException();
}
diff --git a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetThrowIOExceptionTest.java b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetThrowIOExceptionTest.java
index 68ef5ec..7a4a1b9 100644
--- a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetThrowIOExceptionTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetThrowIOExceptionTest.java
@@ -27,6 +27,7 @@
*
*/
public class FtpLetThrowIOExceptionTest extends FtpLetThrowFtpExceptionTest {
+ @Override
protected void throwException() throws IOException {
throw new IOException();
}
diff --git a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetThrowRuntimeExceptionTest.java b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetThrowRuntimeExceptionTest.java
index 152dc61..b7a2c4a 100644
--- a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetThrowRuntimeExceptionTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetThrowRuntimeExceptionTest.java
@@ -28,6 +28,7 @@
*/
public class FtpLetThrowRuntimeExceptionTest extends
FtpLetThrowFtpExceptionTest {
+ @Override
protected void throwException() throws IOException {
throw new IOException();
}
diff --git a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtplet.java b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtplet.java
index fce43d0..525e2eb 100644
--- a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtplet.java
+++ b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtplet.java
@@ -40,113 +40,135 @@
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);
diff --git a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtpletCallback.java b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtpletCallback.java
index 83a4ffa..6653e6c 100644
--- a/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtpletCallback.java
+++ b/core/src/test/java/org/apache/ftpserver/ftpletcontainer/MockFtpletCallback.java
@@ -37,107 +37,129 @@
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;
diff --git a/core/src/test/java/org/apache/ftpserver/impl/FtpStatisticsImplTest.java b/core/src/test/java/org/apache/ftpserver/impl/FtpStatisticsImplTest.java
index 9afe085..1177b6c 100644
--- a/core/src/test/java/org/apache/ftpserver/impl/FtpStatisticsImplTest.java
+++ b/core/src/test/java/org/apache/ftpserver/impl/FtpStatisticsImplTest.java
@@ -27,6 +27,7 @@
*/
public class FtpStatisticsImplTest extends ServerFtpStatisticsTestTemplate {
+ @Override
protected DefaultFtpStatistics createStatistics() {
return new DefaultFtpStatistics();
}
diff --git a/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java b/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java
index 25a46d0..a8bd82d 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java
@@ -40,6 +40,7 @@
protected static final byte[] TEST_DATA = "TESTDATA".getBytes();
+ @Override
protected void setUp() throws Exception {
super.setUp();
diff --git a/core/src/test/java/org/apache/ftpserver/ssl/ImplicitSecurityTestTemplate.java b/core/src/test/java/org/apache/ftpserver/ssl/ImplicitSecurityTestTemplate.java
index 1433634..44d4e4b 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/ImplicitSecurityTestTemplate.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/ImplicitSecurityTestTemplate.java
@@ -27,6 +27,7 @@
public abstract class ImplicitSecurityTestTemplate extends
ExplicitSecurityTestTemplate {
+ @Override
protected boolean useImplicit() {
return true;
}
diff --git a/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java b/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
index b85b105..d918e3e 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
@@ -30,14 +30,17 @@
*/
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 @@
return sslConfigFactory;
}
+ @Override
protected FTPSClient createFTPClient() throws Exception {
return new FTPSClient(true);
}
+ @Override
protected boolean isConnectClient() {
return false;
}
diff --git a/core/src/test/java/org/apache/ftpserver/ssl/MinaClientAuthTest.java b/core/src/test/java/org/apache/ftpserver/ssl/MinaClientAuthTest.java
index d4a049a..ca561e3 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/MinaClientAuthTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/MinaClientAuthTest.java
@@ -36,6 +36,7 @@
*/
public class MinaClientAuthTest extends SSLTestTemplate {
+ @Override
protected FTPSClient createFTPClient() throws Exception {
FTPSClient client = new FTPSClient(useImplicit());
client.setNeedClientAuth(true);
@@ -54,10 +55,12 @@
return client;
}
+ @Override
protected String getAuthValue() {
return "TLS";
}
+ @Override
protected String getClientAuth() {
return "true";
}
diff --git a/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitSSLTest.java b/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitSSLTest.java
index 680bc54..ece983f 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitSSLTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitSSLTest.java
@@ -26,6 +26,7 @@
*/
public class MinaExplicitSSLTest extends ExplicitSecurityTestTemplate {
+ @Override
protected String getAuthValue() {
return "SSL";
}
diff --git a/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitTLSTest.java b/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitTLSTest.java
index 44a29c9..d1d4161 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitTLSTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitTLSTest.java
@@ -26,6 +26,7 @@
*/
public class MinaExplicitTLSTest extends ExplicitSecurityTestTemplate {
+ @Override
protected String getAuthValue() {
return "TLS";
}
diff --git a/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitClientAuthTest.java b/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitClientAuthTest.java
index ed781eb..c5df60d 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitClientAuthTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitClientAuthTest.java
@@ -26,6 +26,7 @@
*/
public class MinaImplicitClientAuthTest extends MinaClientAuthTest {
+ @Override
protected boolean useImplicit() {
return true;
}
diff --git a/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitDataChannelTest.java b/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitDataChannelTest.java
index 076abd7..2f34be7 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitDataChannelTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitDataChannelTest.java
@@ -38,14 +38,17 @@
*/
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 @@
return result;
}
+ @Override
protected boolean useImplicit() {
return true;
}
@@ -93,6 +97,7 @@
* 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();
diff --git a/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitSSLTest.java b/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitSSLTest.java
index 068dc3f..7dce461 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitSSLTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitSSLTest.java
@@ -26,6 +26,7 @@
*/
public class MinaImplicitSSLTest extends ImplicitSecurityTestTemplate {
+ @Override
protected String getAuthValue() {
return "SSL";
}
diff --git a/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitTLSTest.java b/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitTLSTest.java
index 60071d1..2cd212f 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitTLSTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitTLSTest.java
@@ -26,6 +26,7 @@
*/
public class MinaImplicitTLSTest extends ImplicitSecurityTestTemplate {
+ @Override
protected String getAuthValue() {
return "TLS";
}
diff --git a/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java b/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
index 6013528..3034439 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
@@ -66,6 +66,7 @@
return sslConfigFactory;
}
+ @Override
protected FtpServerFactory createServer() throws Exception {
assertTrue(FTPSERVER_KEYSTORE.exists());
@@ -89,6 +90,7 @@
return "false";
}
+ @Override
protected FTPSClient createFTPClient() throws Exception {
FTPSClient ftpsClient = new FTPSClient(useImplicit());
diff --git a/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java b/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
index a5757e3..4606b87 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
@@ -36,6 +36,7 @@
private KeyManager km;
+ @Override
protected void setUp() throws Exception {
KeyStore ks = KeyStore.getInstance("JKS");
diff --git a/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java b/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
index ce3e98a..9c485d6 100644
--- a/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
+++ b/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
@@ -36,6 +36,7 @@
private KeyManager km;
+ @Override
protected void setUp() throws Exception {
KeyStore ks = KeyStore.getInstance("JKS");
diff --git a/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextDbUserManagerTest.java b/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextDbUserManagerTest.java
index f5eb6f7..c643830 100644
--- a/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextDbUserManagerTest.java
+++ b/core/src/test/java/org/apache/ftpserver/usermanager/impl/ClearTextDbUserManagerTest.java
@@ -34,12 +34,14 @@
*/
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());
diff --git a/core/src/test/java/org/apache/ftpserver/usermanager/impl/DbUserManagerTest.java b/core/src/test/java/org/apache/ftpserver/usermanager/impl/DbUserManagerTest.java
index e336848..a29c840 100644
--- a/core/src/test/java/org/apache/ftpserver/usermanager/impl/DbUserManagerTest.java
+++ b/core/src/test/java/org/apache/ftpserver/usermanager/impl/DbUserManagerTest.java
@@ -57,6 +57,7 @@
stm.execute(ddl);
}
+ @Override
protected UserManagerFactory createUserManagerFactory() throws FtpException {
DbUserManagerFactory manager = new DbUserManagerFactory();
@@ -85,6 +86,7 @@
*
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
ds = new jdbcDataSource();
ds.setDatabase("jdbc:hsqldb:mem:ftpd");
@@ -96,6 +98,7 @@
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
Statement stm = conn.createStatement();
stm.execute("SHUTDOWN");
diff --git a/core/src/test/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptorTest.java b/core/src/test/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptorTest.java
index 332b391..80dbb07 100644
--- a/core/src/test/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptorTest.java
+++ b/core/src/test/java/org/apache/ftpserver/usermanager/impl/Md5PasswordEncryptorTest.java
@@ -35,6 +35,7 @@
return new Md5PasswordEncryptor();
}
+ @Override
public void testMatches() {
PasswordEncryptor encryptor = createPasswordEncryptor();
diff --git a/core/src/test/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManagerTest.java b/core/src/test/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManagerTest.java
index 133c701..7852762 100644
--- a/core/src/test/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManagerTest.java
+++ b/core/src/test/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManagerTest.java
@@ -68,6 +68,7 @@
fos.close();
}
+ @Override
protected UserManagerFactory createUserManagerFactory() throws FtpException {
PropertiesUserManagerFactory um = new PropertiesUserManagerFactory();
um.setFile(USERS_FILE);
@@ -76,6 +77,7 @@
return um;
}
+ @Override
protected void setUp() throws Exception {
TEST_DIR.mkdirs();
@@ -85,6 +87,7 @@
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
diff --git a/core/src/test/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptorTest.java b/core/src/test/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptorTest.java
index 8c19cf4..fbfc604 100644
--- a/core/src/test/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptorTest.java
+++ b/core/src/test/java/org/apache/ftpserver/usermanager/impl/SaltedPasswordEncryptorTest.java
@@ -35,6 +35,7 @@
return new SaltedPasswordEncryptor();
}
+ @Override
public void testMatches() {
PasswordEncryptor encryptor = createPasswordEncryptor();
diff --git a/core/src/test/java/org/apache/ftpserver/usermanager/impl/VolatilePropertiesUserManagerTest.java b/core/src/test/java/org/apache/ftpserver/usermanager/impl/VolatilePropertiesUserManagerTest.java
index 7b41a39..5d45abd 100644
--- a/core/src/test/java/org/apache/ftpserver/usermanager/impl/VolatilePropertiesUserManagerTest.java
+++ b/core/src/test/java/org/apache/ftpserver/usermanager/impl/VolatilePropertiesUserManagerTest.java
@@ -35,6 +35,7 @@
*/
public class VolatilePropertiesUserManagerTest extends UserManagerTestTemplate {
+ @Override
protected UserManagerFactory createUserManagerFactory() throws FtpException {
PropertiesUserManagerFactory um = new PropertiesUserManagerFactory();
@@ -45,6 +46,7 @@
return um;
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -81,6 +83,7 @@
}
// we do not save persistent in this case so this test is disabled
+ @Override
public void testSavePersistent() {
}
