vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove unnecessary argument from createMockedConnection() 

The server address can be infered from the user JID.
This commit is contained in:
Florian Schmaus 2018-04-18 14:10:14 +02:00
parent 2050845289
commit acc64ffc2d
7 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
View File

@ -38,7 +38,6 @@ import org.jivesoftware.util.Protocol;
import org.jivesoftware.util.Verification; import org.jivesoftware.util.Verification;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.jxmpp.jid.DomainBareJid;
import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.EntityFullJid;
import org.jxmpp.jid.JidTestUtil; import org.jxmpp.jid.JidTestUtil;
@ -52,7 +51,6 @@ public class InBandBytestreamManagerTest extends InitExtensions {
// settings // settings
private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE; private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1; private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
String sessionID = "session_id"; String sessionID = "session_id";
// protocol verifier // protocol verifier
@ -74,8 +72,7 @@ public class InBandBytestreamManagerTest extends InitExtensions {
protocol = new Protocol(); protocol = new Protocol();
// create mocked XMPP connection // create mocked XMPP connection
connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID, connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
xmppServer);
} }

4
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
View File

@ -43,7 +43,6 @@ import org.jivesoftware.util.Protocol;
import org.jivesoftware.util.Verification; import org.jivesoftware.util.Verification;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.jxmpp.jid.DomainBareJid;
import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.EntityFullJid;
import org.jxmpp.jid.JidTestUtil; import org.jxmpp.jid.JidTestUtil;
import org.powermock.reflect.Whitebox; import org.powermock.reflect.Whitebox;
@ -60,7 +59,6 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions {
// settings // settings
private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE; private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1; private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
private static final String sessionID = "session_id"; private static final String sessionID = "session_id";
private static final int blockSize = 10; private static final int blockSize = 10;
@ -90,7 +88,7 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions {
protocol = new Protocol(); protocol = new Protocol();
// create mocked XMPP connection // create mocked XMPP connection
connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID, xmppServer); connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
// initialize InBandBytestreamManager to get the InitiationListener // initialize InBandBytestreamManager to get the InitiationListener
byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection); byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection);

4
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
View File

@ -43,7 +43,6 @@ import org.jivesoftware.util.Protocol;
import org.jivesoftware.util.Verification; import org.jivesoftware.util.Verification;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.jxmpp.jid.DomainBareJid;
import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.EntityFullJid;
import org.jxmpp.jid.JidTestUtil; import org.jxmpp.jid.JidTestUtil;
import org.powermock.reflect.Whitebox; import org.powermock.reflect.Whitebox;
@ -61,7 +60,6 @@ public class InBandBytestreamSessionTest extends InitExtensions {
// settings // settings
private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE; private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1; private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
private static final String sessionID = "session_id"; private static final String sessionID = "session_id";
private static final int blockSize = 10; private static final int blockSize = 10;
@ -91,7 +89,7 @@ public class InBandBytestreamSessionTest extends InitExtensions {
protocol = new Protocol(); protocol = new Protocol();
// create mocked XMPP connection // create mocked XMPP connection
connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID, xmppServer); connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
// initialize InBandBytestreamManager to get the InitiationListener // initialize InBandBytestreamManager to get the InitiationListener
byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection); byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection);

4
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
View File

@ -68,7 +68,7 @@ public class Socks5ByteStreamManagerTest {
// settings // settings
private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE; private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1; private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1; private static final DomainBareJid xmppServer = initiatorJID.asDomainBareJid();
private static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG; private static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
private static final String proxyAddress = "127.0.0.1"; private static final String proxyAddress = "127.0.0.1";
private static final String sessionID = "session_id"; private static final String sessionID = "session_id";
@ -92,7 +92,7 @@ public class Socks5ByteStreamManagerTest {
protocol = new Protocol(); protocol = new Protocol();
// create mocked XMPP connection // create mocked XMPP connection
connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID, xmppServer); connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
} }

3
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
View File

@ -57,7 +57,6 @@ public class Socks5ByteStreamRequestTest {
// settings // settings
private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE; private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1; private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
private static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG; private static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
private static final String proxyAddress = "127.0.0.1"; private static final String proxyAddress = "127.0.0.1";
private static final String sessionID = "session_id"; private static final String sessionID = "session_id";
@ -79,7 +78,7 @@ public class Socks5ByteStreamRequestTest {
protocol = new Protocol(); protocol = new Protocol();
// create mocked XMPP connection // create mocked XMPP connection
connection = ConnectionUtils.createMockedConnection(protocol, targetJID, xmppServer); connection = ConnectionUtils.createMockedConnection(protocol, targetJID);
} }

3
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
View File

@ -58,7 +58,6 @@ public class Socks5ClientForInitiatorTest {
// settings // settings
private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE; private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1; private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
private static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG; private static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
private static final String loopbackAddress = InetAddress.getLoopbackAddress().getHostAddress(); private static final String loopbackAddress = InetAddress.getLoopbackAddress().getHostAddress();
@ -86,7 +85,7 @@ public class Socks5ClientForInitiatorTest {
protocol = new Protocol(); protocol = new Protocol();
// create mocked XMPP connection // create mocked XMPP connection
connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID, xmppServer); connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
} }
/** /**

5
smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
View File

@ -63,14 +63,15 @@ public class ConnectionUtils {
* *
* @param protocol protocol helper containing answer packets * @param protocol protocol helper containing answer packets
* @param initiatorJID the user associated to the XMPP connection * @param initiatorJID the user associated to the XMPP connection
* @param xmppServer the XMPP server associated to the XMPP connection
* @return a mocked XMPP connection * @return a mocked XMPP connection
* @throws SmackException * @throws SmackException
* @throws XMPPErrorException * @throws XMPPErrorException
* @throws InterruptedException * @throws InterruptedException
*/ */
public static XMPPConnection createMockedConnection(final Protocol protocol, public static XMPPConnection createMockedConnection(final Protocol protocol,
EntityFullJid initiatorJID, DomainBareJid xmppServer) throws SmackException, XMPPErrorException, InterruptedException { EntityFullJid initiatorJID) throws SmackException, XMPPErrorException, InterruptedException {
DomainBareJid xmppServer = initiatorJID.asDomainBareJid();
// mock XMPP connection // mock XMPP connection
XMPPConnection connection = mock(XMPPConnection.class); XMPPConnection connection = mock(XMPPConnection.class);