- infinite recursion in write() of PseudoTcpOutputStream
- write/read with offset of pseduo tcp streams
Adds:
- unit tests for all read/write methods of pseudo tcp streams
This commit is contained in:
paweldomas 2012-08-13 07:39:18 +00:00
parent f0dcc54a20
commit 757ea6196c
10 changed files with 160 additions and 84 deletions

View File

@ -629,7 +629,7 @@ public class PseudoTCPBase
throw new IOException("Socket not connected");
}
int read = m_rbuf.Read(buffer, len);
int read = m_rbuf.Read(buffer, offset, len);
// If there's no data in |m_rbuf|.
if (read == 0)
@ -773,7 +773,7 @@ public class PseudoTCPBase
m_slist.add(sseg);
}
int written = m_sbuf.Write(buffer, len);
int written = m_sbuf.Write(buffer, offset, len);
return written;
}

View File

@ -830,7 +830,7 @@ public class PseudoTcpSocketImpl
{
byte[] bytes = new byte[1];
bytes[0] = (byte) b;
write(b);
write(bytes);
}
@Override

View File

@ -62,10 +62,21 @@ public class ByteFifoBuffer
*/
public int Read(byte[] out_buffer, int count)
{
return Read(out_buffer, 0, count);
}
/**
* Read with buffer offset
* @param out_buffer
* @param buff_offset
* @param len
* @return
*/
public int Read(byte[] out_buffer, int buff_offset, int count) {
count = readLimit(count);
if (count > 0)
{
readOp(out_buffer, 0, count, array, read_pos, array.length);
readOp(out_buffer, buff_offset, count, array, read_pos, array.length);
read_pos = (read_pos + count) % array.length;
buffered -= count;
}

View File

@ -1,6 +1,8 @@
package org.ice4j.pseudotcp;
import junit.framework.*;
import java.lang.Thread.*;
import static org.junit.Assert.*;
/**
@ -14,27 +16,28 @@ import static org.junit.Assert.*;
*
* @author Pawel Domas
*/
public class MultiThreadSupportTest extends TestCase
public class MultiThreadSupportTest
extends TestCase
implements UncaughtExceptionHandler
{
private volatile Throwable testError;
private volatile Thread errorThread;
private final Object testLock = new Object();
private final Object testLock = new Object();
public MultiThreadSupportTest()
{
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler()
}
@Override
public void uncaughtException(Thread t, Throwable e)
{
synchronized (testLock)
{
@Override
public void uncaughtException(Thread t, Throwable e)
{
synchronized (testLock)
{
testError = e;
errorThread = t;
testLock.notifyAll();
}
}
});
testError = e;
errorThread = t;
testLock.notifyAll();
}
}
private long assertWaitInterval = 100;

View File

@ -1,8 +1,8 @@
/*
* ice4j, the OpenSource Java Solution for NAT and Firewall Traversal.
* Maintained by the Jitsi community (https://jitsi.org).
*
* Distributable under LGPL license.
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.ice4j.pseudotcp;
@ -14,16 +14,17 @@ import static org.junit.Assert.*;
import org.junit.*;
/**
*
*
* @author Pawel Domas
*/
public class PseudoTcpStreamTest extends MultiThreadSupportTest
public class PseudoTcpStreamTest
extends MultiThreadSupportTest
{
/**
* The logger.
*/
private static final Logger logger =
Logger.getLogger(PseudoTcpStreamTest.class.getName());
private static final Logger logger = Logger
.getLogger(PseudoTcpStreamTest.class.getName());
public PseudoTcpStreamTest()
{
@ -31,16 +32,25 @@ public class PseudoTcpStreamTest extends MultiThreadSupportTest
/**
* Test one-way transfer with @link(PseudoTcpStream)
*
*
* @throws SocketException
*/
public void testConnectTransferClose() throws SocketException
{
String ip = "";
Thread.setDefaultUncaughtExceptionHandler(this);
final int server_port = 49999;
long conv_id = 0;
final int size = 1000000;
int transferTimeout = 5000;
// bytes that will be read as a single byte
final int singleStepCount = 34;
final byte[] bufferSingle =
PseudoTcpTestBase.createDummyData(singleStepCount);
final int sizeA = 138746;
final byte[] bufferA = PseudoTcpTestBase.createDummyData(sizeA);
final int sizeB = 483746;
final byte[] bufferB = PseudoTcpTestBase.createDummyData(sizeB);
final PseudoTcpSocketImpl server = new PseudoTcpSocketImpl(conv_id);
final PseudoTcpSocketImpl client = new PseudoTcpSocketImpl(conv_id);
@ -50,24 +60,23 @@ public class PseudoTcpStreamTest extends MultiThreadSupportTest
public void run()
{
try
{
server.bind(InetAddress.getLocalHost(), server_port);
{
server.bind(InetAddress.getLocalHost(), server_port);
server.accept(null);
int rcvd = 0;
while (rcvd != size)
{
rcvd += server.getInputStream().read(new byte[size]);
if (logger.isLoggable(Level.FINER))
{
logger.log(Level.FINER, "Received: " + rcvd);
}
}
if (logger.isLoggable(Level.FINER))
{
logger.log(Level.FINER, "Total received: " + rcvd);
}
//server.Close();
byte[] rcvdSingle = new byte[singleStepCount];
// read by one byte
for (int i = 0; i < singleStepCount; i++)
rcvdSingle[i] = (byte) server.getInputStream().read();
assertArrayEquals(bufferSingle, rcvdSingle);
// receive buffer A
byte[] recvdBufferA =
receiveBuffer(server.getInputStream(), sizeA);
assertArrayEquals(bufferA, recvdBufferA);
// receive buffer B
byte[] recvdBufferB =
receiveBuffer(server.getInputStream(), sizeB);
assertArrayEquals(bufferB, recvdBufferB);
// server.Close();
}
catch (IOException ex)
{
@ -75,6 +84,7 @@ public class PseudoTcpStreamTest extends MultiThreadSupportTest
}
}
});
Thread clientThread = new Thread(new Runnable()
{
@Override
@ -83,8 +93,33 @@ public class PseudoTcpStreamTest extends MultiThreadSupportTest
try
{
client.connect(InetAddress.getLocalHost(), server_port);
assertEquals(PseudoTcpState.TCP_ESTABLISHED, client.getState());
client.getOutputStream().write(new byte[size]);
assertEquals(PseudoTcpState.TCP_ESTABLISHED,
client.getState());
// write single array
for (int i = 0; i < singleStepCount; i++)
client.getOutputStream().write(bufferSingle[i]);
// write whole array
client.getOutputStream().write(bufferA);
// write by parts
int partCount = 7;
boolean notExact = sizeB % partCount != 0;
int[] partsSize =
notExact ? new int[partCount + 1] : new int[partCount];
for (int i = 0; i < partsSize.length; i++)
{
if (notExact && i == partCount)
partsSize[i] = sizeB % partCount;
else
partsSize[i] = sizeB / partCount;
}
int written = 0;
for (int i = 0; i < partsSize.length; i++)
{
client.getOutputStream().write(bufferB, written,
partsSize[i]);
written += partsSize[i];
}
assertEquals(sizeB, written);
client.getOutputStream().flush();
client.close();
}
@ -94,6 +129,7 @@ public class PseudoTcpStreamTest extends MultiThreadSupportTest
}
}
});
serverThread.start();
clientThread.start();
try
@ -122,6 +158,24 @@ public class PseudoTcpStreamTest extends MultiThreadSupportTest
}
}
private static byte[] receiveBuffer(InputStream input, int size)
throws IOException
{
int rcvd = 0;
byte[] buffer = new byte[size];
rcvd += input.read(buffer);
while (rcvd != size)
{
rcvd += input.read(buffer, rcvd, size - rcvd);
if (logger.isLoggable(Level.FINER))
{
logger.log(Level.FINER, "Received: " + rcvd);
}
}
return buffer;
}
/**
* Test the timeout on accept method
*/
@ -135,7 +189,7 @@ public class PseudoTcpStreamTest extends MultiThreadSupportTest
}
catch (IOException ex)
{
//success
// success
}
}
}

View File

@ -87,7 +87,7 @@ public abstract class PseudoTcpTestBase extends MultiThreadSupportTest
* @param size
* @return
*/
static byte[] createDummyData(int size)
static public byte[] createDummyData(int size)
{
byte[] dummy = new byte[size];
Random r = new Random();

View File

@ -68,6 +68,7 @@ public class PseudoTcpTestPingPong extends PseudoTcpTestBase
*/
public void TestPingPong(int size, int iterations)
{
Thread.setDefaultUncaughtExceptionHandler(this);
long start, end;
iterationsRemaining = iterations;
receiver = getRemoteTcp();

View File

@ -55,6 +55,7 @@ public class PseudoTcpTestRecvWindow extends PseudoTcpTestBase
public void TestTransfer(int size)
{
Thread.setDefaultUncaughtExceptionHandler(this);
testDataSize = size;
long start, end, elapsed;
send_position = new ArrayList<Integer>();

View File

@ -54,6 +54,7 @@ public class PseudoTcpTestTransfer extends PseudoTcpTestBase
*/
public void TestTransfer(int size)
{
Thread.setDefaultUncaughtExceptionHandler(this);
long start, elapsed;
int received;
// Create some dummy data to send

View File

@ -14,10 +14,11 @@ import static org.junit.Assert.*;
import org.junit.*;
/**
*
*
* @author Pawel Domas
*/
public class ByteFifoBufferTest extends TestCase
public class ByteFifoBufferTest
extends TestCase
{
public ByteFifoBufferTest()
{
@ -28,7 +29,6 @@ public class ByteFifoBufferTest extends TestCase
*/
public void testLength()
{
//System.out.println("Length");
int expResult = 1000;
ByteFifoBuffer instance = new ByteFifoBuffer(expResult);
assertEquals(expResult, instance.Length());
@ -43,7 +43,6 @@ public class ByteFifoBufferTest extends TestCase
*/
public void testRead()
{
//System.out.println("Read");
int count = 1024;
byte[] wData = getWData(count);
ByteFifoBuffer instance = new ByteFifoBuffer(count);
@ -56,11 +55,34 @@ public class ByteFifoBufferTest extends TestCase
assertArrayEquals(wData, readBuff);
}
/**
* Tests reading with an offset for destination buffer
*/
public void testReadWithOffset()
{
int count = 1024;
byte[] wData = getWData(count);
ByteFifoBuffer instance = new ByteFifoBuffer(count);
instance.Write(wData, count);
byte[] readBuff = new byte[count];
int expResult = count / 2;
int result = instance.Read(readBuff, count / 2);
assertEquals(expResult, result);
result = instance.Read(readBuff, count / 2, count / 2);
assertEquals(expResult, result);
assertArrayEquals(wData, readBuff);
}
/**
* return some random array
*
* @param count array size
* @return
* @return
*/
private byte[] getWData(int count)
{
@ -75,7 +97,6 @@ public class ByteFifoBufferTest extends TestCase
*/
public void testGetWriteRemaining()
{
//System.out.println("GetWriteRemaining");
int len = 100;
ByteFifoBuffer instance = new ByteFifoBuffer(len);
int expResult = len;
@ -96,7 +117,6 @@ public class ByteFifoBufferTest extends TestCase
*/
public void testGetBuffered()
{
//System.out.println("GetBuffered");
int len = 1000;
ByteFifoBuffer instance = new ByteFifoBuffer(len);
int w_len = 100;
@ -119,7 +139,6 @@ public class ByteFifoBufferTest extends TestCase
*/
public void testWrite()
{
//System.out.println("Write");
int len = 2048;
byte[] data = getWData(len);
ByteFifoBuffer instance = new ByteFifoBuffer(len);
@ -132,18 +151,16 @@ public class ByteFifoBufferTest extends TestCase
assertEquals(result, readCount);
assertArrayEquals(data, read);
}
public void testWriteWithOffset()
{
//System.out.println("Write");
int len = 2048;
byte[] data = getWData(len);
ByteFifoBuffer instance = new ByteFifoBuffer(len);
int expResult = len/2;
int result = instance.Write(data,0, len/2);
int expResult = len / 2;
int result = instance.Write(data, 0, len / 2);
assertEquals(expResult, result);
result = instance.Write(data, len/2, len/2);
result = instance.Write(data, len / 2, len / 2);
assertEquals(expResult, result);
byte[] read = new byte[len];
@ -151,14 +168,12 @@ public class ByteFifoBufferTest extends TestCase
assertEquals(len, readCount);
assertArrayEquals(data, read);
}
/**
* Test of ConsumeWriteBuffer method, of class ByteFifoBuffer.
*/
public void testConsumeWriteBuffer()
{
//System.out.println("ConsumeWriteBuffer");
int len = 100;
ByteFifoBuffer instance = new ByteFifoBuffer(len);
instance.ConsumeWriteBuffer(len / 2);
@ -184,7 +199,6 @@ public class ByteFifoBufferTest extends TestCase
*/
public void testSetCapacity()
{
//System.out.println("SetCapacity");
int old_size = 100;
int new_size = 200;
ByteFifoBuffer instance = new ByteFifoBuffer(old_size);
@ -199,13 +213,6 @@ public class ByteFifoBufferTest extends TestCase
result = instance.SetCapacity(old_size);
assertEquals(expResult, result);
/*
* int write_size = old_size; instance = new
* ByteFifoBuffer(old_size); byte[] written = getWData(write_size);
* assertEquals(write_size, instance.Write(written, write_size));
* instance.SetCapacity(new_size); byte[] read = new byte[write_size];
* instance.Read(read, write_size); assertArrayEquals(written, read);
*/
}
/**
@ -213,7 +220,6 @@ public class ByteFifoBufferTest extends TestCase
*/
public void testConsumeReadData()
{
//System.out.println("ConsumeReadData");
int lCount = 100;
ByteFifoBuffer instance = new ByteFifoBuffer(lCount);
instance.Write(getWData(lCount), lCount);
@ -235,7 +241,6 @@ public class ByteFifoBufferTest extends TestCase
*/
public void testReadOffset()
{
//System.out.println("ReadOffset");
int dst_buff_offset = 0;
int len = 100;
byte[] src_buff = getWData(len);
@ -244,7 +249,8 @@ public class ByteFifoBufferTest extends TestCase
ByteFifoBuffer instance = new ByteFifoBuffer(len);
int expResult = len;
instance.Write(src_buff, len);
int result = instance.ReadOffset(dst_buff, dst_buff_offset, len, offset);
int result =
instance.ReadOffset(dst_buff, dst_buff_offset, len, offset);
assertEquals(expResult, result);
assertArrayEquals(dst_buff, src_buff);
@ -255,7 +261,6 @@ public class ByteFifoBufferTest extends TestCase
*/
public void testWriteOffset()
{
//System.out.println("WriteOffset");
int len = 200;
int dataLen = 100;
byte[] srcData = getWData(dataLen);
@ -267,25 +272,24 @@ public class ByteFifoBufferTest extends TestCase
assertEquals(result, readCount);
assertArrayEquals(srcData, data);
byte[] halfFilled = new byte[dataLen * 2];
System.arraycopy(srcData, 0, halfFilled, dataLen, dataLen);
byte[] halfFilledRead = new byte[dataLen * 2];
instance.ReadOffset(halfFilledRead, dataLen, dataLen, nOffset);
assertArrayEquals(halfFilled, halfFilledRead);
//case when w_pos+offset exceeds current backing array length
// case when w_pos+offset exceeds current backing array length
instance = new ByteFifoBuffer(len);
instance.Write(srcData, dataLen);
instance.Write(srcData, dataLen / 2);//current writePos = 150
instance.Write(srcData, dataLen / 2);// current writePos = 150
instance.Read(data, dataLen);// curretn readPos = 100
instance.WriteOffset(srcData, dataLen, 50);
instance = new ByteFifoBuffer(61440);
instance.WriteOffset(getWData(1384), 1384, 31832);
}
public void testWriteReadWriteRead()
{
int len = 2000;
@ -306,14 +310,15 @@ public class ByteFifoBufferTest extends TestCase
int readAvailable = instance.GetBuffered();
if (readAvailable > 0)
{
int rCount = instance.ReadOffset(readBuff, read, readAvailable, 0);
int rCount =
instance.ReadOffset(readBuff, read, readAvailable, 0);
instance.ConsumeReadData(rCount);
read += rCount;
}
}
while ((read != wrData.length) || (written != wrData.length));
}
public void testSomeMultiTest()
{
int Alen = 16;