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/05/01 14:02:07 UTC
svn commit: r652488 -
/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
Author: ngn
Date: Thu May 1 05:02:07 2008
New Revision: 652488
URL: http://svn.apache.org/viewvc?rev=652488&view=rev
Log:
Fix tests where commons-net throws a SocketException while reading the reply from the server (provided by Magnus Grimsell) (FTPSERVER-131)
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java?rev=652488&r1=652487&r2=652488&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java Thu May 1 05:02:07 2008
@@ -92,6 +92,8 @@
fail("Must throw FTPConnectionClosedException");
} catch (FTPConnectionClosedException e) {
// OK
+ } catch (SocketException e) {
+ // OK
}
}
@@ -112,7 +114,10 @@
} catch (FTPConnectionClosedException e) {
// OK
}
-
+ catch (SocketException e) {
+ // OK
+ }
+
assertTrue(TEST_FILE1.exists());
}
@@ -134,9 +139,9 @@
} catch (FTPConnectionClosedException e) {
// OK
} catch (SocketException e) {
- // OK
+ // OK
}
-
+
assertFalse(TEST_FILE1.exists());
}
@@ -147,7 +152,7 @@
return mockReturnValue;
}
};
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
try {
client.makeDirectory(TEST_DIR1.getName());
@@ -155,7 +160,10 @@
} catch (FTPConnectionClosedException e) {
// OK
}
-
+ catch (SocketException e) {
+ // OK
+ }
+
assertFalse(TEST_DIR1.exists());
}
@@ -166,7 +174,7 @@
return mockReturnValue;
}
};
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
assertTrue(client.makeDirectory(TEST_DIR1.getName()));
try {
@@ -175,9 +183,9 @@
} catch (FTPConnectionClosedException e) {
// OK
} catch (SocketException e) {
- // OK
+ // OK
}
-
+
assertTrue(TEST_DIR1.exists());
}
@@ -188,9 +196,9 @@
return mockReturnValue;
}
};
-
+
TEST_DIR1.mkdirs();
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
try {
client.removeDirectory(TEST_DIR1.getName());
@@ -198,7 +206,10 @@
} catch (FTPConnectionClosedException e) {
// OK
}
-
+ catch (SocketException e) {
+ // OK
+ }
+
assertTrue(TEST_DIR1.exists());
}
@@ -209,9 +220,9 @@
return mockReturnValue;
}
};
-
+
TEST_DIR1.mkdirs();
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
assertTrue(client.removeDirectory(TEST_DIR1.getName()));
try {
@@ -220,9 +231,9 @@
} catch (FTPConnectionClosedException e) {
// OK
} catch (SocketException e) {
- // OK
+ // OK
}
-
+
assertFalse(TEST_DIR1.exists());
}
@@ -233,7 +244,7 @@
return mockReturnValue;
}
};
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
try {
client.site("HELP");
@@ -241,6 +252,9 @@
} catch (FTPConnectionClosedException e) {
// OK
}
+ catch (SocketException e) {
+ // OK
+ }
}
public void testExceptionDuringRenameStart() throws Exception {
@@ -250,9 +264,9 @@
return mockReturnValue;
}
};
-
+
TestUtil.writeDataToFile(TEST_FILE1, TESTDATA);
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
try {
client.rename(TEST_FILE1.getName(), TEST_FILE2.getName());
@@ -260,11 +274,14 @@
} catch (FTPConnectionClosedException e) {
// OK
}
-
+ catch (SocketException e) {
+ // OK
+ }
+
assertTrue(TEST_FILE1.exists());
assertFalse(TEST_FILE2.exists());
}
-
+
public void testExceptionDuringRenameEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
@@ -272,9 +289,9 @@
return mockReturnValue;
}
};
-
+
TestUtil.writeDataToFile(TEST_FILE1, TESTDATA);
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
assertTrue(client.rename(TEST_FILE1.getName(), TEST_FILE2.getName()));
try {
@@ -283,7 +300,7 @@
} catch (FTPConnectionClosedException e) {
// OK
} catch (SocketException e) {
- // OK
+ // OK
}
assertFalse(TEST_FILE1.exists());
@@ -298,9 +315,9 @@
return mockReturnValue;
}
};
-
+
TestUtil.writeDataToFile(TEST_FILE1, TESTDATA);
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
try {
client.retrieveFileStream(TEST_FILE1.getName());
@@ -308,6 +325,9 @@
} catch (FTPConnectionClosedException e) {
// OK
}
+ catch (SocketException e) {
+ // OK
+ }
}
public void testExceptionDuringDownloadEnd() throws Exception {
@@ -317,9 +337,9 @@
return mockReturnValue;
}
};
-
+
TestUtil.writeDataToFile(TEST_FILE1, TESTDATA);
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
assertTrue(client.retrieveFile(TEST_FILE1.getName(), baos));
@@ -329,7 +349,10 @@
} catch (FTPConnectionClosedException e) {
// OK
}
-
+ catch (SocketException e) {
+ // OK
+ }
+
TestUtil.assertArraysEqual(TESTDATA, baos.toByteArray());
}
@@ -340,9 +363,9 @@
return mockReturnValue;
}
};
-
+
TestUtil.writeDataToFile(TEST_FILE1, TESTDATA);
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
try {
client.appendFile(TEST_FILE1.getName(), new ByteArrayInputStream(TESTDATA));
@@ -350,10 +373,13 @@
} catch (FTPConnectionClosedException e) {
// OK
}
-
+ catch (SocketException e) {
+ // OK
+ }
+
TestUtil.assertFileEqual(TESTDATA, TEST_FILE1);
}
-
+
public void testExceptionDuringAppendEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
@@ -361,9 +387,9 @@
return mockReturnValue;
}
};
-
+
TestUtil.writeDataToFile(TEST_FILE1, TESTDATA);
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
assertTrue(client.appendFile(TEST_FILE1.getName(), new ByteArrayInputStream(TESTDATA)));
try {
@@ -372,7 +398,10 @@
} catch (FTPConnectionClosedException e) {
// OK
}
-
+ catch (SocketException e) {
+ // OK
+ }
+
TestUtil.assertFileEqual(DOUBLE_TESTDATA, TEST_FILE1);
}
@@ -383,7 +412,7 @@
return mockReturnValue;
}
};
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
try {
client.storeFile(TEST_FILE1.getName(), new ByteArrayInputStream(TESTDATA));
@@ -391,10 +420,13 @@
} catch (FTPConnectionClosedException e) {
// OK
}
-
+ catch (SocketException e) {
+ // OK
+ }
+
assertFalse(TEST_FILE1.exists());
}
-
+
public void testExceptionDuringUploadEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
@@ -402,7 +434,7 @@
return mockReturnValue;
}
};
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
assertTrue(client.storeFile(TEST_FILE1.getName(), new ByteArrayInputStream(TESTDATA)));
try {
@@ -410,11 +442,14 @@
fail("Must throw FTPConnectionClosedException");
} catch (FTPConnectionClosedException e) {
// OK
+ } catch (SocketException e) {
+ // OK
}
-
+
+
TestUtil.assertFileEqual(TESTDATA, TEST_FILE1);
}
-
+
public void testExceptionDuringUploadUniqueStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
@@ -422,27 +457,29 @@
return mockReturnValue;
}
};
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
try {
client.storeUniqueFile(TEST_FILE1.getName(), new ByteArrayInputStream(TESTDATA));
fail("Must throw FTPConnectionClosedException");
} catch (FTPConnectionClosedException e) {
// OK
+ } catch (SocketException e) {
+ // OK
}
-
+
assertEquals(ROOT_DIR.listFiles().length, 0);
}
-
+
public void testExceptionDuringUploadUniqueEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
throwException();
-
+
return mockReturnValue;
}
};
-
+
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
assertTrue(client.storeUniqueFile(new ByteArrayInputStream(TESTDATA)));
try {
@@ -450,8 +487,10 @@
fail("Must throw FTPConnectionClosedException");
} catch (FTPConnectionClosedException e) {
// OK
+ } catch (SocketException e) {
+ // OK
}
-
+
TestUtil.assertFileEqual(TESTDATA, ROOT_DIR.listFiles()[0]);
}