Improve test stability with wait/notify instead of sleeping
This commit is contained in:
parent
cd2d21a8d0
commit
0811007990
@ -485,8 +485,11 @@ public class TransactionSupportTests
|
|||||||
clientAddress,
|
clientAddress,
|
||||||
responseCollector);
|
responseCollector);
|
||||||
|
|
||||||
//wait a while
|
//wait until a response arrives
|
||||||
Thread.sleep(1200);
|
synchronized (responseCollector)
|
||||||
|
{
|
||||||
|
responseCollector.wait(5000);
|
||||||
|
}
|
||||||
|
|
||||||
//verify
|
//verify
|
||||||
Vector<StunMessageEvent> reqs
|
Vector<StunMessageEvent> reqs
|
||||||
@ -496,7 +499,7 @@ public class TransactionSupportTests
|
|||||||
"Not all retransmissions were made for the expected period of time");
|
"Not all retransmissions were made for the expected period of time");
|
||||||
|
|
||||||
//wait for a send
|
//wait for a send
|
||||||
Thread.sleep(1800);
|
requestCollector.waitForRequest(1800);
|
||||||
|
|
||||||
//verify
|
//verify
|
||||||
reqs = requestCollector.getRequestsForTransaction(
|
reqs = requestCollector.getRequestsForTransaction(
|
||||||
@ -559,15 +562,25 @@ public class TransactionSupportTests
|
|||||||
* Blocks until a request arrives or 50 ms pass.
|
* Blocks until a request arrives or 50 ms pass.
|
||||||
*/
|
*/
|
||||||
public void waitForRequest()
|
public void waitForRequest()
|
||||||
|
{
|
||||||
|
waitForRequest(50);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Blocks until a request arrives or the timeout passes.
|
||||||
|
*/
|
||||||
|
public void waitForRequest(long timeoutMillis)
|
||||||
{
|
{
|
||||||
synchronized(this)
|
synchronized(this)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
wait(50);
|
wait(timeoutMillis);
|
||||||
}
|
}
|
||||||
catch (InterruptedException e)
|
catch (InterruptedException e)
|
||||||
{}
|
{
|
||||||
|
Thread.currentThread().interrupt();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -592,7 +605,7 @@ public class TransactionSupportTests
|
|||||||
* transaction and the runtime type of which specifies the failure reason
|
* transaction and the runtime type of which specifies the failure reason
|
||||||
* @see AbstractResponseCollector#processFailure(BaseStunMessageEvent)
|
* @see AbstractResponseCollector#processFailure(BaseStunMessageEvent)
|
||||||
*/
|
*/
|
||||||
protected void processFailure(BaseStunMessageEvent event)
|
protected synchronized void processFailure(BaseStunMessageEvent event)
|
||||||
{
|
{
|
||||||
String receivedResponse;
|
String receivedResponse;
|
||||||
|
|
||||||
@ -603,6 +616,7 @@ public class TransactionSupportTests
|
|||||||
else
|
else
|
||||||
receivedResponse = "failure";
|
receivedResponse = "failure";
|
||||||
receivedResponses.add(receivedResponse);
|
receivedResponses.add(receivedResponse);
|
||||||
|
notifyAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -610,9 +624,10 @@ public class TransactionSupportTests
|
|||||||
*
|
*
|
||||||
* @param response the event to log.
|
* @param response the event to log.
|
||||||
*/
|
*/
|
||||||
public void processResponse(StunResponseEvent response)
|
public synchronized void processResponse(StunResponseEvent response)
|
||||||
{
|
{
|
||||||
receivedResponses.add(response);
|
receivedResponses.add(response);
|
||||||
|
notifyAll();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.*;
|
|||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.net.*;
|
import java.net.*;
|
||||||
|
import java.util.concurrent.atomic.*;
|
||||||
import java.util.logging.*;
|
import java.util.logging.*;
|
||||||
import org.junit.jupiter.api.*;
|
import org.junit.jupiter.api.*;
|
||||||
|
|
||||||
@ -37,6 +38,7 @@ public class PseudoTcpStreamTest
|
|||||||
* Test one-way transfer with @link(PseudoTcpStream)
|
* Test one-way transfer with @link(PseudoTcpStream)
|
||||||
*/
|
*/
|
||||||
@Test
|
@Test
|
||||||
|
@Timeout(10)
|
||||||
public void testConnectTransferClose()
|
public void testConnectTransferClose()
|
||||||
throws IOException
|
throws IOException
|
||||||
{
|
{
|
||||||
@ -57,6 +59,8 @@ public class PseudoTcpStreamTest
|
|||||||
server.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
|
server.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
|
||||||
final InetSocketAddress serverAddress =
|
final InetSocketAddress serverAddress =
|
||||||
new InetSocketAddress(InetAddress.getLoopbackAddress(), server.getLocalPort());
|
new InetSocketAddress(InetAddress.getLoopbackAddress(), server.getLocalPort());
|
||||||
|
AtomicBoolean clientThreadEnded = new AtomicBoolean();
|
||||||
|
AtomicBoolean serverThreadEnded = new AtomicBoolean();
|
||||||
Thread serverThread = new Thread(() ->
|
Thread serverThread = new Thread(() ->
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@ -76,6 +80,7 @@ public class PseudoTcpStreamTest
|
|||||||
receiveBuffer(server.getInputStream(), sizeB);
|
receiveBuffer(server.getInputStream(), sizeB);
|
||||||
assertArrayEquals(bufferB, recvdBufferB);
|
assertArrayEquals(bufferB, recvdBufferB);
|
||||||
// server.close();
|
// server.close();
|
||||||
|
serverThreadEnded.set(true);
|
||||||
}
|
}
|
||||||
catch (IOException ex)
|
catch (IOException ex)
|
||||||
{
|
{
|
||||||
@ -121,6 +126,7 @@ public class PseudoTcpStreamTest
|
|||||||
assertEquals(sizeB, written);
|
assertEquals(sizeB, written);
|
||||||
os.flush();
|
os.flush();
|
||||||
client.close();
|
client.close();
|
||||||
|
clientThreadEnded.set(true);
|
||||||
}
|
}
|
||||||
catch (IOException ex)
|
catch (IOException ex)
|
||||||
{
|
{
|
||||||
@ -137,8 +143,16 @@ public class PseudoTcpStreamTest
|
|||||||
transferTimeout);
|
transferTimeout);
|
||||||
if (success)
|
if (success)
|
||||||
{
|
{
|
||||||
clientThread.join();
|
clientThread.join(10_000);
|
||||||
serverThread.join();
|
if (!clientThreadEnded.get())
|
||||||
|
{
|
||||||
|
fail("client thread did not end");
|
||||||
|
}
|
||||||
|
serverThread.join(10_000);
|
||||||
|
if (!serverThreadEnded.get())
|
||||||
|
{
|
||||||
|
fail("server thread did not end");
|
||||||
|
}
|
||||||
server.close();
|
server.close();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@ -608,9 +608,9 @@ public abstract class PseudoTcpTestBase
|
|||||||
runClocks = false;
|
runClocks = false;
|
||||||
localClockThread.interrupt();
|
localClockThread.interrupt();
|
||||||
remoteClockThread.interrupt();
|
remoteClockThread.interrupt();
|
||||||
localClockThread.join();
|
localClockThread.join(5000);
|
||||||
localClockThread = null;
|
localClockThread = null;
|
||||||
remoteClockThread.join();
|
remoteClockThread.join(5000);
|
||||||
remoteClockThread = null;
|
remoteClockThread = null;
|
||||||
}
|
}
|
||||||
catch (InterruptedException ex)
|
catch (InterruptedException ex)
|
||||||
|
|||||||
@ -63,6 +63,11 @@ public class DatagramCollector
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void waitForPacket()
|
public void waitForPacket()
|
||||||
|
{
|
||||||
|
waitForPacket(50);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void waitForPacket(long timeoutMillis)
|
||||||
{
|
{
|
||||||
synchronized(this)
|
synchronized(this)
|
||||||
{
|
{
|
||||||
@ -71,12 +76,12 @@ public class DatagramCollector
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
wait(50);
|
wait(timeoutMillis);
|
||||||
}
|
}
|
||||||
catch (InterruptedException e)
|
catch (InterruptedException e)
|
||||||
{
|
{
|
||||||
// TODO Auto-generated catch block
|
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
Thread.currentThread().interrupt();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,6 +18,7 @@
|
|||||||
package org.ice4j.stack;
|
package org.ice4j.stack;
|
||||||
|
|
||||||
import java.net.*;
|
import java.net.*;
|
||||||
|
import java.util.concurrent.*;
|
||||||
import java.util.logging.*;
|
import java.util.logging.*;
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
@ -50,7 +51,7 @@ public class ShallowStackTest
|
|||||||
private TransportAddress dummyServerAddress = null;
|
private TransportAddress dummyServerAddress = null;
|
||||||
private TransportAddress localAddress = null;
|
private TransportAddress localAddress = null;
|
||||||
|
|
||||||
private DatagramCollector dgramCollector = new DatagramCollector();
|
private final DatagramCollector dgramCollector = new DatagramCollector();
|
||||||
|
|
||||||
private IceSocketWrapper localSock = null;
|
private IceSocketWrapper localSock = null;
|
||||||
|
|
||||||
@ -127,7 +128,7 @@ public class ShallowStackTest
|
|||||||
new SimpleResponseCollector());
|
new SimpleResponseCollector());
|
||||||
|
|
||||||
//wait for its arrival
|
//wait for its arrival
|
||||||
dgramCollector.waitForPacket();
|
dgramCollector.waitForPacket(1000);
|
||||||
|
|
||||||
DatagramPacket receivedPacket = dgramCollector.collectPacket();
|
DatagramPacket receivedPacket = dgramCollector.collectPacket();
|
||||||
|
|
||||||
@ -145,7 +146,7 @@ public class ShallowStackTest
|
|||||||
|
|
||||||
dgramCollector.startListening(dummyServerSocket);
|
dgramCollector.startListening(dummyServerSocket);
|
||||||
|
|
||||||
dgramCollector.waitForPacket();
|
dgramCollector.waitForPacket(1000);
|
||||||
|
|
||||||
receivedPacket = dgramCollector.collectPacket();
|
receivedPacket = dgramCollector.collectPacket();
|
||||||
|
|
||||||
@ -318,7 +319,7 @@ public class ShallowStackTest
|
|||||||
|
|
||||||
dgramCollector.startListening(dummyServerSocket);
|
dgramCollector.startListening(dummyServerSocket);
|
||||||
|
|
||||||
long firstTime = System.currentTimeMillis();
|
long firstTime = System.nanoTime();
|
||||||
|
|
||||||
stunStack.sendRequest(bindingRequest,
|
stunStack.sendRequest(bindingRequest,
|
||||||
dummyServerAddress,
|
dummyServerAddress,
|
||||||
@ -326,7 +327,7 @@ public class ShallowStackTest
|
|||||||
new SimpleResponseCollector());
|
new SimpleResponseCollector());
|
||||||
|
|
||||||
//wait for its arrival
|
//wait for its arrival
|
||||||
dgramCollector.waitForPacket();
|
dgramCollector.waitForPacket(1000);
|
||||||
DatagramPacket receivedPacket = dgramCollector.collectPacket();
|
DatagramPacket receivedPacket = dgramCollector.collectPacket();
|
||||||
|
|
||||||
assertTrue((receivedPacket.getLength() > 0),
|
assertTrue((receivedPacket.getLength() > 0),
|
||||||
@ -341,7 +342,7 @@ public class ShallowStackTest
|
|||||||
|
|
||||||
// wait for the 1st retransmission with originalWait
|
// wait for the 1st retransmission with originalWait
|
||||||
dgramCollector.startListening(dummyServerSocket);
|
dgramCollector.startListening(dummyServerSocket);
|
||||||
dgramCollector.waitForPacket();
|
dgramCollector.waitForPacket(1000);
|
||||||
receivedPacket = dgramCollector.collectPacket();
|
receivedPacket = dgramCollector.collectPacket();
|
||||||
|
|
||||||
assertTrue((receivedPacket.getLength() > 0),
|
assertTrue((receivedPacket.getLength() > 0),
|
||||||
@ -355,8 +356,7 @@ public class ShallowStackTest
|
|||||||
"The retransmitted request did not match the original.");
|
"The retransmitted request did not match the original.");
|
||||||
|
|
||||||
// verify the retransmission is longer than the originalWait
|
// verify the retransmission is longer than the originalWait
|
||||||
long secondTime = System.currentTimeMillis();
|
assertTrue(System.nanoTime() - firstTime >= TimeUnit.MILLISECONDS.toNanos(originalWait));
|
||||||
assertTrue((secondTime - firstTime) >= originalWait);
|
|
||||||
|
|
||||||
System.clearProperty(StackProperties.FIRST_CTRAN_RETRANS_AFTER);
|
System.clearProperty(StackProperties.FIRST_CTRAN_RETRANS_AFTER);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user