From ec97bc2f81160a6c2d49c22d5f4797d50ae7dec7 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Sat, 4 Jan 2014 17:39:32 +0000 Subject: [PATCH] Stab at fixing streaming tests. Add javadoc package.html Fix import order --- .../streaming/impl/AcceptingChannelImpl.java | 2 +- .../streaming/impl/ConnectionOptions.java | 2 +- .../streaming/impl/I2PServerSocketFull.java | 2 +- .../streaming/impl/I2PSocketManagerFull.java | 4 ++-- .../client/streaming/impl/MessageHandler.java | 2 +- .../net/i2p/client/streaming/impl/package.html | 17 +++++++++++++++++ .../i2p/client/streaming/ConnectCloseTest.java | 6 ++++-- .../client/streaming/ConnectInactivityTest.java | 5 ++++- .../net/i2p/client/streaming/ConnectTest.java | 5 ++++- .../client/streaming/ConnectTimeoutTest.java | 4 +++- .../net/i2p/client/streaming/EchoLargeTest.java | 5 ++++- .../net/i2p/client/streaming/EchoTest.java | 5 ++++- .../streaming/MessageInputStreamTest.java | 2 +- .../streaming/MessageOutputStreamTest.java | 2 +- .../net/i2p/client/streaming/PingTest.java | 2 +- .../client/streaming/StreamSinkTestClient.java | 2 +- .../client/streaming/StreamSinkTestServer.java | 2 +- .../streaming/StreamSinkTestStandalone.java | 1 + .../i2p/client/streaming/StreamingTestBase.java | 2 +- 19 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 apps/streaming/java/src/net/i2p/client/streaming/impl/package.html diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/AcceptingChannelImpl.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/AcceptingChannelImpl.java index 4dfa3ed16..a58d3c5fa 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/AcceptingChannelImpl.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/AcceptingChannelImpl.java @@ -2,8 +2,8 @@ package net.i2p.client.streaming.impl; import net.i2p.I2PException; import net.i2p.client.streaming.AcceptingChannel; -import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PSocketManager; import java.net.SocketTimeoutException; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java index 3375a4def..68196e6d1 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java @@ -1,7 +1,7 @@ package net.i2p.client.streaming.impl; -import net.i2p.client.streaming.I2PSocketOptionsImpl; import net.i2p.client.streaming.I2PSocketOptions; +import net.i2p.client.streaming.I2PSocketOptionsImpl; import java.util.Collections; import java.util.HashSet; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java index 6ef59e0c5..9da248bc5 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java @@ -2,8 +2,8 @@ package net.i2p.client.streaming.impl; import java.net.SocketTimeoutException; import net.i2p.I2PException; -import net.i2p.client.streaming.I2PServerSocket; import net.i2p.client.streaming.AcceptingChannel; +import net.i2p.client.streaming.I2PServerSocket; import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PSocketManager; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java index 30a76f6b5..64b930993 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java @@ -17,10 +17,10 @@ import net.i2p.client.I2PSession; import net.i2p.client.I2PSessionException; import net.i2p.data.Destination; import net.i2p.util.Log; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PSocketManager; import net.i2p.client.streaming.I2PSocketOptions; -import net.i2p.client.streaming.I2PSocket; -import net.i2p.client.streaming.I2PServerSocket; /** * Centralize the coordination and multiplexing of the local client's streaming. diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java index 0066d933b..cb3dd64ab 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java @@ -7,9 +7,9 @@ import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; import net.i2p.client.I2PSessionException; import net.i2p.client.I2PSessionMuxedListener; +import net.i2p.client.streaming.I2PSocketManager; import net.i2p.client.streaming.I2PSocketManager.DisconnectListener; import net.i2p.util.Log; -import net.i2p.client.streaming.I2PSocketManager; /** * Receive raw information from the I2PSession and turn it into diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/package.html b/apps/streaming/java/src/net/i2p/client/streaming/impl/package.html new file mode 100644 index 000000000..dbf1d2d02 --- /dev/null +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/package.html @@ -0,0 +1,17 @@ + +

Implements a TCP-like (reliable, authenticated, in order) set of sockets for +communicating over the IP-like (unreliable, unauthenticated, unordered) I2P +messages. + +This is the streaming implementation (moved for ticket #1135 to here). +For the API (which you probably want), see ministreaming. + +Note that this class is split across two jars, streaming.jar and ministreaming.jar. +The interfaces and some code are in ministreaming.jar, but the +real work gets done in streaming.jar. Clients must have both jars +in their classpath. + +Most clients will require (only) streaming.jar, ministreaming.jar, and i2p.jar +in their classpath to communicate with the router. +

+ diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectCloseTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectCloseTest.java index e3557bcb5..41c5b2fdd 100644 --- a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectCloseTest.java +++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectCloseTest.java @@ -1,4 +1,4 @@ -package net.i2p.client.streaming; +package net.i2p.client.streaming.impl; import java.io.InputStream; import java.util.Properties; @@ -8,8 +8,10 @@ import org.junit.Test; import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocketManager; import net.i2p.util.Log; - /** * Have a client connect to a server, where the server waits 5 * seconds and closes the socket and the client detect that diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectInactivityTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectInactivityTest.java index 2ef2338ea..6d6a62443 100644 --- a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectInactivityTest.java +++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectInactivityTest.java @@ -1,4 +1,4 @@ -package net.i2p.client.streaming; +package net.i2p.client.streaming.impl; import java.util.Properties; @@ -7,6 +7,9 @@ import org.junit.Test; import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocketManager; import net.i2p.util.Log; /** diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTest.java index 4a9d32b13..772538fb7 100644 --- a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTest.java +++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTest.java @@ -1,4 +1,4 @@ -package net.i2p.client.streaming; +package net.i2p.client.streaming.impl; import java.util.Properties; @@ -7,6 +7,9 @@ import org.junit.Test; import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocketManager; import net.i2p.util.Log; /** diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTimeoutTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTimeoutTest.java index 8bfffc5f5..b54d167e5 100644 --- a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTimeoutTest.java +++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTimeoutTest.java @@ -1,4 +1,4 @@ -package net.i2p.client.streaming; +package net.i2p.client.streaming.impl; import java.io.ByteArrayOutputStream; import java.util.Properties; @@ -8,6 +8,8 @@ import org.junit.Test; import net.i2p.I2PAppContext; import net.i2p.client.I2PClientFactory; import net.i2p.client.I2PSession; +import net.i2p.client.streaming.I2PSocketManager; +import net.i2p.client.streaming.I2PSocketManagerFactory; import net.i2p.data.Destination; import net.i2p.util.Log; diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoLargeTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoLargeTest.java index 52a643a8f..a626212de 100644 --- a/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoLargeTest.java +++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoLargeTest.java @@ -1,4 +1,4 @@ -package net.i2p.client.streaming; +package net.i2p.client.streaming.impl; import java.io.InputStream; import java.io.OutputStream; @@ -9,6 +9,9 @@ import org.junit.Test; import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocketManager; import net.i2p.util.Log; /** diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoTest.java index 55ade2e2a..6a88d8655 100644 --- a/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoTest.java +++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoTest.java @@ -1,4 +1,4 @@ -package net.i2p.client.streaming; +package net.i2p.client.streaming.impl; import java.io.InputStream; import java.io.OutputStream; @@ -9,6 +9,9 @@ import org.junit.Test; import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; +import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PServerSocket; +import net.i2p.client.streaming.I2PSocketManager; import net.i2p.util.Log; /** diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageInputStreamTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageInputStreamTest.java index da9d08d8d..284bc193b 100644 --- a/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageInputStreamTest.java +++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageInputStreamTest.java @@ -1,4 +1,4 @@ -package net.i2p.client.streaming; +package net.i2p.client.streaming.impl; import java.io.IOException; import java.util.ArrayList; diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageOutputStreamTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageOutputStreamTest.java index 2961495bb..1d7d8de5c 100644 --- a/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageOutputStreamTest.java +++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageOutputStreamTest.java @@ -1,4 +1,4 @@ -package net.i2p.client.streaming; +package net.i2p.client.streaming.impl; import java.io.ByteArrayOutputStream; diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/PingTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/PingTest.java index 99a13d8a9..b0aa50fec 100644 --- a/apps/streaming/java/test/junit/net/i2p/client/streaming/PingTest.java +++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/PingTest.java @@ -1,4 +1,4 @@ -package net.i2p.client.streaming; +package net.i2p.client.streaming.impl; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestClient.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestClient.java index 48ab0bd94..bc34c82fa 100644 --- a/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestClient.java +++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestClient.java @@ -1,6 +1,6 @@ package net.i2p.client.streaming; - +import net.i2p.client.streaming.impl.I2PSocketManagerFull; /** * */ diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestServer.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestServer.java index 725a36791..ba0c99dbc 100644 --- a/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestServer.java +++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestServer.java @@ -1,6 +1,6 @@ package net.i2p.client.streaming; - +import net.i2p.client.streaming.impl.I2PSocketManagerFull; /** * */ diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestStandalone.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestStandalone.java index 7e45c86f0..b84b97321 100644 --- a/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestStandalone.java +++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestStandalone.java @@ -1,5 +1,6 @@ package net.i2p.client.streaming; +import net.i2p.client.streaming.impl.I2PSocketManagerFull; /** * Usage: StreamSinkTest [(old|new) [#hops [#kb]]] */ diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamingTestBase.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamingTestBase.java index 69091d699..2331b199d 100644 --- a/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamingTestBase.java +++ b/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamingTestBase.java @@ -1,4 +1,4 @@ -package net.i2p.client.streaming; +package net.i2p.client.streaming.impl; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream;