You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/08/17 21:52:49 UTC
svn commit: r686637 [12/16] - in /mina/ftpserver/trunk:
core/src/main/java/org/apache/ftpserver/
core/src/main/java/org/apache/ftpserver/command/
core/src/main/java/org/apache/ftpserver/config/spring/
core/src/main/java/org/apache/ftpserver/filesystem/...
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/FtpMd5Test.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/FtpMd5Test.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/FtpMd5Test.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/FtpMd5Test.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -26,22 +26,34 @@
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.ftpserver.test.TestUtil;
-
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class FtpMd5Test extends ClientTestTemplate {
private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
- private static final File TEST_FILE_WITH_SPACE = new File(ROOT_DIR, "test 2.txt");
+
+ private static final File TEST_FILE_WITH_SPACE = new File(ROOT_DIR,
+ "test 2.txt");
private static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
- private static final File TEST_FILE_IN_DIR1 = new File(TEST_DIR1, "test4.txt");
+
+ private static final File TEST_FILE_IN_DIR1 = new File(TEST_DIR1,
+ "test4.txt");
private static byte[] testData = null;
+
private static byte[] testData2 = null;
-
+
private static String testDataHash;
+
private static String testData2Hash;
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
@@ -51,60 +63,60 @@
testData2 = "Hello world".getBytes("UTF-8");
testDataHash = DigestUtils.md5Hex(testData).toUpperCase();
testData2Hash = DigestUtils.md5Hex(testData2).toUpperCase();
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
}
public void testMd5() throws Exception {
TestUtil.writeDataToFile(TEST_FILE1, testData);
-
+
assertTrue(TEST_FILE1.exists());
-
+
String fileName = TEST_FILE1.getName();
assertEquals(251, client.sendCommand("MD5 " + fileName));
assertHash(testDataHash, client.getReplyString(), fileName);
}
-
- public void testMd5NoFileName() throws Exception {
+
+ public void testMd5NoFileName() throws Exception {
assertEquals(504, client.sendCommand("MD5"));
}
public void testMd5NonExistingFile() throws Exception {
assertFalse(TEST_FILE1.exists());
-
+
String fileName = TEST_FILE1.getName();
-
+
assertEquals(504, client.sendCommand("MD5 " + fileName));
}
public void testMd5WithSpaceInFileName() throws Exception {
TestUtil.writeDataToFile(TEST_FILE_WITH_SPACE, testData);
-
+
assertTrue(TEST_FILE_WITH_SPACE.exists());
-
+
String fileName = TEST_FILE_WITH_SPACE.getName();
-
+
assertEquals(251, client.sendCommand("MD5 " + fileName));
-
+
assertHash(testDataHash, client.getReplyString(), fileName);
}
public void testMd5WithDirectory() throws Exception {
TEST_DIR1.mkdirs();
assertTrue(TEST_DIR1.exists());
-
+
String fileName = TEST_DIR1.getName();
-
+
assertEquals(504, client.sendCommand("MD5 " + fileName));
}
public void testMd5WithNonExistingFile() throws Exception {
assertFalse(TEST_FILE1.exists());
-
+
String fileName = TEST_FILE1.getName();
-
+
assertEquals(504, client.sendCommand("MD5 " + fileName));
}
@@ -113,9 +125,10 @@
assertTrue(TEST_DIR1.exists());
TestUtil.writeDataToFile(TEST_FILE_IN_DIR1, testData);
assertTrue(TEST_FILE_IN_DIR1.exists());
-
- String fileName = TEST_DIR1.getName() + "/" + TEST_FILE_IN_DIR1.getName();
-
+
+ String fileName = TEST_DIR1.getName() + "/"
+ + TEST_FILE_IN_DIR1.getName();
+
assertEquals(251, client.sendCommand("MD5 " + fileName));
assertHash(testDataHash, client.getReplyString(), fileName);
@@ -125,63 +138,65 @@
Map<String, String> hashes = parseReplyHash(reply);
assertEquals(expected, hashes.get(fileName));
}
-
+
public void testMMd5() throws Exception {
TestUtil.writeDataToFile(TEST_FILE1, testData);
TestUtil.writeDataToFile(TEST_FILE_WITH_SPACE, testData2);
-
+
assertTrue(TEST_FILE1.exists());
assertTrue(TEST_FILE_WITH_SPACE.exists());
-
- String fileNames = TEST_FILE1.getName() + "," + TEST_FILE_WITH_SPACE.getName();
+
+ String fileNames = TEST_FILE1.getName() + ","
+ + TEST_FILE_WITH_SPACE.getName();
assertEquals(252, client.sendCommand("MMD5 " + fileNames));
assertHash(testDataHash, client.getReplyString(), TEST_FILE1.getName());
- assertHash(testData2Hash, client.getReplyString(), TEST_FILE_WITH_SPACE.getName());
+ assertHash(testData2Hash, client.getReplyString(), TEST_FILE_WITH_SPACE
+ .getName());
}
public void testMMd5SingleFile() throws Exception {
TestUtil.writeDataToFile(TEST_FILE1, testData);
-
+
assertTrue(TEST_FILE1.exists());
-
+
String fileNames = TEST_FILE1.getName();
-
+
assertEquals(252, client.sendCommand("MMD5 " + fileNames));
-
+
assertHash(testDataHash, client.getReplyString(), TEST_FILE1.getName());
}
public void testMMd5MixedFilesAndDirs() throws Exception {
TestUtil.writeDataToFile(TEST_FILE1, testData);
TEST_DIR1.mkdirs();
-
+
assertTrue(TEST_FILE1.exists());
assertTrue(TEST_DIR1.exists());
-
+
String fileNames = TEST_FILE1.getName() + "," + TEST_DIR1.getName();
-
+
assertEquals(504, client.sendCommand("MMD5 " + fileNames));
}
-
+
private Map<String, String> parseReplyHash(String reply) {
String s = reply.substring(4);
s = s.trim();
-
+
String[] tokens = s.split(",");
-
+
Map<String, String> result = new HashMap<String, String>();
for (int i = 0; i < tokens.length; i++) {
String token = tokens[i].trim();
int hashStart = token.lastIndexOf(' ');
-
+
String fileName = token.substring(0, hashStart).trim();
String hash = token.substring(hashStart).trim();
-
+
result.put(fileName, hash);
}
-
+
return result;
}
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/HelpTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/HelpTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/HelpTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/HelpTest.java Sun Aug 17 12:52:42 2008
@@ -15,16 +15,21 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
-
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class HelpTest extends ClientTestTemplate {
-
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
@@ -33,22 +38,20 @@
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
}
- /*public void testHelpMulti() throws Exception {
- client.quit();
-
- for(int i = 0; i<1000000; i++) {
- client.connect("localhost", port);
- client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
- client.help();
- client.quit();
- }
- }*/
-
+ /*
+ * public void testHelpMulti() throws Exception { client.quit();
+ *
+ * for(int i = 0; i<1000000; i++) { client.connect("localhost", port);
+ * client.login(ADMIN_USERNAME, ADMIN_PASSWORD); client.help();
+ * client.quit(); } }
+ */
+
public void testHelp() throws Exception {
assertEquals(214, client.help());
- assertTrue(client.getReplyString().indexOf("The following commands are implemented") > -1);
+ assertTrue(client.getReplyString().indexOf(
+ "The following commands are implemented") > -1);
}
-
+
public void testHelpForCWD() throws Exception {
assertEquals(214, client.help("CWD"));
assertTrue(client.getReplyString().indexOf("Syntax: CWD") > -1);
@@ -61,6 +64,7 @@
public void testHelpForUnknownCommand() throws Exception {
assertEquals(214, client.help("foo"));
- assertTrue(client.getReplyString().indexOf("The following commands are implemented") > -1);
+ assertTrue(client.getReplyString().indexOf(
+ "The following commands are implemented") > -1);
}
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/I18NTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/I18NTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/I18NTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/I18NTest.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -26,55 +26,62 @@
import org.apache.commons.net.ftp.FTPClient;
import org.apache.ftpserver.test.TestUtil;
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class I18NTest extends ClientTestTemplate {
private static final String TESTDATA = "TESTDATA";
private static final String ENCODING = "UTF-8";
-
+
private static byte[] testData = null;
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
super.setUp();
testData = TESTDATA.getBytes(ENCODING);
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
}
-
protected FTPClient createFTPClient() throws Exception {
FTPClient client = new FTPClient();
client.setControlEncoding("UTF-8");
return client;
}
-
+
public void testStoreWithUTF8FileName() throws Exception {
-
- String oddFileName = "åäöç";
+
+ String oddFileName = "����";
File testFile = new File(ROOT_DIR, oddFileName);
- assertTrue(client.storeFile(oddFileName, new ByteArrayInputStream(testData)));
-
+ assertTrue(client.storeFile(oddFileName, new ByteArrayInputStream(
+ testData)));
+
assertTrue(testFile.exists());
TestUtil.assertFileEqual(testData, testFile);
}
public void testRetrieveWithUTF8FileName() throws Exception {
-
- String oddFileName = "åäöç";
+
+ String oddFileName = "����";
File testFile = new File(ROOT_DIR, oddFileName);
TestUtil.writeDataToFile(testFile, testData);
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
+
assertTrue(client.retrieveFile(testFile.getName(), baos));
-
+
TestUtil.assertArraysEqual(testData, baos.toByteArray());
}
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -27,17 +27,24 @@
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.listener.nio.NioListener;
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class InetAddressBlacklistTest extends ClientTestTemplate {
protected FtpServer createServer() throws Exception {
FtpServer server = super.createServer();
-
- NioListener listener = (NioListener) server.getServerContext().getListener("default");
-
+
+ NioListener listener = (NioListener) server.getServerContext()
+ .getListener("default");
+
List<InetAddress> blockedAddresses = new ArrayList<InetAddress>();
blockedAddresses.add(InetAddress.getByName("localhost"));
-
+
listener.setBlockedAddresses(blockedAddresses);
-
+
return server;
}
@@ -49,7 +56,7 @@
try {
client.connect("localhost", port);
fail("Must throw");
- } catch(FTPConnectionClosedException e) {
+ } catch (FTPConnectionClosedException e) {
// OK
}
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -23,25 +23,34 @@
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.message.MessageResourceImpl;
-
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class LangTest extends ClientTestTemplate {
-
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#createConfig()
*/
protected FtpServer createServer() throws Exception {
- FtpServer server = super.createServer();
-
- DefaultFtpServerContext context = (DefaultFtpServerContext) server.getServerContext();
+ FtpServer server = super.createServer();
- MessageResourceImpl resource = (MessageResourceImpl) context.getMessageResource();
- resource.setLanguages(new String[] {"en", "zh-tw"});
+ DefaultFtpServerContext context = (DefaultFtpServerContext) server
+ .getServerContext();
+
+ MessageResourceImpl resource = (MessageResourceImpl) context
+ .getMessageResource();
+ resource.setLanguages(new String[] { "en", "zh-tw" });
return server;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
@@ -65,7 +74,7 @@
public void testLangZHTWLowerCase() throws Exception {
assertEquals(200, client.sendCommand("LANG zh-tw"));
}
-
+
public void testLangUnknownLang() throws Exception {
assertEquals(504, client.sendCommand("LANG FOO"));
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ListPassiveTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ListPassiveTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ListPassiveTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ListPassiveTest.java Sun Aug 17 12:52:42 2008
@@ -15,14 +15,20 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
-
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class ListPassiveTest extends ListTest {
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -27,44 +27,52 @@
import org.apache.ftpserver.test.TestUtil;
import org.apache.ftpserver.util.DateUtils;
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class ListTest extends ClientTestTemplate {
private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
+
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_DIR2 = new File(ROOT_DIR, "dir2");
- private static final File TEST_FILE_IN_DIR1 = new File(TEST_DIR1, "test3.txt");
+ private static final File TEST_FILE_IN_DIR1 = new File(TEST_DIR1,
+ "test3.txt");
+
private static final File TEST_DIR_IN_DIR1 = new File(TEST_DIR1, "dir3");
private byte[] testData;
-
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
super.setUp();
testData = "TESDATA".getBytes("UTF-8");
-
- FTPClientConfig config = new FTPClientConfig ("UNIX");
+
+ FTPClientConfig config = new FTPClientConfig("UNIX");
client.configure(config);
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
}
-
-
public void testListFilesInDir() throws Exception {
-
+
TEST_DIR1.mkdirs();
TEST_FILE_IN_DIR1.createNewFile();
TEST_DIR_IN_DIR1.mkdirs();
-
+
FTPFile[] files = client.listFiles(TEST_DIR1.getName());
-
+
assertEquals(2, files.length);
FTPFile file = getFile(files, TEST_FILE_IN_DIR1.getName());
@@ -74,7 +82,7 @@
assertEquals("user", file.getUser());
assertTrue(file.isFile());
assertFalse(file.isDirectory());
-
+
file = getFile(files, TEST_DIR_IN_DIR1.getName());
assertEquals(TEST_DIR_IN_DIR1.getName(), file.getName());
assertEquals(0, file.getSize());
@@ -82,19 +90,19 @@
assertEquals("user", file.getUser());
assertFalse(file.isFile());
assertTrue(file.isDirectory());
-
+
}
-
+
public void testListFile() throws Exception {
-
+
TEST_DIR1.mkdirs();
TEST_FILE1.createNewFile();
TEST_FILE2.createNewFile();
FTPFile[] files = client.listFiles(TEST_FILE1.getName());
-
+
assertEquals(1, files.length);
-
+
FTPFile file = getFile(files, TEST_FILE1.getName());
assertEquals(TEST_FILE1.getName(), file.getName());
assertEquals(0, file.getSize());
@@ -103,14 +111,14 @@
assertTrue(file.isFile());
assertFalse(file.isDirectory());
}
-
+
public void testListFileNoArgument() throws Exception {
TEST_DIR1.mkdirs();
-
+
FTPFile[] files = client.listFiles();
-
+
assertEquals(1, files.length);
-
+
FTPFile file = getFile(files, TEST_DIR1.getName());
assertEquals(TEST_DIR1.getName(), file.getName());
assertEquals(0, file.getSize());
@@ -125,9 +133,9 @@
TEST_FILE2.createNewFile();
TEST_DIR1.mkdirs();
TEST_DIR2.mkdirs();
-
+
TestUtil.writeDataToFile(TEST_FILE1, testData);
-
+
FTPFile[] files = client.listFiles();
assertEquals(4, files.length);
@@ -138,7 +146,7 @@
assertEquals("user", file.getUser());
assertTrue(file.isFile());
assertFalse(file.isDirectory());
-
+
file = getFile(files, TEST_FILE2.getName());
assertEquals(TEST_FILE2.getName(), file.getName());
assertEquals(0, file.getSize());
@@ -167,20 +175,20 @@
public void testListFileNonExistingFile() throws Exception {
FTPFile[] files = client.listFiles("foo");
-
+
assertEquals(0, files.length);
}
-
+
public void testListNames() throws Exception {
TEST_FILE1.createNewFile();
TEST_FILE2.createNewFile();
TEST_DIR1.mkdirs();
TEST_DIR2.mkdirs();
-
+
String[] files = client.listNames();
-
+
assertEquals(4, files.length);
-
+
TestUtil.assertInArrays(TEST_FILE1.getName(), files);
TestUtil.assertInArrays(TEST_FILE2.getName(), files);
TestUtil.assertInArrays(TEST_DIR1.getName(), files);
@@ -191,50 +199,58 @@
TEST_FILE1.createNewFile();
TEST_FILE2.createNewFile();
TEST_DIR1.mkdirs();
-
+
String[] files = client.listNames(TEST_FILE2.getName());
-
+
assertEquals(1, files.length);
-
+
TestUtil.assertInArrays(TEST_FILE2.getName(), files);
}
-
+
public void testMLST() throws Exception {
TEST_FILE1.createNewFile();
-
- assertTrue(FTPReply.isPositiveCompletion(client.sendCommand("MLST " + TEST_FILE1.getName())));
-
+
+ assertTrue(FTPReply.isPositiveCompletion(client.sendCommand("MLST "
+ + TEST_FILE1.getName())));
+
String[] reply = client.getReplyString().split("\\r\\n");
-
- assertEquals("Size=0;Modify=" + DateUtils.getFtpDate(TEST_FILE1.lastModified()) + ";Type=file; " + TEST_FILE1.getName(), reply[1]);
+
+ assertEquals("Size=0;Modify="
+ + DateUtils.getFtpDate(TEST_FILE1.lastModified())
+ + ";Type=file; " + TEST_FILE1.getName(), reply[1]);
}
-
+
public void testOPTSMLST() throws Exception {
TEST_FILE1.createNewFile();
-
- assertTrue(FTPReply.isPositiveCompletion(client.sendCommand("OPTS MLST Size;Modify")));
- assertTrue(FTPReply.isPositiveCompletion(client.sendCommand("MLST " + TEST_FILE1.getName())));
-
+
+ assertTrue(FTPReply.isPositiveCompletion(client
+ .sendCommand("OPTS MLST Size;Modify")));
+ assertTrue(FTPReply.isPositiveCompletion(client.sendCommand("MLST "
+ + TEST_FILE1.getName())));
+
String[] reply = client.getReplyString().split("\\r\\n");
-
- assertEquals("Size=0;Modify=" + DateUtils.getFtpDate(TEST_FILE1.lastModified()) + "; " + TEST_FILE1.getName(), reply[1]);
+
+ assertEquals("Size=0;Modify="
+ + DateUtils.getFtpDate(TEST_FILE1.lastModified()) + "; "
+ + TEST_FILE1.getName(), reply[1]);
}
-
+
public void testOPTSMLSTInvalidType() throws Exception {
TEST_FILE1.createNewFile();
-
- assertTrue(FTPReply.isNegativePermanent(client.sendCommand("OPTS MLST Foo;Size")));
+
+ assertTrue(FTPReply.isNegativePermanent(client
+ .sendCommand("OPTS MLST Foo;Size")));
}
-
+
private FTPFile getFile(FTPFile[] files, String name) {
for (int i = 0; i < files.length; i++) {
FTPFile file = files[i];
-
- if(name.equals(file.getName())) {
+
+ if (name.equals(file.getName())) {
return file;
}
}
-
+
return null;
}
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginNoAnonTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginNoAnonTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginNoAnonTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginNoAnonTest.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -23,24 +23,31 @@
import org.apache.ftpserver.DefaultFtpServerContext;
import org.apache.ftpserver.FtpServer;
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class LoginNoAnonTest extends ClientTestTemplate {
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#createConfig()
*/
protected FtpServer createServer() throws Exception {
- FtpServer server = super.createServer();
-
- DefaultFtpServerContext context = (DefaultFtpServerContext) server.getServerContext();
-
- DefaultConnectionConfig cc = (DefaultConnectionConfig) context.getConnectionConfig();
- cc.setAnonymousLoginEnabled(false);
+ FtpServer server = super.createServer();
- return server;
- }
+ DefaultFtpServerContext context = (DefaultFtpServerContext) server
+ .getServerContext();
+ DefaultConnectionConfig cc = (DefaultConnectionConfig) context
+ .getConnectionConfig();
+ cc.setAnonymousLoginEnabled(false);
+ return server;
+ }
public void testLoginWithAnon() throws Exception {
assertFalse(client.login(ANONYMOUS_USERNAME, ANONYMOUS_PASSWORD));
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginTest.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -25,26 +25,33 @@
import org.apache.commons.net.ftp.FTPConnectionClosedException;
import org.apache.commons.net.ftp.FTPReply;
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class LoginTest extends ClientTestTemplate {
private static final String UNKNOWN_USERNAME = "foo";
+
private static final String UNKNOWN_PASSWORD = "bar";
public void testLogin() throws Exception {
assertTrue(client.login(ADMIN_USERNAME, ADMIN_PASSWORD));
}
-
+
public void testCommandWithoutLogin() throws Exception {
- assertFalse(client.storeFile("foo", new ByteArrayInputStream("foo".getBytes())));
+ assertFalse(client.storeFile("foo", new ByteArrayInputStream("foo"
+ .getBytes())));
}
-
public void testLoginNoUser() throws Exception {
assertFalse(client.login(null, null));
}
public void testLoginWithAccount() throws Exception {
assertTrue(client.login(ADMIN_USERNAME, ADMIN_PASSWORD));
-
+
assertTrue(FTPReply.isPositiveCompletion(client.acct("FOO")));
}
@@ -52,7 +59,7 @@
assertTrue(FTPReply.isPositiveIntermediate(client.user(ADMIN_USERNAME)));
assertEquals(501, client.sendCommand("PASS"));
}
-
+
public void testLoginIncorrectPassword() throws Exception {
assertFalse(client.login(ADMIN_USERNAME, UNKNOWN_PASSWORD));
}
@@ -67,12 +74,12 @@
assertTrue(client.login(ADMIN_USERNAME, ADMIN_PASSWORD));
}
-
public void testDoubleLoginDifferentUser() throws Exception {
assertTrue(client.login(ADMIN_USERNAME, ADMIN_PASSWORD));
- assertFalse("Login with different user not allowed", client.login(TESTUSER1_USERNAME, TESTUSER_PASSWORD));
+ assertFalse("Login with different user not allowed", client.login(
+ TESTUSER1_USERNAME, TESTUSER_PASSWORD));
}
-
+
public void testREIN() throws Exception {
assertTrue(client.login(ADMIN_USERNAME, ADMIN_PASSWORD));
assertTrue(FTPReply.isPositiveCompletion(client.rein()));
@@ -81,7 +88,7 @@
public void testReLoginWithOnlyPass() throws Exception {
assertFalse(client.login(ADMIN_USERNAME, UNKNOWN_PASSWORD));
-
+
int reply = client.pass(ADMIN_PASSWORD);
assertTrue(FTPReply.isNegativePermanent(reply));
}
@@ -93,9 +100,9 @@
public void testLoginThenPass() throws Exception {
assertTrue(client.login(ADMIN_USERNAME, ADMIN_PASSWORD));
-
+
int reply = client.pass(ADMIN_PASSWORD);
-
+
assertTrue(FTPReply.isPositiveCompletion(reply));
}
@@ -106,66 +113,54 @@
public void testLoginUnknownUser() throws Exception {
assertFalse(client.login(UNKNOWN_USERNAME, UNKNOWN_PASSWORD));
}
-
-/*
- public void testLoginWithMaxConnectionsPerIp() throws Exception {
- String[] ips = getHostAddresses();
-
- if(ips.length > 1) {
- FTPClient client2 = new FTPClient();
- client2.connect(ips[0], port);
- FTPClient client3 = new FTPClient();
- client3.connect(ips[0], port);
- FTPClient client4 = new FTPClient();
- client4.connect(ips[1], port);
- FTPClient client5 = new FTPClient();
- client5.connect(ips[1], port);
- FTPClient client6 = new FTPClient();
- client6.connect(ips[1], port);
-
- assertTrue(client2.login(TESTUSER2_USERNAME, TESTUSER_PASSWORD));
- assertTrue(client3.login(TESTUSER2_USERNAME, TESTUSER_PASSWORD));
- assertTrue(client4.login(TESTUSER2_USERNAME, TESTUSER_PASSWORD));
- assertTrue(client5.login(TESTUSER2_USERNAME, TESTUSER_PASSWORD));
- try{
- assertTrue(client6.login(TESTUSER2_USERNAME, TESTUSER_PASSWORD));
- fail("Must throw FTPConnectionClosedException");
- } catch(FTPConnectionClosedException e) {
- // expected
- }
- } else {
- // ignore test
- }
- }
- */
- /*public void testLoginWithMaxConnectionsMulti() throws Exception {
- for(int i = 0; i<50; i++) {
- testLoginWithMaxConnections();
- }
- }*/
-
+ /*
+ * public void testLoginWithMaxConnectionsPerIp() throws Exception {
+ * String[] ips = getHostAddresses();
+ *
+ * if(ips.length > 1) { FTPClient client2 = new FTPClient();
+ * client2.connect(ips[0], port); FTPClient client3 = new FTPClient();
+ * client3.connect(ips[0], port); FTPClient client4 = new FTPClient();
+ * client4.connect(ips[1], port); FTPClient client5 = new FTPClient();
+ * client5.connect(ips[1], port); FTPClient client6 = new FTPClient();
+ * client6.connect(ips[1], port);
+ *
+ * assertTrue(client2.login(TESTUSER2_USERNAME, TESTUSER_PASSWORD));
+ * assertTrue(client3.login(TESTUSER2_USERNAME, TESTUSER_PASSWORD));
+ * assertTrue(client4.login(TESTUSER2_USERNAME, TESTUSER_PASSWORD));
+ * assertTrue(client5.login(TESTUSER2_USERNAME, TESTUSER_PASSWORD));
+ *
+ * try{ assertTrue(client6.login(TESTUSER2_USERNAME, TESTUSER_PASSWORD));
+ * fail("Must throw FTPConnectionClosedException"); }
+ * catch(FTPConnectionClosedException e) { // expected } } else { // ignore
+ * test } }
+ */
+ /*
+ * public void testLoginWithMaxConnectionsMulti() throws Exception { for(int
+ * i = 0; i<50; i++) { testLoginWithMaxConnections(); } }
+ */
+
public void testLoginWithMaxConnections() throws Exception {
FTPClient client1 = new FTPClient();
FTPClient client2 = new FTPClient();
FTPClient client3 = new FTPClient();
FTPClient client4 = new FTPClient();
-
- try{
+
+ try {
client1.connect("localhost", port);
client2.connect("localhost", port);
client3.connect("localhost", port);
client4.connect("localhost", port);
-
+
assertTrue(client1.login(TESTUSER1_USERNAME, TESTUSER_PASSWORD));
assertTrue(client2.login(TESTUSER1_USERNAME, TESTUSER_PASSWORD));
assertTrue(client3.login(TESTUSER1_USERNAME, TESTUSER_PASSWORD));
-
- try{
+
+ try {
assertTrue(client4.login(TESTUSER1_USERNAME, TESTUSER_PASSWORD));
assertEquals(421, client.getReplyCode());
fail("Must throw FTPConnectionClosedException");
- } catch(FTPConnectionClosedException e) {
+ } catch (FTPConnectionClosedException e) {
// expected
}
} finally {
@@ -175,19 +170,19 @@
closeQuitely(client4);
}
}
-
+
private void closeQuitely(FTPClient client) {
- try{
+ try {
client.logout();
- } catch(Exception e) {
+ } catch (Exception e) {
// ignore
}
- try{
+ try {
client.disconnect();
- } catch(Exception e) {
+ } catch (Exception e) {
// ignore
}
-
+
}
-
+
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/MDTMTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/MDTMTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/MDTMTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/MDTMTest.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -23,14 +23,23 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class MDTMTest extends ClientTestTemplate {
- private static final SimpleDateFormat FTP_DATE_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss.SSS");
+ private static final SimpleDateFormat FTP_DATE_FORMAT = new SimpleDateFormat(
+ "yyyyMMddHHmmss.SSS");
+
private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
+
private static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
@@ -42,11 +51,12 @@
public void testMDTMForFile() throws Exception {
assertFalse(TEST_FILE1.exists());
assertTrue(TEST_FILE1.createNewFile());
-
+
Date expected = new Date(TEST_FILE1.lastModified());
assertEquals(213, client.sendCommand("MDTM " + TEST_FILE1.getName()));
- Date actual = FTP_DATE_FORMAT.parse(client.getReplyString().substring(4).trim());
+ Date actual = FTP_DATE_FORMAT.parse(client.getReplyString()
+ .substring(4).trim());
assertEquals(expected, actual);
}
@@ -56,11 +66,12 @@
Date expected = new Date(TEST_DIR1.lastModified());
assertEquals(213, client.sendCommand("MDTM " + TEST_DIR1.getName()));
-
- Date actual = FTP_DATE_FORMAT.parse(client.getReplyString().substring(4).trim());
+
+ Date actual = FTP_DATE_FORMAT.parse(client.getReplyString()
+ .substring(4).trim());
assertEquals(expected, actual);
}
-
+
public void testMDTMForNonExistingFile() throws Exception {
assertEquals(550, client.sendCommand("MDTM " + TEST_FILE1.getName()));
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressTest.java Sun Aug 17 12:52:42 2008
@@ -27,15 +27,22 @@
import org.apache.ftpserver.test.TestUtil;
import org.apache.ftpserver.util.SocketAddressEncoder;
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class PasvAddressTest extends ClientTestTemplate {
private InetAddress passiveAddress;
-
+
protected FtpServer createServer() throws Exception {
FtpServer server = super.createServer();
- DefaultDataConnectionConfiguration ddcc = (DefaultDataConnectionConfiguration) server.getServerContext()
- .getListener("default").getDataConnectionConfiguration();
+ DefaultDataConnectionConfiguration ddcc = (DefaultDataConnectionConfiguration) server
+ .getServerContext().getListener("default")
+ .getDataConnectionConfiguration();
passiveAddress = TestUtil.findNonLocalhostIp();
ddcc.setPassiveAddress(passiveAddress);
@@ -50,10 +57,10 @@
String reply = client.getReplyString();
- String ipEncoded = SocketAddressEncoder.encode(new InetSocketAddress(passiveAddress, 12347));
-
-
- assertTrue("The PASV address should contain \"" + ipEncoded + "\" but was \"" + reply + "\"",
- reply.indexOf(ipEncoded) > -1);
+ String ipEncoded = SocketAddressEncoder.encode(new InetSocketAddress(
+ passiveAddress, 12347));
+
+ assertTrue("The PASV address should contain \"" + ipEncoded
+ + "\" but was \"" + reply + "\"", reply.indexOf(ipEncoded) > -1);
}
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithHostnameTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithHostnameTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithHostnameTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithHostnameTest.java Sun Aug 17 12:52:42 2008
@@ -26,19 +26,25 @@
import org.apache.ftpserver.FtpServer;
/**
- * Test for external passive address configured as hostname rather than
- * IP address.
+ * Test for external passive address configured as hostname rather than IP
+ * address.
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev$, $Date$
+ *
*/
public class PasvAddressWithHostnameTest extends ClientTestTemplate {
protected FtpServer createServer() throws Exception {
- FtpServer server = super.createServer();
-
- DefaultFtpServerContext context = (DefaultFtpServerContext) server.getServerContext();
-
- DefaultDataConnectionConfiguration ddcc = (DefaultDataConnectionConfiguration) context.getListener("default").getDataConnectionConfiguration();
- ddcc.setPassiveExernalAddress(InetAddress.getByName("127.0.0.1"));
-
+ FtpServer server = super.createServer();
+
+ DefaultFtpServerContext context = (DefaultFtpServerContext) server
+ .getServerContext();
+
+ DefaultDataConnectionConfiguration ddcc = (DefaultDataConnectionConfiguration) context
+ .getListener("default").getDataConnectionConfiguration();
+ ddcc.setPassiveExernalAddress(InetAddress.getByName("127.0.0.1"));
+
return server;
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvTest.java Sun Aug 17 12:52:42 2008
@@ -15,48 +15,53 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
import org.apache.commons.net.ftp.FTPConnectionClosedException;
import org.apache.ftpserver.test.TestUtil;
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class PasvTest extends ClientTestTemplate {
-
+
protected boolean isConnectClient() {
return false;
}
/**
- * This tests that the correct IP is returned, that is
- * the IP that the client has connected to.
+ * This tests that the correct IP is returned, that is the IP that the
+ * client has connected to.
*
- * Note that this test will only work if you got more than one
- * NIC and the server is allowed to listen an all NICs
+ * Note that this test will only work if you got more than one NIC and the
+ * server is allowed to listen an all NICs
*/
public void testPasvIp() throws Exception {
String[] ips = TestUtil.getHostAddresses();
-
+
for (int i = 0; i < ips.length; i++) {
String ip = ips[i];
String ftpIp = ip.replace('.', ',');
-
- if(!ip.startsWith("0.")) {
- try{
+
+ if (!ip.startsWith("0.")) {
+ try {
client.connect(ip, port);
- } catch(FTPConnectionClosedException e) {
+ } catch (FTPConnectionClosedException e) {
// try again
Thread.sleep(200);
client.connect(ip, port);
}
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
client.pasv();
-
- assertTrue(client.getReplyString().indexOf(ftpIp) > -1 );
-
+
+ assertTrue(client.getReplyString().indexOf(ftpIp) > -1);
+
client.quit();
client.disconnect();
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RenameTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RenameTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RenameTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RenameTest.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -23,20 +23,35 @@
import org.apache.commons.net.ftp.FTPReply;
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class RenameTest extends ClientTestTemplate {
private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
+
private static final File TEST_FILE2 = new File(ROOT_DIR, "test2.txt");
+
private static final File TEST_FILE3 = new File(ROOT_DIR, "test3.txt");
private static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
+
private static final File TEST_DIR2 = new File(ROOT_DIR, "dir2");
- private static final File TEST_FILE_IN_DIR1 = new File(TEST_DIR1, "test4.txt");
- private static final File TEST_FILE_IN_DIR2 = new File(TEST_DIR2, "test4.txt");
- private static final File TEST_FILE2_IN_DIR2 = new File(TEST_DIR2, "test5.txt");
-
- /* (non-Javadoc)
+ private static final File TEST_FILE_IN_DIR1 = new File(TEST_DIR1,
+ "test4.txt");
+
+ private static final File TEST_FILE_IN_DIR2 = new File(TEST_DIR2,
+ "test4.txt");
+
+ private static final File TEST_FILE2_IN_DIR2 = new File(TEST_DIR2,
+ "test5.txt");
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
@@ -45,28 +60,26 @@
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
}
-
-
public void testRename() throws Exception {
TEST_FILE1.createNewFile();
-
+
assertTrue(TEST_FILE1.exists());
assertFalse(TEST_FILE2.exists());
-
+
assertTrue(client.rename(TEST_FILE1.getName(), TEST_FILE2.getName()));
-
+
assertFalse(TEST_FILE1.exists());
assertTrue(TEST_FILE2.exists());
}
public void testRenameEmptyDir() throws Exception {
TEST_DIR1.mkdirs();
-
+
assertTrue(TEST_DIR1.exists());
assertFalse(TEST_DIR2.exists());
-
+
assertTrue(client.rename(TEST_DIR1.getName(), TEST_DIR2.getName()));
-
+
assertFalse(TEST_DIR1.exists());
assertTrue(TEST_DIR2.exists());
}
@@ -74,14 +87,14 @@
public void testRenameDirWithFile() throws Exception {
TEST_DIR1.mkdirs();
TEST_FILE_IN_DIR1.createNewFile();
-
+
assertTrue(TEST_DIR1.exists());
assertFalse(TEST_DIR2.exists());
assertTrue(TEST_FILE_IN_DIR1.exists());
assertFalse(TEST_FILE_IN_DIR2.exists());
-
+
assertTrue(client.rename(TEST_DIR1.getName(), TEST_DIR2.getName()));
-
+
assertFalse(TEST_DIR1.exists());
assertTrue(TEST_DIR2.exists());
assertFalse(TEST_FILE_IN_DIR1.exists());
@@ -92,45 +105,44 @@
TEST_DIR1.mkdirs();
TEST_DIR2.mkdirs();
TEST_FILE_IN_DIR1.createNewFile();
-
+
assertTrue(TEST_DIR1.exists());
assertTrue(TEST_DIR2.exists());
assertTrue(TEST_FILE_IN_DIR1.exists());
assertFalse(TEST_FILE2_IN_DIR2.exists());
-
- assertTrue(client.rename(
- TEST_DIR1.getName() + "/" + TEST_FILE_IN_DIR1.getName(),
- TEST_DIR2.getName() + "/" + TEST_FILE2_IN_DIR2.getName()));
-
+
+ assertTrue(client.rename(TEST_DIR1.getName() + "/"
+ + TEST_FILE_IN_DIR1.getName(), TEST_DIR2.getName() + "/"
+ + TEST_FILE2_IN_DIR2.getName()));
+
assertTrue(TEST_DIR1.exists());
assertTrue(TEST_DIR2.exists());
assertFalse(TEST_FILE_IN_DIR1.exists());
assertTrue(TEST_FILE2_IN_DIR2.exists());
}
-
public void testRenameWithoutWriteAccess() throws Exception {
client.rein();
client.login(ANONYMOUS_USERNAME, ANONYMOUS_PASSWORD);
-
+
TEST_FILE1.createNewFile();
-
+
assertTrue(TEST_FILE1.exists());
assertFalse(TEST_FILE2.exists());
-
+
assertFalse(client.rename(TEST_FILE1.getName(), TEST_FILE2.getName()));
-
+
assertTrue(TEST_FILE1.exists());
assertFalse(TEST_FILE2.exists());
}
public void testRenameNonExistingFile() throws Exception {
-
+
assertFalse(TEST_FILE1.exists());
assertFalse(TEST_FILE2.exists());
-
+
assertFalse(client.rename(TEST_FILE1.getName(), TEST_FILE2.getName()));
-
+
assertFalse(TEST_FILE1.exists());
assertFalse(TEST_FILE2.exists());
}
@@ -138,26 +150,27 @@
public void testRenameToFileExists() throws Exception {
TEST_FILE1.createNewFile();
TEST_FILE2.createNewFile();
-
+
assertTrue(TEST_FILE1.exists());
assertTrue(TEST_FILE2.exists());
-
+
assertFalse(client.rename(TEST_FILE1.getName(), TEST_FILE2.getName()));
-
+
assertTrue(TEST_FILE1.exists());
assertTrue(TEST_FILE2.exists());
}
public void testRenameWithNoopInBetween() throws Exception {
TEST_FILE1.createNewFile();
-
+
assertTrue(TEST_FILE1.exists());
assertFalse(TEST_FILE2.exists());
-
-
- assertTrue(FTPReply.isPositiveIntermediate(client.rnfr(TEST_FILE1.getName())));
+
+ assertTrue(FTPReply.isPositiveIntermediate(client.rnfr(TEST_FILE1
+ .getName())));
assertTrue(FTPReply.isPositiveCompletion(client.noop()));
- assertTrue(FTPReply.isNegativePermanent(client.rnto(TEST_FILE2.getName())));
+ assertTrue(FTPReply.isNegativePermanent(client.rnto(TEST_FILE2
+ .getName())));
assertTrue(TEST_FILE1.exists());
assertFalse(TEST_FILE2.exists());
@@ -166,32 +179,34 @@
public void testRenameWithDoubleRnfr() throws Exception {
TEST_FILE1.createNewFile();
TEST_FILE3.createNewFile();
-
+
assertTrue(TEST_FILE1.exists());
assertFalse(TEST_FILE2.exists());
assertTrue(TEST_FILE3.exists());
-
-
- assertTrue(FTPReply.isPositiveIntermediate(client.rnfr(TEST_FILE1.getName())));
- assertTrue(FTPReply.isPositiveIntermediate(client.rnfr(TEST_FILE3.getName())));
- assertTrue(FTPReply.isPositiveCompletion(client.rnto(TEST_FILE2.getName())));
-
+
+ assertTrue(FTPReply.isPositiveIntermediate(client.rnfr(TEST_FILE1
+ .getName())));
+ assertTrue(FTPReply.isPositiveIntermediate(client.rnfr(TEST_FILE3
+ .getName())));
+ assertTrue(FTPReply.isPositiveCompletion(client.rnto(TEST_FILE2
+ .getName())));
+
assertTrue(TEST_FILE1.exists());
assertTrue(TEST_FILE2.exists());
assertFalse(TEST_FILE3.exists());
}
public void testRenameOnlyRnto() throws Exception {
- assertTrue(FTPReply.isNegativePermanent(client.rnto(TEST_FILE2.getName())));
+ assertTrue(FTPReply.isNegativePermanent(client.rnto(TEST_FILE2
+ .getName())));
}
public void testRenameWithNullRnfrPath() throws Exception {
TEST_FILE1.createNewFile();
-
+
assertTrue(TEST_FILE1.exists());
assertFalse(TEST_FILE2.exists());
-
-
+
assertTrue(FTPReply.isNegativePermanent(client.rnfr(null)));
assertTrue(TEST_FILE1.exists());
@@ -200,14 +215,14 @@
public void testRenameWithNullRntoPath() throws Exception {
TEST_FILE1.createNewFile();
-
+
assertTrue(TEST_FILE1.exists());
assertFalse(TEST_FILE2.exists());
-
-
- assertTrue(FTPReply.isPositiveIntermediate(client.rnfr(TEST_FILE1.getName())));
+
+ assertTrue(FTPReply.isPositiveIntermediate(client.rnfr(TEST_FILE1
+ .getName())));
assertTrue(FTPReply.isNegativePermanent(client.rnto(null)));
-
+
assertTrue(TEST_FILE1.exists());
assertFalse(TEST_FILE2.exists());
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RetrievePassiveTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RetrievePassiveTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RetrievePassiveTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RetrievePassiveTest.java Sun Aug 17 12:52:42 2008
@@ -15,15 +15,21 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
-
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class RetrievePassiveTest extends RetrieveTest {
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RetrieveTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RetrieveTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RetrieveTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RetrieveTest.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -24,109 +24,119 @@
import org.apache.ftpserver.test.TestUtil;
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class RetrieveTest extends ClientTestTemplate {
private static final String TEST_FILENAME = "test.txt";
+
private static final String TEST_FILENAME_WITH_LEADING_SPACE = " leading.txt";
-
+
private static final File TEST_FILE = new File(ROOT_DIR, TEST_FILENAME);
- private static final File TEST_FILE_WITH_LEADING_SPACE = new File(ROOT_DIR, TEST_FILENAME_WITH_LEADING_SPACE);
- private static final String EOL = System.getProperty("line.separator");
-
+ private static final File TEST_FILE_WITH_LEADING_SPACE = new File(ROOT_DIR,
+ TEST_FILENAME_WITH_LEADING_SPACE);
+
+ private static final String EOL = System.getProperty("line.separator");
+
private static byte[] testData = null;
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
super.setUp();
- testData = ("TESTDATA" +EOL).getBytes("UTF-8");
-
+ testData = ("TESTDATA" + EOL).getBytes("UTF-8");
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
}
public void testRetrieve() throws Exception {
-
+
TestUtil.writeDataToFile(TEST_FILE, testData);
assertTrue(TEST_FILE.exists());
ByteArrayOutputStream baos = new ByteArrayOutputStream();
assertTrue(client.retrieveFile(TEST_FILENAME, baos));
-
+
assertTrue(TEST_FILE.exists());
TestUtil.assertArraysEqual(testData, baos.toByteArray());
}
public void testRetrieveWithLeadingSpace() throws Exception {
-
+
TestUtil.writeDataToFile(TEST_FILE_WITH_LEADING_SPACE, testData);
assertTrue(TEST_FILE_WITH_LEADING_SPACE.exists());
ByteArrayOutputStream baos = new ByteArrayOutputStream();
assertTrue(client.retrieveFile(TEST_FILENAME_WITH_LEADING_SPACE, baos));
-
+
assertTrue(TEST_FILE_WITH_LEADING_SPACE.exists());
TestUtil.assertArraysEqual(testData, baos.toByteArray());
}
-
+
public void testRetrieveNoFileName() throws Exception {
assertEquals(501, client.sendCommand("RETR"));
}
-
+
public void testRetrieveInValidFileName() throws Exception {
- assertEquals(550 ,client.sendCommand("RETR foo:bar;foo"));
+ assertEquals(550, client.sendCommand("RETR foo:bar;foo"));
}
public void testRetrieveDirectory() throws Exception {
TEST_FILE.mkdirs();
- assertEquals(550, client.sendCommand("RETR "+ TEST_FILE.getName()));
+ assertEquals(550, client.sendCommand("RETR " + TEST_FILE.getName()));
}
-
+
public void testRetrieveWithRestart() throws Exception {
int skipLen = 4;
-
+
TestUtil.writeDataToFile(TEST_FILE, testData);
-
+
assertTrue(TEST_FILE.exists());
-
+
client.setRestartOffset(4);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
assertTrue(client.retrieveFile(TEST_FILENAME, baos));
-
+
int len = testData.length - skipLen;
byte[] expected = new byte[len];
System.arraycopy(testData, skipLen, expected, 0, len);
-
+
assertTrue(TEST_FILE.exists());
TestUtil.assertArraysEqual(expected, baos.toByteArray());
}
-
+
public void testRetrieveWithPath() throws Exception {
File dir = new File(ROOT_DIR, "foo/bar");
dir.mkdirs();
-
+
File testFile = new File(dir, TEST_FILENAME);
-
+
TestUtil.writeDataToFile(testFile, testData);
-
+
assertTrue(testFile.exists());
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
assertTrue(client.retrieveFile("foo/bar/" + TEST_FILENAME, baos));
-
+
assertTrue(testFile.exists());
TestUtil.assertArraysEqual(testData, baos.toByteArray());
}
public void testRetrieveNonExistingFile() throws Exception {
-
+
assertFalse(TEST_FILE.exists());
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
assertFalse(client.retrieveFile(TEST_FILENAME, baos));
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RmDirTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RmDirTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RmDirTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RmDirTest.java Sun Aug 17 12:52:42 2008
@@ -15,18 +15,26 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
import java.io.File;
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class RmDirTest extends ClientTestTemplate {
private static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
+
private static final File TEST_DIR_IN_DIR1 = new File(TEST_DIR1, "dir3");
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
@@ -38,42 +46,43 @@
public void testRmdir() throws Exception {
assertTrue(TEST_DIR1.mkdirs());
assertTrue(client.removeDirectory(TEST_DIR1.getName()));
-
+
assertFalse(TEST_DIR1.exists());
}
public void testRmdirNestedDir() throws Exception {
assertTrue(TEST_DIR_IN_DIR1.mkdirs());
- assertTrue(client.removeDirectory(TEST_DIR1.getName() + "/" + TEST_DIR_IN_DIR1.getName()));
-
+ assertTrue(client.removeDirectory(TEST_DIR1.getName() + "/"
+ + TEST_DIR_IN_DIR1.getName()));
+
assertTrue(TEST_DIR1.exists());
assertFalse(TEST_DIR_IN_DIR1.exists());
}
public void testRmdirNoDirectoryName() throws Exception {
- assertEquals(501 ,client.sendCommand("RMD"));
+ assertEquals(501, client.sendCommand("RMD"));
}
public void testRmdirInValidDirectoryName() throws Exception {
- assertEquals(550 ,client.sendCommand("RMD foo:bar;foo"));
+ assertEquals(550, client.sendCommand("RMD foo:bar;foo"));
}
public void testRmdirOnFile() throws Exception {
assertTrue(TEST_DIR1.createNewFile());
-
+
assertFalse(client.removeDirectory(TEST_DIR1.getName()));
-
+
assertTrue(TEST_DIR1.exists());
}
-
+
public void testRmdirWithoutWriteAccess() throws Exception {
client.rein();
client.login(ANONYMOUS_USERNAME, ANONYMOUS_PASSWORD);
-
+
assertTrue(TEST_DIR1.mkdirs());
-
+
assertFalse(client.removeDirectory(TEST_DIR1.getName()));
-
+
assertTrue(TEST_DIR1.exists());
}
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SizeTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SizeTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SizeTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SizeTest.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -24,36 +24,46 @@
import org.apache.commons.net.ftp.FTPReply;
import org.apache.ftpserver.test.TestUtil;
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class SizeTest extends ClientTestTemplate {
protected static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
+
protected static final File TEST_FILE1 = new File(ROOT_DIR, "file1.txt");
protected static final byte[] TEST_DATA1 = "TESTDATA".getBytes();
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
super.setUp();
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
}
- private void assertSizeReply(String reply, int size) {
+ private void assertSizeReply(String reply, int size) {
reply = reply.trim();
reply = reply.substring(4);
-
+
assertEquals(size, Integer.parseInt(reply));
}
-
+
public void testSizeOnFile() throws Exception {
TestUtil.writeDataToFile(TEST_FILE1, TEST_DATA1);
-
- assertTrue(FTPReply.isPositiveCompletion(client.sendCommand("SIZE " + TEST_FILE1.getName())));
+
+ assertTrue(FTPReply.isPositiveCompletion(client.sendCommand("SIZE "
+ + TEST_FILE1.getName())));
assertSizeReply(client.getReplyString(), TEST_DATA1.length);
- assertTrue(FTPReply.isPositiveCompletion(client.sendCommand("SIZE /" + TEST_FILE1.getName())));
+ assertTrue(FTPReply.isPositiveCompletion(client.sendCommand("SIZE /"
+ + TEST_FILE1.getName())));
assertSizeReply(client.getReplyString(), TEST_DATA1.length);
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/StorePassiveTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/StorePassiveTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/StorePassiveTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/StorePassiveTest.java Sun Aug 17 12:52:42 2008
@@ -15,14 +15,20 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
-
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class StorePassiveTest extends StoreTest {
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/StoreTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/StoreTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/StoreTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/StoreTest.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -25,25 +25,34 @@
import org.apache.commons.net.ftp.FTPClient;
import org.apache.ftpserver.test.TestUtil;
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class StoreTest extends ClientTestTemplate {
private static final String TESTDATA = "TESTDATA\r\nline2\r\n";
private static final String ENCODING = "UTF-8";
private static final String TEST_FILENAME = "test.txt";
+
private static final String TEST_FILENAME_WITH_LEADING_SPACE = " leading.txt";
private static final int SKIP_LEN = 4;
-
-
+
private static final File TEST_DIR = new File(ROOT_DIR, "foo/bar");
-
+
private static byte[] testData = null;
+
private static byte[] doubleTestData = null;
+
private static byte[] oneAndAHalfTestData = null;
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
@@ -52,56 +61,59 @@
testData = TESTDATA.getBytes(ENCODING);
doubleTestData = (TESTDATA + TESTDATA).getBytes(ENCODING);
oneAndAHalfTestData = ("TEST" + TESTDATA).getBytes(ENCODING);
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
}
public void testStore() throws Exception {
File testFile = new File(ROOT_DIR, TEST_FILENAME);
- assertTrue(client.storeFile(TEST_FILENAME, new ByteArrayInputStream(testData)));
-
+ assertTrue(client.storeFile(TEST_FILENAME, new ByteArrayInputStream(
+ testData)));
+
assertTrue(testFile.exists());
TestUtil.assertFileEqual(testData, testFile);
}
-
public void testStoreWithLeadingSpace() throws Exception {
File testFile = new File(ROOT_DIR, TEST_FILENAME_WITH_LEADING_SPACE);
- assertTrue(client.storeFile(TEST_FILENAME_WITH_LEADING_SPACE, new ByteArrayInputStream(testData)));
-
+ assertTrue(client.storeFile(TEST_FILENAME_WITH_LEADING_SPACE,
+ new ByteArrayInputStream(testData)));
+
assertTrue(testFile.exists());
TestUtil.assertFileEqual(testData, testFile);
}
-
+
public void testStoreNoFileName() throws Exception {
assertEquals(501, client.sendCommand("STOR"));
}
-
- /* TODO: this test now fails as we don't detect the invalid file name
- * A future improvment would be to detect this and report an error
- public void testStoreInValidFileName() throws Exception {
- assertEquals(550 ,client.sendCommand("STOR foo:bar;foo"));
- }
- */
-
+
+ /*
+ * TODO: this test now fails as we don't detect the invalid file name A
+ * future improvment would be to detect this and report an error public void
+ * testStoreInValidFileName() throws Exception { assertEquals(550
+ * ,client.sendCommand("STOR foo:bar;foo")); }
+ */
+
public void testStoreWithRestart() throws Exception {
File testFile = new File(ROOT_DIR, TEST_FILENAME);
TestUtil.writeDataToFile(testFile, testData);
-
+
client.setRestartOffset(SKIP_LEN);
- assertTrue(client.storeFile(TEST_FILENAME, new ByteArrayInputStream(testData)));
-
+ assertTrue(client.storeFile(TEST_FILENAME, new ByteArrayInputStream(
+ testData)));
+
assertTrue(testFile.exists());
TestUtil.assertFileEqual(oneAndAHalfTestData, testFile);
}
public void testStoreEmptyFile() throws Exception {
File testFile = new File(ROOT_DIR, TEST_FILENAME);
-
- assertTrue(client.storeFile(TEST_FILENAME, new ByteArrayInputStream(new byte[0])));
-
+
+ assertTrue(client.storeFile(TEST_FILENAME, new ByteArrayInputStream(
+ new byte[0])));
+
assertTrue(testFile.exists());
assertEquals(0, testFile.length());
}
@@ -109,12 +121,13 @@
public void testStoreWithExistingFile() throws Exception {
File testFile = new File(ROOT_DIR, TEST_FILENAME);
testFile.createNewFile();
-
+
assertTrue(testFile.exists());
assertEquals(0, testFile.length());
- assertTrue(client.storeFile(TEST_FILENAME, new ByteArrayInputStream(testData)));
-
+ assertTrue(client.storeFile(TEST_FILENAME, new ByteArrayInputStream(
+ testData)));
+
assertTrue(testFile.exists());
TestUtil.assertFileEqual(testData, testFile);
}
@@ -123,20 +136,22 @@
File testFile = new File(ROOT_DIR, TEST_FILENAME);
assertFalse(testFile.exists());
assertTrue(testFile.mkdirs());
-
+
assertTrue(testFile.exists());
- assertFalse(client.storeFile(TEST_FILENAME, new ByteArrayInputStream(testData)));
-
+ assertFalse(client.storeFile(TEST_FILENAME, new ByteArrayInputStream(
+ testData)));
+
assertTrue(testFile.exists());
assertTrue(testFile.isDirectory());
}
-
+
public void testStoreWithPath() throws Exception {
TEST_DIR.mkdirs();
File testFile = new File(TEST_DIR, TEST_FILENAME);
-
- assertTrue(client.storeFile("foo/bar/" + TEST_FILENAME, new ByteArrayInputStream(testData)));
-
+
+ assertTrue(client.storeFile("foo/bar/" + TEST_FILENAME,
+ new ByteArrayInputStream(testData)));
+
assertTrue(testFile.exists());
TestUtil.assertFileEqual(testData, testFile);
}
@@ -144,70 +159,76 @@
public void testStoreWithLeadingSlash() throws Exception {
TEST_DIR.mkdirs();
File testFile = new File(ROOT_DIR, TEST_FILENAME);
-
- assertTrue(client.storeFile("/" + TEST_FILENAME, new ByteArrayInputStream(testData)));
-
+
+ assertTrue(client.storeFile("/" + TEST_FILENAME,
+ new ByteArrayInputStream(testData)));
+
assertTrue(testFile.exists());
TestUtil.assertFileEqual(testData, testFile);
}
-
+
public void testStoreWithNonExistingPath() throws Exception {
File testFile = new File(TEST_DIR, TEST_FILENAME);
- assertFalse(client.storeFile("foo/bar/" + TEST_FILENAME, new ByteArrayInputStream(testData)));
+ assertFalse(client.storeFile("foo/bar/" + TEST_FILENAME,
+ new ByteArrayInputStream(testData)));
assertFalse(testFile.exists());
}
public void testStoreWithoutWriteAccess() throws Exception {
File testFile = new File(ROOT_DIR, TEST_FILENAME);
-
+
client.rein();
client.login("anonymous", "foo@bar.com");
-
- assertFalse(client.storeFile(TEST_FILENAME, new ByteArrayInputStream(testData)));
+
+ assertFalse(client.storeFile(TEST_FILENAME, new ByteArrayInputStream(
+ testData)));
assertFalse(testFile.exists());
}
-
+
public void testStoreUniqueWithNoDirectory() throws Exception {
assertTrue(client.storeUniqueFile(new ByteArrayInputStream(testData)));
-
+
doAssertOfUniqueFile(client, ROOT_DIR);
}
public void testStoreUniqueWithCompletePath() throws Exception {
- TEST_DIR.mkdirs();
- File existingFile = new File(TEST_DIR, "existingFile.txt");
- existingFile.createNewFile();
-
- assertTrue(client.storeUniqueFile("foo/bar/existingFile.txt", new ByteArrayInputStream(testData)));
-
- doAssertOfUniqueFile(client, ROOT_DIR);
- }
-
- public void testStoreUniqueWithDirectory() throws Exception {
TEST_DIR.mkdirs();
+ File existingFile = new File(TEST_DIR, "existingFile.txt");
+ existingFile.createNewFile();
+
+ assertTrue(client.storeUniqueFile("foo/bar/existingFile.txt",
+ new ByteArrayInputStream(testData)));
- assertTrue(client.storeUniqueFile("foo/bar", new ByteArrayInputStream(testData)));
-
doAssertOfUniqueFile(client, ROOT_DIR);
}
- public void testStoreUniqueWithDirectoryWithTrailingSlash() throws Exception {
+ public void testStoreUniqueWithDirectory() throws Exception {
TEST_DIR.mkdirs();
-
- assertTrue(client.storeUniqueFile("foo/bar/", new ByteArrayInputStream(testData)));
-
+
+ assertTrue(client.storeUniqueFile("foo/bar", new ByteArrayInputStream(
+ testData)));
+
doAssertOfUniqueFile(client, ROOT_DIR);
}
+ public void testStoreUniqueWithDirectoryWithTrailingSlash()
+ throws Exception {
+ TEST_DIR.mkdirs();
+ assertTrue(client.storeUniqueFile("foo/bar/", new ByteArrayInputStream(
+ testData)));
+
+ doAssertOfUniqueFile(client, ROOT_DIR);
+ }
/**
* @throws Exception
*/
- private void doAssertOfUniqueFile(FTPClient client, File dir) throws Exception {
+ private void doAssertOfUniqueFile(FTPClient client, File dir)
+ throws Exception {
String reply = client.getReplyString();
String generatedFileName = reply.substring(5, reply.indexOf(':'));
File testFile = new File(dir, generatedFileName);
@@ -218,11 +239,12 @@
public void testAppend() throws Exception {
File testFile = new File(ROOT_DIR, TEST_FILENAME);
-
+
TestUtil.writeDataToFile(testFile, testData);
- assertTrue(client.appendFile(TEST_FILENAME, new ByteArrayInputStream(testData)));
-
+ assertTrue(client.appendFile(TEST_FILENAME, new ByteArrayInputStream(
+ testData)));
+
assertTrue(testFile.exists());
TestUtil.assertFileEqual(doubleTestData, testFile);
}
@@ -230,47 +252,50 @@
public void testAppendNoFileName() throws Exception {
assertEquals(501, client.sendCommand("APPE"));
}
-
+
public void testAppendWithDirectoryInPlace() throws Exception {
File testFile = new File(ROOT_DIR, TEST_FILENAME);
testFile.mkdirs();
-
+
assertTrue(testFile.exists());
- assertFalse(client.appendFile(TEST_FILENAME, new ByteArrayInputStream(testData)));
-
+ assertFalse(client.appendFile(TEST_FILENAME, new ByteArrayInputStream(
+ testData)));
+
assertTrue(testFile.exists());
assertTrue(testFile.isDirectory());
}
-
+
public void testAppendWithPath() throws Exception {
TEST_DIR.mkdirs();
File testFile = new File(TEST_DIR, TEST_FILENAME);
-
+
TestUtil.writeDataToFile(testFile, testData);
-
- assertTrue(client.appendFile("foo/bar/" + TEST_FILENAME, new ByteArrayInputStream(testData)));
-
+
+ assertTrue(client.appendFile("foo/bar/" + TEST_FILENAME,
+ new ByteArrayInputStream(testData)));
+
assertTrue(testFile.exists());
TestUtil.assertFileEqual(doubleTestData, testFile);
}
-
+
public void testAppendWithoutWriteAccess() throws Exception {
client.rein();
client.login("anonymous", "foo@bar.com");
-
File testFile = new File(ROOT_DIR, TEST_FILENAME);
- assertFalse(client.appendFile(TEST_FILENAME, new ByteArrayInputStream(testData)));
-
+ assertFalse(client.appendFile(TEST_FILENAME, new ByteArrayInputStream(
+ testData)));
+
assertFalse(testFile.exists());
}
-
+
public void testAppendToNoExistingFile() throws Exception {
File testFile = new File(ROOT_DIR, TEST_FILENAME);
-
- assertTrue(client.appendFile(TEST_FILENAME, new ByteArrayInputStream(testData)));
-
+
+ assertTrue(client.appendFile(TEST_FILENAME, new ByteArrayInputStream(
+ testData)));
+
assertTrue(testFile.exists());
TestUtil.assertFileEqual(testData, testFile);
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -28,17 +28,24 @@
import org.apache.ftpserver.listener.nio.NioListener;
import org.apache.mina.filter.firewall.Subnet;
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class SubnetBlacklistTest extends ClientTestTemplate {
protected FtpServer createServer() throws Exception {
FtpServer server = super.createServer();
-
- NioListener listener = (NioListener) server.getServerContext().getListener("default");
-
+
+ NioListener listener = (NioListener) server.getServerContext()
+ .getListener("default");
+
List<Subnet> blockedSubnets = new ArrayList<Subnet>();
blockedSubnets.add(new Subnet(InetAddress.getByName("localhost"), 32));
-
+
listener.setBlockedSubnets(blockedSubnets);
-
+
return server;
}
@@ -50,7 +57,7 @@
try {
client.connect("localhost", port);
fail("Must throw");
- } catch(FTPConnectionClosedException e) {
+ } catch (FTPConnectionClosedException e) {
// OK
}
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SystTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SystTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SystTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SystTest.java Sun Aug 17 12:52:42 2008
@@ -15,16 +15,23 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
import org.apache.commons.net.ftp.FTPReply;
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class SystTest extends ClientTestTemplate {
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#setUp()
*/
protected void setUp() throws Exception {
@@ -36,7 +43,8 @@
public void testSyst() throws Exception {
assertTrue(FTPReply.isPositiveCompletion(client.syst()));
// hardcoded to Unix as that's the type of list etc we use
- assertEquals("215 UNIX Type: Apache FtpServer", client.getReplyString().trim());
+ assertEquals("215 UNIX Type: Apache FtpServer", client.getReplyString()
+ .trim());
}
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/UnlimitedMaxLoginTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/UnlimitedMaxLoginTest.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/UnlimitedMaxLoginTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/UnlimitedMaxLoginTest.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver.clienttests;
@@ -23,24 +23,28 @@
import org.apache.ftpserver.DefaultFtpServerContext;
import org.apache.ftpserver.FtpServer;
-
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
public class UnlimitedMaxLoginTest extends ClientTestTemplate {
private static final String UNKNOWN_USERNAME = "foo";
+
private static final String UNKNOWN_PASSWORD = "bar";
-
-
protected FtpServer createServer() throws Exception {
- FtpServer server = super.createServer();
-
- DefaultFtpServerContext context = (DefaultFtpServerContext) server.getServerContext();
-
- DefaultConnectionConfig cc = (DefaultConnectionConfig) context.getConnectionConfig();
- cc.setMaxLoginFailures(0);
- return server;
- }
+ FtpServer server = super.createServer();
+ DefaultFtpServerContext context = (DefaultFtpServerContext) server
+ .getServerContext();
+ DefaultConnectionConfig cc = (DefaultConnectionConfig) context
+ .getConnectionConfig();
+ cc.setMaxLoginFailures(0);
+ return server;
+ }
public void testLogin() throws Exception {
// must never be disconnected