Stab at fixing streaming tests.

Add javadoc package.html
Fix import order
This commit is contained in:
dg2-new
2014-01-04 17:39:32 +00:00
parent e98b9d0af5
commit ec97bc2f81
19 changed files with 53 additions and 19 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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.

View File

@ -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

View File

@ -0,0 +1,17 @@
<html><body>
<p>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.
</p>
</body></html>

View File

@ -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

View File

@ -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;
/**

View File

@ -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;
/**

View File

@ -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;

View File

@ -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;
/**

View File

@ -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;
/**

View File

@ -1,4 +1,4 @@
package net.i2p.client.streaming;
package net.i2p.client.streaming.impl;
import java.io.IOException;
import java.util.ArrayList;

View File

@ -1,4 +1,4 @@
package net.i2p.client.streaming;
package net.i2p.client.streaming.impl;
import java.io.ByteArrayOutputStream;

View File

@ -1,4 +1,4 @@
package net.i2p.client.streaming;
package net.i2p.client.streaming.impl;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;

View File

@ -1,6 +1,6 @@
package net.i2p.client.streaming;
import net.i2p.client.streaming.impl.I2PSocketManagerFull;
/**
*
*/

View File

@ -1,6 +1,6 @@
package net.i2p.client.streaming;
import net.i2p.client.streaming.impl.I2PSocketManagerFull;
/**
*
*/

View File

@ -1,5 +1,6 @@
package net.i2p.client.streaming;
import net.i2p.client.streaming.impl.I2PSocketManagerFull;
/**
* Usage: StreamSinkTest [(old|new) [#hops [#kb]]]
*/

View File

@ -1,4 +1,4 @@
package net.i2p.client.streaming;
package net.i2p.client.streaming.impl;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;