From 9964e3f29672a4903f8128269615e9d71e1f073b Mon Sep 17 00:00:00 2001 From: paweldomas Date: Thu, 21 Nov 2013 18:55:20 +0000 Subject: [PATCH] Extracts PTCP into separate test suite. Adds debug PTCP sample target. --- build.xml | 15 ++++++++ test/org/ice4j/PseudoTcpTestSuite.java | 51 ++++++++++++++++++++++++++ test/org/ice4j/StunTestSuite.java | 7 ---- 3 files changed, 66 insertions(+), 7 deletions(-) create mode 100644 test/org/ice4j/PseudoTcpTestSuite.java diff --git a/build.xml b/build.xml index c7bb8b7..0fc64d2 100644 --- a/build.xml +++ b/build.xml @@ -139,6 +139,7 @@ + @@ -179,6 +180,20 @@ value="lib/logging.properties"/> + + + + + + + + + + + diff --git a/test/org/ice4j/PseudoTcpTestSuite.java b/test/org/ice4j/PseudoTcpTestSuite.java new file mode 100644 index 0000000..27ac4f9 --- /dev/null +++ b/test/org/ice4j/PseudoTcpTestSuite.java @@ -0,0 +1,51 @@ +/* + * ice4j, the OpenSource Java Solution for NAT and Firewall Traversal. + * Maintained by the SIP Communicator community (http://sip-communicator.org). + * + * Distributable under LGPL license. See terms of license at gnu.org. + */ +package org.ice4j; + +import junit.framework.*; + +/** + * Contains pseudo TCP tests. + * + * @author Pawel Domas + */ +public class PseudoTcpTestSuite + extends TestCase +{ + + /** + * Creates a new instance of the suite + * + * @param s test name + */ + public PseudoTcpTestSuite(String s) + { + super(s); + } + + /** + * Returns the suite of tests to run. + * @return the suite of tests to run. + */ + public static Test suite() + { + TestSuite suite = new TestSuite(); + + // byte fifo buffer + suite.addTestSuite(org.ice4j.pseudotcp.util.ByteFifoBufferTest.class); + // transfer + suite.addTestSuite(org.ice4j.pseudotcp.PseudoTcpTestTransfer.class); + // ping pong + suite.addTestSuite(org.ice4j.pseudotcp.PseudoTcpTestPingPong.class); + // receive window + suite.addTestSuite(org.ice4j.pseudotcp.PseudoTcpTestRecvWindow.class); + // stream + suite.addTestSuite(org.ice4j.pseudotcp.PseudoTcpStreamTest.class); + + return suite; + } +} diff --git a/test/org/ice4j/StunTestSuite.java b/test/org/ice4j/StunTestSuite.java index bdede4f..96f247f 100644 --- a/test/org/ice4j/StunTestSuite.java +++ b/test/org/ice4j/StunTestSuite.java @@ -74,13 +74,6 @@ public class StunTestSuite suite.addTestSuite(org.ice4j.stunclient.StunAddressDiscovererTest_v6.class); suite.addTestSuite(org.ice4j.stunclient.StunAddressDiscovererTest_v4v6.class); - //pseudotcp - suite.addTestSuite(org.ice4j.pseudotcp.PseudoTcpTestTransfer.class); - suite.addTestSuite(org.ice4j.pseudotcp.PseudoTcpTestPingPong.class); - suite.addTestSuite(org.ice4j.pseudotcp.PseudoTcpTestRecvWindow.class); - suite.addTestSuite(org.ice4j.pseudotcp.PseudoTcpStreamTest.class); - suite.addTestSuite(org.ice4j.pseudotcp.util.ByteFifoBufferTest.class); - return suite; } }