Test code cleanup.
Converted static fields to non-static, and removed unused code.
This commit is contained in:
Simone Bordet
parent
b40c2ae66f
commit
e803bf6c81
|
|
@ -18,8 +18,6 @@
|
|||
|
||||
package org.eclipse.jetty.server;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
|
@ -45,6 +43,10 @@ import org.junit.Test;
|
|||
|
||||
public class LocalAsyncContextTest
|
||||
{
|
||||
private final Locker _completeLock = new Locker();
|
||||
private Throwable __completed;
|
||||
private Throwable __dispatched;
|
||||
private final AtomicReference<Throwable> __completed1 = new AtomicReference<>();
|
||||
protected Server _server;
|
||||
protected SuspendHandler _handler;
|
||||
protected Connector _connector;
|
||||
|
|
@ -54,7 +56,7 @@ public class LocalAsyncContextTest
|
|||
{
|
||||
_server = new Server();
|
||||
_connector = initConnector();
|
||||
_server.setConnectors(new Connector[]{ _connector });
|
||||
_server.addConnector(_connector);
|
||||
|
||||
SessionHandler session = new SessionHandler();
|
||||
_handler = new SuspendHandler();
|
||||
|
|
@ -63,9 +65,9 @@ public class LocalAsyncContextTest
|
|||
_server.setHandler(session);
|
||||
_server.start();
|
||||
|
||||
try(Locker.Lock lock = _completeLock.lock())
|
||||
try (Locker.Lock lock = _completeLock.lock())
|
||||
{
|
||||
__completed=null;
|
||||
__completed = null;
|
||||
}
|
||||
__completed1.set(null);
|
||||
}
|
||||
|
|
@ -90,16 +92,17 @@ public class LocalAsyncContextTest
|
|||
_handler.setSuspendFor(1000);
|
||||
_handler.setResumeAfter(-1);
|
||||
_handler.setCompleteAfter(-1);
|
||||
response=process(null);
|
||||
check(response,"TIMEOUT");
|
||||
|
||||
spinAssertEquals(1,()->{
|
||||
try(Locker.Lock lock = _completeLock.lock())
|
||||
response = process(null);
|
||||
check(response, "TIMEOUT");
|
||||
|
||||
spinAssertEquals(1, () ->
|
||||
{
|
||||
try (Locker.Lock lock = _completeLock.lock())
|
||||
{
|
||||
return __completed==null?0:1;
|
||||
return __completed == null ? 0 : 1;
|
||||
}
|
||||
});
|
||||
spinAssertEquals(1,()->{return __completed1.get()==null?0:1;});
|
||||
spinAssertEquals(1, () -> __completed1.get() == null ? 0 : 1);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -110,8 +113,8 @@ public class LocalAsyncContextTest
|
|||
_handler.setSuspendFor(10000);
|
||||
_handler.setResumeAfter(0);
|
||||
_handler.setCompleteAfter(-1);
|
||||
response=process(null);
|
||||
check(response,"STARTASYNC","DISPATCHED");
|
||||
response = process(null);
|
||||
check(response, "STARTASYNC", "DISPATCHED");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -122,8 +125,8 @@ public class LocalAsyncContextTest
|
|||
_handler.setSuspendFor(10000);
|
||||
_handler.setResumeAfter(100);
|
||||
_handler.setCompleteAfter(-1);
|
||||
response=process(null);
|
||||
check(response,"STARTASYNC","DISPATCHED");
|
||||
response = process(null);
|
||||
check(response, "STARTASYNC", "DISPATCHED");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -134,8 +137,8 @@ public class LocalAsyncContextTest
|
|||
_handler.setSuspendFor(10000);
|
||||
_handler.setResumeAfter(-1);
|
||||
_handler.setCompleteAfter(0);
|
||||
response=process(null);
|
||||
check(response,"STARTASYNC","COMPLETED");
|
||||
response = process(null);
|
||||
check(response, "STARTASYNC", "COMPLETED");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -146,9 +149,8 @@ public class LocalAsyncContextTest
|
|||
_handler.setSuspendFor(10000);
|
||||
_handler.setResumeAfter(-1);
|
||||
_handler.setCompleteAfter(200);
|
||||
response=process(null);
|
||||
check(response,"STARTASYNC","COMPLETED");
|
||||
|
||||
response = process(null);
|
||||
check(response, "STARTASYNC", "COMPLETED");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -159,8 +161,8 @@ public class LocalAsyncContextTest
|
|||
_handler.setRead(-1);
|
||||
_handler.setResumeAfter(0);
|
||||
_handler.setCompleteAfter(-1);
|
||||
response=process("wibble");
|
||||
check(response,"STARTASYNC","DISPATCHED");
|
||||
response = process("wibble");
|
||||
check(response, "STARTASYNC", "DISPATCHED");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -171,9 +173,8 @@ public class LocalAsyncContextTest
|
|||
_handler.setRead(-1);
|
||||
_handler.setResumeAfter(100);
|
||||
_handler.setCompleteAfter(-1);
|
||||
response=process("wibble");
|
||||
check(response,"DISPATCHED");
|
||||
|
||||
response = process("wibble");
|
||||
check(response, "DISPATCHED");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -184,35 +185,35 @@ public class LocalAsyncContextTest
|
|||
_handler.setRead(-1);
|
||||
_handler.setResumeAfter(-1);
|
||||
_handler.setCompleteAfter(0);
|
||||
response=process("wibble");
|
||||
check(response,"COMPLETED");
|
||||
response = process("wibble");
|
||||
check(response, "COMPLETED");
|
||||
|
||||
_handler.setResumeAfter(-1);
|
||||
_handler.setCompleteAfter(100);
|
||||
response=process("wibble");
|
||||
check(response,"COMPLETED");
|
||||
response = process("wibble");
|
||||
check(response, "COMPLETED");
|
||||
|
||||
_handler.setRead(6);
|
||||
|
||||
_handler.setResumeAfter(0);
|
||||
_handler.setCompleteAfter(-1);
|
||||
response=process("wibble");
|
||||
check(response,"DISPATCHED");
|
||||
response = process("wibble");
|
||||
check(response, "DISPATCHED");
|
||||
|
||||
_handler.setResumeAfter(100);
|
||||
_handler.setCompleteAfter(-1);
|
||||
response=process("wibble");
|
||||
check(response,"DISPATCHED");
|
||||
response = process("wibble");
|
||||
check(response, "DISPATCHED");
|
||||
|
||||
_handler.setResumeAfter(-1);
|
||||
_handler.setCompleteAfter(0);
|
||||
response=process("wibble");
|
||||
check(response,"COMPLETED");
|
||||
response = process("wibble");
|
||||
check(response, "COMPLETED");
|
||||
|
||||
_handler.setResumeAfter(-1);
|
||||
_handler.setCompleteAfter(100);
|
||||
response=process("wibble");
|
||||
check(response,"COMPLETED");
|
||||
response = process("wibble");
|
||||
check(response, "COMPLETED");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -227,364 +228,285 @@ public class LocalAsyncContextTest
|
|||
_handler.setSuspendFor2(1000);
|
||||
_handler.setResumeAfter2(200);
|
||||
_handler.setCompleteAfter2(-1);
|
||||
response=process(null);
|
||||
check(response,"STARTASYNC","DISPATCHED","startasync","STARTASYNC","DISPATCHED");
|
||||
response = process(null);
|
||||
check(response, "STARTASYNC", "DISPATCHED", "startasync", "STARTASYNC2", "DISPATCHED");
|
||||
|
||||
spinAssertEquals(1,()->{
|
||||
try(Locker.Lock lock = _completeLock.lock())
|
||||
spinAssertEquals(1, () ->
|
||||
{
|
||||
try (Locker.Lock lock = _completeLock.lock())
|
||||
{
|
||||
return __completed==null?0:1;
|
||||
return __completed == null ? 0 : 1;
|
||||
}
|
||||
});
|
||||
spinAssertEquals(0,()->{return __completed1.get()==null?0:1;});
|
||||
|
||||
spinAssertEquals(0, () -> __completed1.get() == null ? 0 : 1);
|
||||
}
|
||||
|
||||
protected void check(String response,String... content)
|
||||
protected void check(String response, String... content)
|
||||
{
|
||||
Assert.assertThat(response,Matchers.startsWith("HTTP/1.1 200 OK"));
|
||||
int i=0;
|
||||
for (String m:content)
|
||||
Assert.assertThat(response, Matchers.startsWith("HTTP/1.1 200 OK"));
|
||||
int i = 0;
|
||||
for (String m : content)
|
||||
{
|
||||
Assert.assertThat(response,Matchers.containsString(m));
|
||||
i=response.indexOf(m,i);
|
||||
i+=m.length();
|
||||
Assert.assertThat(response, Matchers.containsString(m));
|
||||
i = response.indexOf(m, i);
|
||||
i += m.length();
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized String process(String content) throws Exception
|
||||
{
|
||||
String request = "GET / HTTP/1.1\r\n" +
|
||||
"Host: localhost\r\n"+
|
||||
"Connection: close\r\n";
|
||||
"Host: localhost\r\n" +
|
||||
"Connection: close\r\n";
|
||||
|
||||
if (content==null)
|
||||
request+="\r\n";
|
||||
if (content == null)
|
||||
request += "\r\n";
|
||||
else
|
||||
request+="Content-Length: "+content.length()+"\r\n" +"\r\n" + content;
|
||||
request += "Content-Length: " + content.length() + "\r\n" + "\r\n" + content;
|
||||
|
||||
String response=getResponse(request);
|
||||
return response;
|
||||
return getResponse(request);
|
||||
}
|
||||
|
||||
protected String getResponse(String request) throws Exception
|
||||
{
|
||||
LocalConnector connector=(LocalConnector)_connector;
|
||||
LocalConnector connector = (LocalConnector)_connector;
|
||||
LocalConnector.LocalEndPoint endp = connector.executeRequest(request);
|
||||
endp.waitUntilClosed();
|
||||
return endp.takeOutputString();
|
||||
}
|
||||
|
||||
private static class SuspendHandler extends HandlerWrapper
|
||||
private class SuspendHandler extends HandlerWrapper
|
||||
{
|
||||
private int _read;
|
||||
private long _suspendFor=-1;
|
||||
private long _resumeAfter=-1;
|
||||
private long _completeAfter=-1;
|
||||
private long _suspendFor2=-1;
|
||||
private long _resumeAfter2=-1;
|
||||
private long _completeAfter2=-1;
|
||||
private long _suspendFor = -1;
|
||||
private long _resumeAfter = -1;
|
||||
private long _completeAfter = -1;
|
||||
private long _suspendFor2 = -1;
|
||||
private long _resumeAfter2 = -1;
|
||||
private long _completeAfter2 = -1;
|
||||
|
||||
public SuspendHandler()
|
||||
{
|
||||
}
|
||||
|
||||
public int getRead()
|
||||
{
|
||||
return _read;
|
||||
}
|
||||
|
||||
public void setRead(int read)
|
||||
{
|
||||
_read = read;
|
||||
}
|
||||
|
||||
public long getSuspendFor()
|
||||
{
|
||||
return _suspendFor;
|
||||
}
|
||||
|
||||
public void setSuspendFor(long suspendFor)
|
||||
{
|
||||
_suspendFor = suspendFor;
|
||||
}
|
||||
|
||||
public long getResumeAfter()
|
||||
{
|
||||
return _resumeAfter;
|
||||
}
|
||||
|
||||
public void setResumeAfter(long resumeAfter)
|
||||
{
|
||||
_resumeAfter = resumeAfter;
|
||||
}
|
||||
|
||||
public long getCompleteAfter()
|
||||
{
|
||||
return _completeAfter;
|
||||
}
|
||||
|
||||
public void setCompleteAfter(long completeAfter)
|
||||
{
|
||||
_completeAfter = completeAfter;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* ------------------------------------------------------------ */
|
||||
/** Get the suspendFor2.
|
||||
* @return the suspendFor2
|
||||
*/
|
||||
public long getSuspendFor2()
|
||||
{
|
||||
return _suspendFor2;
|
||||
}
|
||||
|
||||
|
||||
/* ------------------------------------------------------------ */
|
||||
/** Set the suspendFor2.
|
||||
* @param suspendFor2 the suspendFor2 to set
|
||||
*/
|
||||
public void setSuspendFor2(long suspendFor2)
|
||||
{
|
||||
_suspendFor2 = suspendFor2;
|
||||
}
|
||||
|
||||
|
||||
/* ------------------------------------------------------------ */
|
||||
/** Get the resumeAfter2.
|
||||
* @return the resumeAfter2
|
||||
*/
|
||||
public long getResumeAfter2()
|
||||
{
|
||||
return _resumeAfter2;
|
||||
}
|
||||
|
||||
|
||||
/* ------------------------------------------------------------ */
|
||||
/** Set the resumeAfter2.
|
||||
* @param resumeAfter2 the resumeAfter2 to set
|
||||
*/
|
||||
public void setResumeAfter2(long resumeAfter2)
|
||||
{
|
||||
_resumeAfter2 = resumeAfter2;
|
||||
}
|
||||
|
||||
|
||||
/* ------------------------------------------------------------ */
|
||||
/** Get the completeAfter2.
|
||||
* @return the completeAfter2
|
||||
*/
|
||||
public long getCompleteAfter2()
|
||||
{
|
||||
return _completeAfter2;
|
||||
}
|
||||
|
||||
|
||||
/* ------------------------------------------------------------ */
|
||||
/** Set the completeAfter2.
|
||||
* @param completeAfter2 the completeAfter2 to set
|
||||
*/
|
||||
public void setCompleteAfter2(long completeAfter2)
|
||||
{
|
||||
_completeAfter2 = completeAfter2;
|
||||
}
|
||||
|
||||
|
||||
/* ------------------------------------------------------------ */
|
||||
@Override
|
||||
public void handle(String target, final Request baseRequest, final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
|
||||
{
|
||||
try
|
||||
if (DispatcherType.REQUEST.equals(baseRequest.getDispatcherType()))
|
||||
{
|
||||
if (DispatcherType.REQUEST.equals(baseRequest.getDispatcherType()))
|
||||
if (_read > 0)
|
||||
{
|
||||
if (_read>0)
|
||||
{
|
||||
byte[] buf=new byte[_read];
|
||||
request.getInputStream().read(buf);
|
||||
}
|
||||
else if (_read<0)
|
||||
{
|
||||
InputStream in = request.getInputStream();
|
||||
int b=in.read();
|
||||
while(b!=-1)
|
||||
b=in.read();
|
||||
}
|
||||
int read = _read;
|
||||
byte[] buf = new byte[read];
|
||||
while (read > 0)
|
||||
read -= request.getInputStream().read(buf);
|
||||
}
|
||||
else if (_read < 0)
|
||||
{
|
||||
InputStream in = request.getInputStream();
|
||||
int b = in.read();
|
||||
while (b != -1)
|
||||
b = in.read();
|
||||
}
|
||||
|
||||
final AsyncContext asyncContext = baseRequest.startAsync();
|
||||
response.getOutputStream().println("STARTASYNC");
|
||||
asyncContext.addListener(__asyncListener);
|
||||
asyncContext.addListener(__asyncListener1);
|
||||
if (_suspendFor > 0)
|
||||
asyncContext.setTimeout(_suspendFor);
|
||||
|
||||
if (_completeAfter > 0)
|
||||
{
|
||||
new Thread()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
try
|
||||
{
|
||||
Thread.sleep(_completeAfter);
|
||||
response.getOutputStream().println("COMPLETED");
|
||||
response.setStatus(200);
|
||||
baseRequest.setHandled(true);
|
||||
asyncContext.complete();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}.start();
|
||||
}
|
||||
else if (_completeAfter == 0)
|
||||
{
|
||||
response.getOutputStream().println("COMPLETED");
|
||||
response.setStatus(200);
|
||||
baseRequest.setHandled(true);
|
||||
asyncContext.complete();
|
||||
}
|
||||
|
||||
if (_resumeAfter > 0)
|
||||
{
|
||||
new Thread()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
try
|
||||
{
|
||||
Thread.sleep(_resumeAfter);
|
||||
if (((HttpServletRequest)asyncContext.getRequest()).getSession(true).getId() != null)
|
||||
asyncContext.dispatch();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}.start();
|
||||
}
|
||||
else if (_resumeAfter == 0)
|
||||
{
|
||||
asyncContext.dispatch();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (request.getAttribute("TIMEOUT") != null)
|
||||
response.getOutputStream().println("TIMEOUT");
|
||||
else
|
||||
response.getOutputStream().println("DISPATCHED");
|
||||
|
||||
if (_suspendFor2 >= 0)
|
||||
{
|
||||
final AsyncContext asyncContext = baseRequest.startAsync();
|
||||
response.getOutputStream().println("STARTASYNC");
|
||||
asyncContext.addListener(__asyncListener);
|
||||
asyncContext.addListener(__asyncListener1);
|
||||
if (_suspendFor>0)
|
||||
asyncContext.setTimeout(_suspendFor);
|
||||
response.getOutputStream().println("STARTASYNC2");
|
||||
if (_suspendFor2 > 0)
|
||||
asyncContext.setTimeout(_suspendFor2);
|
||||
_suspendFor2 = -1;
|
||||
|
||||
|
||||
if (_completeAfter>0)
|
||||
if (_completeAfter2 > 0)
|
||||
{
|
||||
new Thread() {
|
||||
new Thread()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
try
|
||||
{
|
||||
Thread.sleep(_completeAfter);
|
||||
response.getOutputStream().println("COMPLETED");
|
||||
Thread.sleep(_completeAfter2);
|
||||
response.getOutputStream().println("COMPLETED2");
|
||||
response.setStatus(200);
|
||||
baseRequest.setHandled(true);
|
||||
asyncContext.complete();
|
||||
}
|
||||
catch(Exception e)
|
||||
catch (Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}.start();
|
||||
}
|
||||
else if (_completeAfter==0)
|
||||
else if (_completeAfter2 == 0)
|
||||
{
|
||||
response.getOutputStream().println("COMPLETED");
|
||||
response.getOutputStream().println("COMPLETED2");
|
||||
response.setStatus(200);
|
||||
baseRequest.setHandled(true);
|
||||
asyncContext.complete();
|
||||
}
|
||||
|
||||
if (_resumeAfter>0)
|
||||
if (_resumeAfter2 > 0)
|
||||
{
|
||||
new Thread() {
|
||||
new Thread()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
try
|
||||
{
|
||||
Thread.sleep(_resumeAfter);
|
||||
if(((HttpServletRequest)asyncContext.getRequest()).getSession(true).getId()!=null)
|
||||
asyncContext.dispatch();
|
||||
Thread.sleep(_resumeAfter2);
|
||||
asyncContext.dispatch();
|
||||
}
|
||||
catch(Exception e)
|
||||
catch (Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}.start();
|
||||
}
|
||||
else if (_resumeAfter==0)
|
||||
else if (_resumeAfter2 == 0)
|
||||
{
|
||||
asyncContext.dispatch();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (request.getAttribute("TIMEOUT")!=null)
|
||||
{
|
||||
response.getOutputStream().println("TIMEOUT");
|
||||
}
|
||||
else
|
||||
{
|
||||
response.getOutputStream().println("DISPATCHED");
|
||||
}
|
||||
|
||||
if (_suspendFor2>=0)
|
||||
{
|
||||
final AsyncContext asyncContext = baseRequest.startAsync();
|
||||
response.getOutputStream().println("STARTASYNC2");
|
||||
if (_suspendFor2>0)
|
||||
asyncContext.setTimeout(_suspendFor2);
|
||||
_suspendFor2=-1;
|
||||
|
||||
if (_completeAfter2>0)
|
||||
{
|
||||
new Thread() {
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
try
|
||||
{
|
||||
Thread.sleep(_completeAfter2);
|
||||
response.getOutputStream().println("COMPLETED2");
|
||||
response.setStatus(200);
|
||||
baseRequest.setHandled(true);
|
||||
asyncContext.complete();
|
||||
}
|
||||
catch(Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}.start();
|
||||
}
|
||||
else if (_completeAfter2==0)
|
||||
{
|
||||
response.getOutputStream().println("COMPLETED2");
|
||||
response.setStatus(200);
|
||||
baseRequest.setHandled(true);
|
||||
asyncContext.complete();
|
||||
}
|
||||
|
||||
if (_resumeAfter2>0)
|
||||
{
|
||||
new Thread() {
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
try
|
||||
{
|
||||
Thread.sleep(_resumeAfter2);
|
||||
asyncContext.dispatch();
|
||||
}
|
||||
catch(Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}.start();
|
||||
}
|
||||
else if (_resumeAfter2==0)
|
||||
{
|
||||
asyncContext.dispatch();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
response.setStatus(200);
|
||||
baseRequest.setHandled(true);
|
||||
}
|
||||
response.setStatus(200);
|
||||
baseRequest.setHandled(true);
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static Locker _completeLock = new Locker();
|
||||
static Throwable __completed;
|
||||
static Throwable __dispatched;
|
||||
static AtomicReference<Throwable> __completed1 = new AtomicReference<>();
|
||||
|
||||
private static AsyncListener __asyncListener = new AsyncListener()
|
||||
private AsyncListener __asyncListener = new AsyncListener()
|
||||
{
|
||||
@Override
|
||||
public void onComplete(AsyncEvent event) throws IOException
|
||||
{
|
||||
Throwable complete = new Throwable();
|
||||
Throwable dispatched = HttpChannel.getDispatchedFrom();
|
||||
try(Locker.Lock lock = _completeLock.lock())
|
||||
try (Locker.Lock lock = _completeLock.lock())
|
||||
{
|
||||
if (__completed==null)
|
||||
if (__completed == null)
|
||||
{
|
||||
__completed=complete;
|
||||
__dispatched=dispatched;
|
||||
__completed = complete;
|
||||
__dispatched = dispatched;
|
||||
}
|
||||
else
|
||||
{
|
||||
System.err.println("First onCompleted dispatched from:");
|
||||
if (__dispatched!=null)
|
||||
if (__dispatched != null)
|
||||
__dispatched.printStackTrace();
|
||||
System.err.println("First onCompleted:");
|
||||
__completed.printStackTrace();
|
||||
System.err.println("Second onCompleted dispatched from:");
|
||||
if (dispatched!=null)
|
||||
if (dispatched != null)
|
||||
dispatched.printStackTrace();
|
||||
complete.printStackTrace();
|
||||
throw new IllegalStateException();
|
||||
|
|
@ -597,22 +519,22 @@ public class LocalAsyncContextTest
|
|||
{
|
||||
Throwable complete = new Throwable();
|
||||
Throwable dispatched = HttpChannel.getDispatchedFrom();
|
||||
try(Locker.Lock lock = _completeLock.lock())
|
||||
try (Locker.Lock lock = _completeLock.lock())
|
||||
{
|
||||
if (__completed==null)
|
||||
if (__completed == null)
|
||||
{
|
||||
__completed=complete;
|
||||
__dispatched=dispatched;
|
||||
__completed = complete;
|
||||
__dispatched = dispatched;
|
||||
}
|
||||
else
|
||||
{
|
||||
System.err.println("First onCompleted dispatched from:");
|
||||
if (__dispatched!=null)
|
||||
if (__dispatched != null)
|
||||
__dispatched.printStackTrace();
|
||||
System.err.println("First onCompleted:");
|
||||
__completed.printStackTrace();
|
||||
System.err.println("Second onCompleted dispatched from:");
|
||||
if (dispatched!=null)
|
||||
if (dispatched != null)
|
||||
dispatched.printStackTrace();
|
||||
complete.printStackTrace();
|
||||
throw new IllegalStateException();
|
||||
|
|
@ -630,18 +552,18 @@ public class LocalAsyncContextTest
|
|||
@Override
|
||||
public void onTimeout(AsyncEvent event) throws IOException
|
||||
{
|
||||
event.getSuppliedRequest().setAttribute("TIMEOUT",Boolean.TRUE);
|
||||
event.getSuppliedRequest().setAttribute("TIMEOUT", Boolean.TRUE);
|
||||
event.getAsyncContext().dispatch();
|
||||
}
|
||||
};
|
||||
|
||||
private static AsyncListener __asyncListener1 = new AsyncListener()
|
||||
private AsyncListener __asyncListener1 = new AsyncListener()
|
||||
{
|
||||
@Override
|
||||
public void onComplete(AsyncEvent event) throws IOException
|
||||
{
|
||||
Throwable complete = new Throwable();
|
||||
if (!__completed1.compareAndSet(null,complete))
|
||||
if (!__completed1.compareAndSet(null, complete))
|
||||
{
|
||||
__completed1.get().printStackTrace();
|
||||
complete.printStackTrace();
|
||||
|
|
@ -654,7 +576,7 @@ public class LocalAsyncContextTest
|
|||
public void onError(AsyncEvent event) throws IOException
|
||||
{
|
||||
Throwable complete = new Throwable();
|
||||
if (!__completed1.compareAndSet(null,complete))
|
||||
if (!__completed1.compareAndSet(null, complete))
|
||||
{
|
||||
__completed1.get().printStackTrace();
|
||||
complete.printStackTrace();
|
||||
|
|
@ -662,7 +584,7 @@ public class LocalAsyncContextTest
|
|||
throw new IllegalStateException();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onStartAsync(AsyncEvent event) throws IOException
|
||||
{
|
||||
|
|
@ -672,24 +594,23 @@ public class LocalAsyncContextTest
|
|||
public void onTimeout(AsyncEvent event) throws IOException
|
||||
{
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
static <T> void spinAssertEquals(T expected, Supplier<T> actualSupplier)
|
||||
{
|
||||
spinAssertEquals(expected,actualSupplier,10,TimeUnit.SECONDS);
|
||||
spinAssertEquals(expected, actualSupplier, 10, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
|
||||
static <T> void spinAssertEquals(T expected, Supplier<T> actualSupplier, long waitFor, TimeUnit units)
|
||||
{
|
||||
long now = System.nanoTime();
|
||||
long end = now+units.toNanos(waitFor);
|
||||
T actual=null;
|
||||
while(now < end)
|
||||
long end = now + units.toNanos(waitFor);
|
||||
T actual = null;
|
||||
while (now < end)
|
||||
{
|
||||
actual=actualSupplier.get();
|
||||
if (actual==null && expected==null ||
|
||||
actual!=null && actual.equals(expected))
|
||||
actual = actualSupplier.get();
|
||||
if (actual == null && expected == null ||
|
||||
actual != null && actual.equals(expected))
|
||||
break;
|
||||
try
|
||||
{
|
||||
|
|
@ -697,10 +618,11 @@ public class LocalAsyncContextTest
|
|||
}
|
||||
catch (InterruptedException e)
|
||||
{
|
||||
// Ignored
|
||||
}
|
||||
now = System.nanoTime();
|
||||
}
|
||||
|
||||
assertEquals(expected,actual);
|
||||
|
||||
Assert.assertEquals(expected, actual);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue