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 2011/06/22 22:05:11 UTC
svn commit: r1138603 -
/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
Author: ngn
Date: Wed Jun 22 20:05:11 2011
New Revision: 1138603
URL: http://svn.apache.org/viewvc?rev=1138603&view=rev
Log:
Fix broken test, where assert was invoked in a separate thread, and checking the temporary getUserArgument() rather than the correct getUser() (FTPSERVER-418)
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java?rev=1138603&r1=1138602&r2=1138603&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java Wed Jun 22 20:05:11 2011
@@ -25,6 +25,8 @@ import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
import org.apache.commons.net.ftp.FTPReply;
import org.apache.ftpserver.FtpServerFactory;
@@ -34,6 +36,7 @@ import org.apache.ftpserver.ftplet.FtpRe
import org.apache.ftpserver.ftplet.FtpSession;
import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftplet.FtpletResult;
+import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.test.TestUtil;
/**
@@ -83,12 +86,13 @@ public class FtpLetReturnDefaultTest ext
}
public void testLogin() throws Exception {
+ final LinkedBlockingQueue<User> loggedInUser = new LinkedBlockingQueue<User>();
+
MockFtplet.callback = new MockFtpletCallback() {
- @Override
public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
- assertNotNull(session.getUserArgument());
-
+ loggedInUser.add(session.getUser());
+
return super.onLogin(session, request);
}
@@ -96,6 +100,8 @@ public class FtpLetReturnDefaultTest ext
MockFtpletCallback.returnValue = FtpletResult.DEFAULT;
assertTrue(client.login(ADMIN_USERNAME, ADMIN_PASSWORD));
+
+ assertNotNull(loggedInUser.poll(2000, TimeUnit.MILLISECONDS));
}
public void testDelete() throws Exception {