[Udt-java-commits] SF.net SVN: udt-java:[69] udt-java/trunk
Status: Alpha
Brought to you by:
bschuller
Menu
▾
▴
[Udt-java-commits] SF.net SVN: udt-java:[69] udt-java/trunk
|
From: <bsc...@us...> - 2012-02-03 06:57:07
|
Revision: 69
http://udt-java.svn.sourceforge.net/udt-java/?rev=69&view=rev
Author: bschuller
Date: 2012-02-03 06:57:00 +0000 (Fri, 03 Feb 2012)
Log Message:
-----------
use Junit4
Modified Paths:
--------------
udt-java/trunk/LICENSE
udt-java/trunk/pom.xml
udt-java/trunk/src/test/java/echo/TestEchoServer.java
udt-java/trunk/src/test/java/echo/TestEchoServerMultiClient.java
udt-java/trunk/src/test/java/udt/TestList.java
udt-java/trunk/src/test/java/udt/TestReceiverLossList.java
udt-java/trunk/src/test/java/udt/TestSendFileReceiveFile.java
udt-java/trunk/src/test/java/udt/TestUDTInputStream.java
udt-java/trunk/src/test/java/udt/TestUDTServerSocket.java
udt-java/trunk/src/test/java/udt/TestUdpEndpoint.java
udt-java/trunk/src/test/java/udt/UDTTestBase.java
udt-java/trunk/src/test/java/udt/packets/TestControlPacketType.java
udt-java/trunk/src/test/java/udt/packets/TestDataPacket.java
udt-java/trunk/src/test/java/udt/packets/TestPacketFactory.java
udt-java/trunk/src/test/java/udt/performance/TCPTest.java
udt-java/trunk/src/test/java/udt/performance/TestUDTLargeData.java
udt-java/trunk/src/test/java/udt/performance/TestUDTLargeDataCC1.java
udt-java/trunk/src/test/java/udt/performance/UDPTest.java
udt-java/trunk/src/test/java/udt/sender/TestFlowWindow.java
Modified: udt-java/trunk/LICENSE
===================================================================
--- udt-java/trunk/LICENSE 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/LICENSE 2012-02-03 06:57:00 UTC (rev 69)
@@ -1,5 +1,5 @@
/*********************************************************************************
- * Copyright (c) 2010 Forschungszentrum Juelich GmbH
+ * Copyright (c) 2010-2012 Forschungszentrum Juelich GmbH
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: udt-java/trunk/pom.xml
===================================================================
--- udt-java/trunk/pom.xml 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/pom.xml 2012-02-03 06:57:00 UTC (rev 69)
@@ -27,7 +27,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: udt-java/trunk/src/test/java/echo/TestEchoServer.java
===================================================================
--- udt-java/trunk/src/test/java/echo/TestEchoServer.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/echo/TestEchoServer.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -4,12 +4,16 @@
import java.io.PrintWriter;
import java.net.InetAddress;
-import junit.framework.TestCase;
+import junit.framework.Assert;
+
+import org.junit.Test;
+
import udt.UDTClient;
import udt.util.Util;
-public class TestEchoServer extends TestCase {
+public class TestEchoServer {
+ @Test
public void test1()throws Exception{
EchoServer es=new EchoServer(65321);
es.start();
@@ -22,9 +26,9 @@
System.out.println("Message sent.");
client.getInputStream().setBlocking(false);
String line=Util.readLine(client.getInputStream());
- assertNotNull(line);
+ Assert.assertNotNull(line);
System.out.println(line);
- assertEquals("test",line);
+ Assert.assertEquals("test",line);
}
}
Modified: udt-java/trunk/src/test/java/echo/TestEchoServerMultiClient.java
===================================================================
--- udt-java/trunk/src/test/java/echo/TestEchoServerMultiClient.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/echo/TestEchoServerMultiClient.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -4,12 +4,16 @@
import java.io.PrintWriter;
import java.net.InetAddress;
-import junit.framework.TestCase;
+import junit.framework.Assert;
+
+import org.junit.Test;
+
import udt.UDTClient;
import udt.util.Util;
-public class TestEchoServerMultiClient extends TestCase {
+public class TestEchoServerMultiClient {
+ @Test
public void testTwoClients()throws Exception{
EchoServer es=new EchoServer(65321);
es.start();
@@ -33,8 +37,8 @@
System.out.println("Message sent.");
client.getInputStream().setBlocking(false);
String line=Util.readLine(client.getInputStream());
- assertNotNull(line);
+ Assert.assertNotNull(line);
System.out.println(line);
- assertEquals("test",line);
+ Assert.assertEquals("test",line);
}
}
Modified: udt-java/trunk/src/test/java/udt/TestList.java
===================================================================
--- udt-java/trunk/src/test/java/udt/TestList.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/TestList.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -1,8 +1,13 @@
package udt;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.PriorityBlockingQueue;
-import junit.framework.TestCase;
+import org.junit.Test;
+
import udt.packets.DataPacket;
import udt.packets.KeepAlive;
import udt.receiver.AckHistoryEntry;
@@ -15,8 +20,9 @@
/*
* tests for the various list and queue classes
*/
-public class TestList extends TestCase{
+public class TestList {
+ @Test
public void testCircularArray(){
CircularArray<Integer>c=new CircularArray<Integer>(5);
for(int i=0;i<5;i++)c.add(i);
@@ -50,14 +56,14 @@
for(int i=0;i<values.length;i++){
p.add(values[i]);
}
- assertEquals(4.0d, p.computeMedianTimeInterval());
+ assertEquals(4.0d, p.computeMedianTimeInterval(), 0.001d);
long[] arrivaltimes = {12, 12, 12, 12};
PacketPairWindow p1=new PacketPairWindow(16);
for(int i=0;i<values.length;i++){
p1.add(arrivaltimes[i]);
}
- assertEquals(12.0d, p1.computeMedianTimeInterval());
+ assertEquals(12.0d, p1.computeMedianTimeInterval(), 0.001d);
}
Modified: udt-java/trunk/src/test/java/udt/TestReceiverLossList.java
===================================================================
--- udt-java/trunk/src/test/java/udt/TestReceiverLossList.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/TestReceiverLossList.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -1,11 +1,15 @@
package udt;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
import udt.receiver.ReceiverLossList;
import udt.receiver.ReceiverLossListEntry;
-import junit.framework.TestCase;
-public class TestReceiverLossList extends TestCase {
+public class TestReceiverLossList {
+ @Test
public void test1(){
ReceiverLossList l=new ReceiverLossList();
ReceiverLossListEntry e1=new ReceiverLossListEntry(1);
Modified: udt-java/trunk/src/test/java/udt/TestSendFileReceiveFile.java
===================================================================
--- udt-java/trunk/src/test/java/udt/TestSendFileReceiveFile.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/TestSendFileReceiveFile.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -1,8 +1,12 @@
package udt;
+import static org.junit.Assert.assertEquals;
+
import java.io.File;
import java.io.FileInputStream;
+import org.junit.Test;
+
import udt.util.ReceiveFile;
import udt.util.SendFile;
import udt.util.UDTThreadFactory;
@@ -11,6 +15,7 @@
volatile boolean serverStarted=false;
+ @Test
public void test1()throws Exception{
runServer();
do{
Modified: udt-java/trunk/src/test/java/udt/TestUDTInputStream.java
===================================================================
--- udt-java/trunk/src/test/java/udt/TestUDTInputStream.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/TestUDTInputStream.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -6,10 +6,17 @@
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
+import junit.framework.Assert;
+
+import org.junit.Test;
+
import udt.util.Util;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
public class TestUDTInputStream extends UDTTestBase{
+ @Test
public void test1()throws Exception{
UDTInputStream is=new UDTInputStream(null);
byte[] data1="this is ".getBytes();
@@ -25,6 +32,7 @@
assertEquals(digest,readMD5);
}
+ @Test
public void test2()throws Exception{
UDTInputStream is=new UDTInputStream(null);
byte[] data1=getRandomData(65537);
@@ -40,6 +48,7 @@
assertEquals(digest,readMD5);
}
+ @Test
public void testInOrder()throws Exception{
UDTInputStream is=new UDTInputStream(null);
is.setBlocking(false);
@@ -57,6 +66,7 @@
assertEquals(digest,readMD5);
}
+ @Test
public void testRandomOrder()throws Exception{
UDTInputStream is=new UDTInputStream(null);
is.setBlocking(false);
@@ -76,7 +86,7 @@
}
-
+ @Test
public void testLargeDataSetTwoThreads()throws Exception{
final UDTInputStream is=new UDTInputStream(null);
is.setBlocking(false);
@@ -98,7 +108,7 @@
is.noMoreData();
}catch(Exception e){
e.printStackTrace();
- fail();
+ Assert.fail();
}
}
};
Modified: udt-java/trunk/src/test/java/udt/TestUDTServerSocket.java
===================================================================
--- udt-java/trunk/src/test/java/udt/TestUDTServerSocket.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/TestUDTServerSocket.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -1,11 +1,16 @@
package udt;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.net.InetAddress;
import java.security.MessageDigest;
import java.util.Random;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.junit.Test;
+
import udt.util.Util;
public class TestUDTServerSocket extends UDTTestBase{
@@ -18,6 +23,7 @@
int TIMEOUT=20000;
+ @Test
public void testWithoutLoss()throws Exception{
Logger.getLogger("udt").setLevel(Level.WARNING);
UDTReceiver.dropRate=0;
@@ -27,6 +33,7 @@
}
//set an artificial loss rate
+ @Test
public void testWithLoss()throws Exception{
UDTReceiver.dropRate=3;
TIMEOUT=Integer.MAX_VALUE;
@@ -37,6 +44,7 @@
}
//send even more data
+ @Test
public void testLargeDataSet()throws Exception{
UDTReceiver.dropRate=0;
TIMEOUT=Integer.MAX_VALUE;
@@ -97,6 +105,7 @@
Runnable serverProcess=new Runnable(){
public void run(){
try{
+ System.out.println("Starting server.");
long start=System.currentTimeMillis();
UDTSocket s=serverSocket.accept();
assertNotNull(s);
@@ -121,7 +130,6 @@
}
catch(Exception e){
e.printStackTrace();
- fail();
serverRunning=false;
}
}
Modified: udt-java/trunk/src/test/java/udt/TestUdpEndpoint.java
===================================================================
--- udt-java/trunk/src/test/java/udt/TestUdpEndpoint.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/TestUdpEndpoint.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -1,14 +1,20 @@
package udt;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.net.DatagramPacket;
import java.net.InetAddress;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.junit.Test;
+
import udt.packets.Destination;
public class TestUdpEndpoint extends UDTTestBase{
+ @Test
public void testClientServerMode()throws Exception{
//select log level
@@ -41,6 +47,7 @@
* just check how fast we can send out UDP packets from the endpoint
* @throws Exception
*/
+ @Test
public void testRawSendRate()throws Exception{
Logger.getLogger("udt").setLevel(Level.WARNING);
System.out.println("Checking raw UDP send rate...");
@@ -65,11 +72,12 @@
Thread.sleep(1000);
}
- //no rendezvous yet...
- public void x_testRendezvousConnect()throws Exception{
+ //@Test()
+ public void testRendezvousConnect()throws Exception{
}
+ @Test
public void testBindToAnyPort()throws Exception{
UDPEndPoint ep=new UDPEndPoint(InetAddress.getByName("localhost"));
int port=ep.getLocalPort();
Modified: udt-java/trunk/src/test/java/udt/UDTTestBase.java
===================================================================
--- udt-java/trunk/src/test/java/udt/UDTTestBase.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/UDTTestBase.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -7,12 +7,10 @@
import udt.util.Util;
-import junit.framework.TestCase;
-
/**
* some additional utilities useful for testing
*/
-public abstract class UDTTestBase extends TestCase{
+public abstract class UDTTestBase {
//get an array filled with random data
protected byte[] getRandomData(int size){
Modified: udt-java/trunk/src/test/java/udt/packets/TestControlPacketType.java
===================================================================
--- udt-java/trunk/src/test/java/udt/packets/TestControlPacketType.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/packets/TestControlPacketType.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -1,18 +1,22 @@
package udt.packets;
-import udt.packets.ControlPacket;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
import udt.packets.ControlPacket.ControlPacketType;
-import junit.framework.TestCase;
-public class TestControlPacketType extends TestCase {
+public class TestControlPacketType {
+ @Test
public void testSequenceNumber1(){
ControlPacket p=new DummyControlPacket();
byte[]x=p.getHeader();
byte highest=x[0];
assertEquals(128, highest & 0x80);
}
-
+
+ @Test
public void testControlPacketTypes(){
ControlPacketType t=ControlPacketType.CONNECTION_HANDSHAKE;
assertEquals(0,t.ordinal());
Modified: udt-java/trunk/src/test/java/udt/packets/TestDataPacket.java
===================================================================
--- udt-java/trunk/src/test/java/udt/packets/TestDataPacket.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/packets/TestDataPacket.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -1,10 +1,11 @@
package udt.packets;
-import junit.framework.TestCase;
-import udt.packets.DataPacket;
+import static org.junit.Assert.assertEquals;
-public class TestDataPacket extends TestCase {
+import org.junit.Test;
+public class TestDataPacket {
+ @Test
public void testSequenceNumber1(){
DataPacket p=new DataPacket();
p.setPacketSequenceNumber(1);
@@ -17,6 +18,7 @@
assertEquals(1, lowest);
}
+ @Test
public void testEncoded(){
DataPacket p=new DataPacket();
p.setPacketSequenceNumber(1);
@@ -30,9 +32,9 @@
System.out.println("String s = " + s);
}
-
+
+ @Test
public void testDecode1(){
-
DataPacket testPacket1=new DataPacket();
testPacket1.setPacketSequenceNumber(127);
testPacket1.setDestinationID(1);
@@ -74,6 +76,7 @@
}
+ @Test
public void testEncodeDecode1(){
DataPacket dp=new DataPacket();
dp.setPacketSequenceNumber(127);
Modified: udt-java/trunk/src/test/java/udt/packets/TestPacketFactory.java
===================================================================
--- udt-java/trunk/src/test/java/udt/packets/TestPacketFactory.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/packets/TestPacketFactory.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -1,24 +1,21 @@
package udt.packets;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
+import org.junit.Test;
+
import udt.UDTPacket;
-import udt.packets.Acknowledgement;
-import udt.packets.Acknowledgment2;
-import udt.packets.ConnectionHandshake;
-import udt.packets.DataPacket;
-import udt.packets.MessageDropRequest;
-import udt.packets.NegativeAcknowledgement;
-import udt.packets.PacketFactory;
-import udt.packets.Shutdown;
-public class TestPacketFactory extends TestCase {
+public class TestPacketFactory {
+ @Test
public void testData(){
String test="sdjfsdjfldskjflds";
-
+
byte[]data=test.getBytes();
data[0]=(byte)(data[0] & 0x7f);
UDTPacket p=PacketFactory.createPacket(data);
@@ -27,14 +24,14 @@
assertTrue(p instanceof DataPacket);
assertEquals(test,t);
}
-
-
+
+ @Test
public void testConnectionHandshake(){
ConnectionHandshake p1 = new ConnectionHandshake();
p1.setMessageNumber(9876);
p1.setTimeStamp(3456);
p1.setDestinationID(1);
-
+
p1.setConnectionType(1);
p1.setSocketType(1);
p1.setInitialSeqNo(321);
@@ -42,16 +39,17 @@
p1.setMaxFlowWndSize(128);
p1.setSocketID(1);
p1.setUdtVersion(4);
-
-
+
+
byte[]p1_data=p1.getEncoded();
-
+
UDTPacket p=PacketFactory.createPacket(p1_data);
ConnectionHandshake p2=(ConnectionHandshake)p;
assertEquals(p1,p2);
-
+
}
-
+
+ @Test
public void testAcknowledgement(){
Acknowledgement p1 = new Acknowledgement();
p1.setAckSequenceNumber(1234);
@@ -64,28 +62,30 @@
p1.setPacketReceiveRate(1000);
p1.setRoundTripTime(1000);
p1.setRoundTripTimeVar(500);
-
+
byte[]p1_data=p1.getEncoded();
UDTPacket p=PacketFactory.createPacket(p1_data);
Acknowledgement p2=(Acknowledgement)p;
assertEquals(p1,p2);
}
-
+
+ @Test
public void testAcknowledgementOfAcknowledgement(){
Acknowledgment2 p1 = new Acknowledgment2();
p1.setAckSequenceNumber(1230);
p1.setMessageNumber(9871);
p1.setTimeStamp(3451);
p1.setDestinationID(1);
-
+
byte[]p1_data=p1.getEncoded();
UDTPacket p=PacketFactory.createPacket(p1_data);
Acknowledgment2 p2=(Acknowledgment2)p;
assertEquals(p1,p2);
-
-
+
+
}
-
+
+ @Test
public void testNegativeAcknowledgement(){
NegativeAcknowledgement p1 = new NegativeAcknowledgement();
p1.setMessageNumber(9872);
@@ -95,15 +95,16 @@
p1.addLossInfo(6);
p1.addLossInfo(7, 10);
byte[]p1_data=p1.getEncoded();
-
+
UDTPacket p=PacketFactory.createPacket(p1_data);
NegativeAcknowledgement p2=(NegativeAcknowledgement)p;
assertEquals(p1,p2);
-
+
assertEquals((Integer)5, (Integer)p2.getDecodedLossInfo().get(0));
assertEquals(6, p2.getDecodedLossInfo().size());
}
-
+
+ @Test
public void testNegativeAcknowledgement2(){
NegativeAcknowledgement p1 = new NegativeAcknowledgement();
p1.setMessageNumber(9872);
@@ -116,18 +117,19 @@
loss.add(8l);
loss.add(9l);
loss.add(11l);
-
+
p1.addLossInfo(loss);
byte[]p1_data=p1.getEncoded();
-
+
UDTPacket p=PacketFactory.createPacket(p1_data);
NegativeAcknowledgement p2=(NegativeAcknowledgement)p;
assertEquals(p1,p2);
-
+
assertEquals((Integer)5, (Integer)p2.getDecodedLossInfo().get(0));
assertEquals(6, p2.getDecodedLossInfo().size());
}
+ @Test
public void testNegativeAcknowledgement3(){
NegativeAcknowledgement p1 = new NegativeAcknowledgement();
p1.setMessageNumber(9872);
@@ -137,42 +139,43 @@
p1.addLossInfo(6);
p1.addLossInfo(147, 226);
byte[]p1_data=p1.getEncoded();
-
+
UDTPacket p=PacketFactory.createPacket(p1_data);
NegativeAcknowledgement p2=(NegativeAcknowledgement)p;
assertEquals(p1,p2);
-
-
+
+
}
-
- public void testShutdown(){
+
+ @Test
+ public void testShutdown(){
Shutdown p1 = new Shutdown();
p1.setMessageNumber(9874);
p1.setTimeStamp(3453);
p1.setDestinationID(3);
-
-
+
+
byte[]p1_data=p1.getEncoded();
-
+
UDTPacket p=PacketFactory.createPacket(p1_data);
Shutdown p2=(Shutdown)p;
assertEquals(p1,p2);
}
-
-
-
+
+
+ @Test
public void testMessageDropRequest(){
MessageDropRequest p1=new MessageDropRequest();
p1.setMessageNumber(9876);
p1.setTimeStamp(3456);
p1.setDestinationID(4);
-
+
p1.setMsgFirstSeqNo(2);
p1.setMsgLastSeqNo(3);
-
-
+
+
byte[]p1_data=p1.getEncoded();
-
+
UDTPacket p=PacketFactory.createPacket(p1_data);
assertTrue(p instanceof MessageDropRequest);
MessageDropRequest p2=(MessageDropRequest)p;
Modified: udt-java/trunk/src/test/java/udt/performance/TCPTest.java
===================================================================
--- udt-java/trunk/src/test/java/udt/performance/TCPTest.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/performance/TCPTest.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -6,17 +6,18 @@
import java.net.Socket;
import java.util.Random;
-import junit.framework.TestCase;
+import org.junit.Test;
/**
* send some data over a TCP connection and measure performance
*
*/
-public class TCPTest extends TestCase {
+public class TCPTest {
int BUFSIZE=1024;
int num_packets=10*1000;
+ @Test
public void test1()throws Exception{
runServer();
//client socket
@@ -59,7 +60,7 @@
}
catch(Exception e){
e.printStackTrace();
- fail();
+ serverRunning=false;
}
}
};
Modified: udt-java/trunk/src/test/java/udt/performance/TestUDTLargeData.java
===================================================================
--- udt-java/trunk/src/test/java/udt/performance/TestUDTLargeData.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/performance/TestUDTLargeData.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -1,5 +1,7 @@
package udt.performance;
+import static org.junit.Assert.*;
+
import java.io.File;
import java.net.InetAddress;
import java.security.MessageDigest;
@@ -9,6 +11,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.junit.Test;
+
import udt.UDTClient;
import udt.UDTInputStream;
import udt.UDTReceiver;
@@ -31,6 +35,7 @@
int READ_BUFFERSIZE=1*1024*1024;
+ @Test
public void test1()throws Exception{
Logger.getLogger("udt").setLevel(Level.INFO);
// System.setProperty("udt.receiver.storeStatistics","true");
Modified: udt-java/trunk/src/test/java/udt/performance/TestUDTLargeDataCC1.java
===================================================================
--- udt-java/trunk/src/test/java/udt/performance/TestUDTLargeDataCC1.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/performance/TestUDTLargeDataCC1.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -3,6 +3,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.junit.Test;
+
import udt.UDTReceiver;
import udt.UDTSession;
import udt.cc.SimpleTCP;
@@ -22,6 +24,8 @@
int READ_BUFFERSIZE=1*1024*1024;
+ @Override
+ @Test
public void test1()throws Exception{
Logger.getLogger("udt").setLevel(Level.INFO);
UDTReceiver.dropRate=0;
Modified: udt-java/trunk/src/test/java/udt/performance/UDPTest.java
===================================================================
--- udt-java/trunk/src/test/java/udt/performance/UDPTest.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/performance/UDPTest.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -7,7 +7,8 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.SynchronousQueue;
-import junit.framework.TestCase;
+import org.junit.Test;
+
import udt.UDPEndPoint;
import udt.packets.DataPacket;
import udt.util.MeanValue;
@@ -15,11 +16,12 @@
/**
* send some data over a UDP connection and measure performance
*/
-public class UDPTest extends TestCase {
+public class UDPTest {
final int num_packets=10*10*1000;
final int packetSize=UDPEndPoint.DATAGRAM_SIZE;
+ @Test
public void test1()throws Exception{
runServer();
runThirdThread();
Modified: udt-java/trunk/src/test/java/udt/sender/TestFlowWindow.java
===================================================================
--- udt-java/trunk/src/test/java/udt/sender/TestFlowWindow.java 2011-12-01 19:52:51 UTC (rev 68)
+++ udt-java/trunk/src/test/java/udt/sender/TestFlowWindow.java 2012-02-03 06:57:00 UTC (rev 69)
@@ -1,12 +1,20 @@
package udt.sender;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.concurrent.TimeoutException;
-import junit.framework.TestCase;
+import org.junit.Test;
+
import udt.packets.DataPacket;
-public class TestFlowWindow extends TestCase {
+public class TestFlowWindow {
+ @Test
public void testFillWindow()throws InterruptedException, TimeoutException{
FlowWindow fw=new FlowWindow(3, 128);
DataPacket p1=fw.getForProducer();
@@ -38,6 +46,7 @@
assertTrue(fw.isEmpty());
}
+ @Test
public void testOverflow()throws InterruptedException, TimeoutException{
FlowWindow fw=new FlowWindow(3, 64);
DataPacket p1=fw.getForProducer();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
