vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-10 17:49:38 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into jingle

Browse source
This commit is contained in:
vanitasvitae 2017-06-02 18:48:02 +02:00
commit 9d34cbc6f3
98 changed files with 11783 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
View file

@ -61,6 +61,8 @@ public class Socks5ClientForInitiatorTest {
static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
static final String loopbackAddress = InetAddress.getLoopbackAddress().getHostAddress();
private static final int GET_SOCKET_TIMEOUT = 90 * 1000;
int proxyPort = 7890;
String sessionID = "session_id";
@ -111,7 +113,7 @@ public class Socks5ClientForInitiatorTest {
connection, sessionID, targetJID);
try {
socks5Client.getSocket(10000);
socks5Client.getSocket(GET_SOCKET_TIMEOUT);
fail("exception should be thrown");
}
@ -175,7 +177,7 @@ public class Socks5ClientForInitiatorTest {
Socks5ClientForInitiator socks5Client = new Socks5ClientForInitiator(streamHost, digest,
connection, sessionID, targetJID);
Socket socket = socks5Client.getSocket(10000);
Socket socket = socks5Client.getSocket(GET_SOCKET_TIMEOUT);
// verify test data
InputStream in = socket.getInputStream();
@ -224,7 +226,7 @@ public class Socks5ClientForInitiatorTest {
try {
socks5Client.getSocket(10000);
socks5Client.getSocket(GET_SOCKET_TIMEOUT);
fail("exception should be thrown");
}