diff --git a/test/org/ice4j/MessageEventDispatchingTest.java b/test/org/ice4j/MessageEventDispatchingTest.java index 68f2e58..a31e8c3 100644 --- a/test/org/ice4j/MessageEventDispatchingTest.java +++ b/test/org/ice4j/MessageEventDispatchingTest.java @@ -6,7 +6,6 @@ */ package org.ice4j; -import java.net.*; import java.util.*; import junit.framework.*; diff --git a/test/org/ice4j/pseudotcp/MultiThreadSupportTest.java b/test/org/ice4j/pseudotcp/MultiThreadSupportTest.java index ca3d3e7..ffdb8f8 100755 --- a/test/org/ice4j/pseudotcp/MultiThreadSupportTest.java +++ b/test/org/ice4j/pseudotcp/MultiThreadSupportTest.java @@ -1,9 +1,6 @@ package org.ice4j.pseudotcp; - import junit.framework.*; -import java.lang.Thread.*; -import static org.junit.Assert.*; /** * This class enables multi thread tests where main thread waits in loop @@ -18,7 +15,7 @@ import static org.junit.Assert.*; */ public class MultiThreadSupportTest extends TestCase - implements UncaughtExceptionHandler + implements Thread.UncaughtExceptionHandler { private volatile Throwable testError; private volatile Thread errorThread; diff --git a/test/org/ice4j/pseudotcp/PseudoTcpStreamTest.java b/test/org/ice4j/pseudotcp/PseudoTcpStreamTest.java index 79a70e7..71faa30 100755 --- a/test/org/ice4j/pseudotcp/PseudoTcpStreamTest.java +++ b/test/org/ice4j/pseudotcp/PseudoTcpStreamTest.java @@ -7,11 +7,11 @@ */ package org.ice4j.pseudotcp; +import static org.junit.Assert.*; + import java.io.*; import java.net.*; import java.util.logging.*; -import static org.junit.Assert.*; -import org.junit.*; /** * diff --git a/test/org/ice4j/pseudotcp/PseudoTcpTestBase.java b/test/org/ice4j/pseudotcp/PseudoTcpTestBase.java index 84f5035..f7788f6 100755 --- a/test/org/ice4j/pseudotcp/PseudoTcpTestBase.java +++ b/test/org/ice4j/pseudotcp/PseudoTcpTestBase.java @@ -10,7 +10,6 @@ package org.ice4j.pseudotcp; import java.io.*; import java.util.*; import java.util.logging.*; -import org.ice4j.pseudotcp.util.*; /** * Base class for other pseduoTCP logic tests. Runs all threads required for the @@ -20,7 +19,8 @@ import org.ice4j.pseudotcp.util.*; * * @author Pawel Domas */ -public abstract class PseudoTcpTestBase extends MultiThreadSupportTest +public abstract class PseudoTcpTestBase + extends MultiThreadSupportTest implements PseudoTcpNotify { /** diff --git a/test/org/ice4j/pseudotcp/PseudoTcpTestPingPong.java b/test/org/ice4j/pseudotcp/PseudoTcpTestPingPong.java index a834a19..4e381f3 100755 --- a/test/org/ice4j/pseudotcp/PseudoTcpTestPingPong.java +++ b/test/org/ice4j/pseudotcp/PseudoTcpTestPingPong.java @@ -9,9 +9,8 @@ package org.ice4j.pseudotcp; import java.io.*; import java.util.logging.*; + import org.ice4j.pseudotcp.util.*; -import static org.junit.Assert.*; -import org.junit.*; /** * This class implements test for two way transfers @@ -69,7 +68,7 @@ public class PseudoTcpTestPingPong extends PseudoTcpTestBase public void doTestPingPong(int size, int iterations) { Thread.setDefaultUncaughtExceptionHandler(this); - long start, end; + long start; iterationsRemaining = iterations; receiver = getRemoteTcp(); sender = getLocalTcp(); diff --git a/test/org/ice4j/pseudotcp/PseudoTcpTestRecvWindow.java b/test/org/ice4j/pseudotcp/PseudoTcpTestRecvWindow.java index 6da22b9..58cbdfc 100755 --- a/test/org/ice4j/pseudotcp/PseudoTcpTestRecvWindow.java +++ b/test/org/ice4j/pseudotcp/PseudoTcpTestRecvWindow.java @@ -10,9 +10,8 @@ package org.ice4j.pseudotcp; import java.io.*; import java.util.*; import java.util.logging.*; + import org.ice4j.pseudotcp.util.*; -import static org.junit.Assert.*; -import org.junit.*; /** * Fill the receiver window until it is full, drain it and then fill it with the @@ -57,7 +56,7 @@ public class PseudoTcpTestRecvWindow extends PseudoTcpTestBase { Thread.setDefaultUncaughtExceptionHandler(this); testDataSize = size; - long start, end, elapsed; + long start, elapsed; send_position = new ArrayList(); recv_position = new ArrayList(); // Create some dummy data diff --git a/test/org/ice4j/pseudotcp/PseudoTcpTestTransfer.java b/test/org/ice4j/pseudotcp/PseudoTcpTestTransfer.java index 9d742ab..6cf05da 100755 --- a/test/org/ice4j/pseudotcp/PseudoTcpTestTransfer.java +++ b/test/org/ice4j/pseudotcp/PseudoTcpTestTransfer.java @@ -7,11 +7,10 @@ */ package org.ice4j.pseudotcp; +import static org.junit.Assert.*; + import java.io.*; import java.util.logging.*; -import org.ice4j.pseudotcp.util.*; -import static org.junit.Assert.*; -import org.junit.*; /** * Implements one way transfer test diff --git a/test/org/ice4j/pseudotcp/util/ByteFifoBufferTest.java b/test/org/ice4j/pseudotcp/util/ByteFifoBufferTest.java index f0a502a..a5bc534 100755 --- a/test/org/ice4j/pseudotcp/util/ByteFifoBufferTest.java +++ b/test/org/ice4j/pseudotcp/util/ByteFifoBufferTest.java @@ -7,11 +7,12 @@ */ package org.ice4j.pseudotcp.util; -import junit.framework.*; +import static org.junit.Assert.*; + import java.nio.*; import java.util.*; -import static org.junit.Assert.*; -import org.junit.*; + +import junit.framework.*; /** *