mirror of
https://github.com/vanitasvitae/Smack.git
synced 2025-12-13 06:21:08 +01:00
Renamed Connection to XMPPConnection
This commit is contained in:
Florian Schmaus
parent
f3e007bad5
commit
489816c61f
145 changed files with 639 additions and 641 deletions
|
|
@ -19,7 +19,7 @@ package org.jivesoftware.smackx.bytestreams.ibb;
|
|||
import static org.junit.Assert.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.XMPPError;
|
||||
import org.jivesoftware.smackx.bytestreams.ibb.CloseListener;
|
||||
|
|
@ -49,7 +49,7 @@ public class CloseListenerTest {
|
|||
public void shouldReplyErrorIfSessionIsUnknown() throws Exception {
|
||||
|
||||
// mock connection
|
||||
Connection connection = mock(Connection.class);
|
||||
XMPPConnection connection = mock(XMPPConnection.class);
|
||||
|
||||
// initialize InBandBytestreamManager to get the CloseListener
|
||||
InBandBytestreamManager byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection);
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ package org.jivesoftware.smackx.bytestreams.ibb;
|
|||
import static org.junit.Assert.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.XMPPError;
|
||||
import org.jivesoftware.smackx.bytestreams.ibb.DataListener;
|
||||
|
|
@ -50,7 +50,7 @@ public class DataListenerTest {
|
|||
public void shouldReplyErrorIfSessionIsUnknown() throws Exception {
|
||||
|
||||
// mock connection
|
||||
Connection connection = mock(Connection.class);
|
||||
XMPPConnection connection = mock(XMPPConnection.class);
|
||||
|
||||
// initialize InBandBytestreamManager to get the DataListener
|
||||
InBandBytestreamManager byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection);
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ package org.jivesoftware.smackx.bytestreams.ibb;
|
|||
import static org.junit.Assert.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.XMPPError;
|
||||
|
|
@ -50,7 +50,7 @@ public class InBandBytestreamManagerTest {
|
|||
Protocol protocol;
|
||||
|
||||
// mocked XMPP connection
|
||||
Connection connection;
|
||||
XMPPConnection connection;
|
||||
|
||||
/**
|
||||
* Initialize fields used in the tests.
|
||||
|
|
@ -70,15 +70,15 @@ public class InBandBytestreamManagerTest {
|
|||
|
||||
/**
|
||||
* Test that
|
||||
* {@link InBandBytestreamManager#getByteStreamManager(Connection)} returns
|
||||
* {@link InBandBytestreamManager#getByteStreamManager(XMPPConnection)} returns
|
||||
* one bytestream manager for every connection
|
||||
*/
|
||||
@Test
|
||||
public void shouldHaveOneManagerForEveryConnection() {
|
||||
|
||||
// mock two connections
|
||||
Connection connection1 = mock(Connection.class);
|
||||
Connection connection2 = mock(Connection.class);
|
||||
XMPPConnection connection1 = mock(XMPPConnection.class);
|
||||
XMPPConnection connection2 = mock(XMPPConnection.class);
|
||||
|
||||
// get bytestream manager for the first connection twice
|
||||
InBandBytestreamManager conn1ByteStreamManager1 = InBandBytestreamManager.getByteStreamManager(connection1);
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ package org.jivesoftware.smackx.bytestreams.ibb;
|
|||
import static org.junit.Assert.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.XMPPError;
|
||||
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
|
||||
|
|
@ -41,7 +41,7 @@ public class InBandBytestreamRequestTest {
|
|||
String targetJID = "target@xmpp-server/Smack";
|
||||
String sessionID = "session_id";
|
||||
|
||||
Connection connection;
|
||||
XMPPConnection connection;
|
||||
InBandBytestreamManager byteStreamManager;
|
||||
Open initBytestream;
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ public class InBandBytestreamRequestTest {
|
|||
public void setup() {
|
||||
|
||||
// mock connection
|
||||
connection = mock(Connection.class);
|
||||
connection = mock(XMPPConnection.class);
|
||||
|
||||
// initialize InBandBytestreamManager to get the InitiationListener
|
||||
byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection);
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import java.io.InputStream;
|
|||
import java.io.OutputStream;
|
||||
import java.util.Random;
|
||||
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.PacketListener;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
|
|
@ -62,7 +62,7 @@ public class InBandBytestreamSessionMessageTest {
|
|||
Protocol protocol;
|
||||
|
||||
// mocked XMPP connection
|
||||
Connection connection;
|
||||
XMPPConnection connection;
|
||||
|
||||
InBandBytestreamManager byteStreamManager;
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import java.io.InputStream;
|
|||
import java.io.OutputStream;
|
||||
import java.util.Random;
|
||||
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.PacketListener;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
|
|
@ -63,7 +63,7 @@ public class InBandBytestreamSessionTest {
|
|||
Protocol protocol;
|
||||
|
||||
// mocked XMPP connection
|
||||
Connection connection;
|
||||
XMPPConnection connection;
|
||||
|
||||
InBandBytestreamManager byteStreamManager;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ package org.jivesoftware.smackx.bytestreams.ibb;
|
|||
import static org.junit.Assert.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.XMPPError;
|
||||
import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
|
||||
|
|
@ -43,7 +43,7 @@ public class InitiationListenerTest {
|
|||
String targetJID = "target@xmpp-server/Smack";
|
||||
String sessionID = "session_id";
|
||||
|
||||
Connection connection;
|
||||
XMPPConnection connection;
|
||||
InBandBytestreamManager byteStreamManager;
|
||||
InitiationListener initiationListener;
|
||||
Open initBytestream;
|
||||
|
|
@ -55,7 +55,7 @@ public class InitiationListenerTest {
|
|||
public void setup() {
|
||||
|
||||
// mock connection
|
||||
connection = mock(Connection.class);
|
||||
connection = mock(XMPPConnection.class);
|
||||
|
||||
// initialize InBandBytestreamManager to get the InitiationListener
|
||||
byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection);
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ package org.jivesoftware.smackx.bytestreams.socks5;
|
|||
import static org.junit.Assert.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.XMPPError;
|
||||
import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
|
||||
|
|
@ -47,7 +47,7 @@ public class InitiationListenerTest {
|
|||
String proxyAddress = "127.0.0.1";
|
||||
String sessionID = "session_id";
|
||||
|
||||
Connection connection;
|
||||
XMPPConnection connection;
|
||||
Socks5BytestreamManager byteStreamManager;
|
||||
InitiationListener initiationListener;
|
||||
Bytestream initBytestream;
|
||||
|
|
@ -59,7 +59,7 @@ public class InitiationListenerTest {
|
|||
public void setup() {
|
||||
|
||||
// mock connection
|
||||
connection = mock(Connection.class);
|
||||
connection = mock(XMPPConnection.class);
|
||||
|
||||
// create service discovery manager for mocked connection
|
||||
ServiceDiscoveryManager.getInstanceFor(connection);
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ import java.io.InputStream;
|
|||
import java.io.OutputStream;
|
||||
import java.net.ConnectException;
|
||||
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.XMPPError;
|
||||
|
|
@ -66,7 +66,7 @@ public class Socks5ByteStreamManagerTest {
|
|||
Protocol protocol;
|
||||
|
||||
// mocked XMPP connection
|
||||
Connection connection;
|
||||
XMPPConnection connection;
|
||||
|
||||
/**
|
||||
* Initialize fields used in the tests.
|
||||
|
|
@ -84,15 +84,15 @@ public class Socks5ByteStreamManagerTest {
|
|||
}
|
||||
|
||||
/**
|
||||
* Test that {@link Socks5BytestreamManager#getBytestreamManager(Connection)} returns one
|
||||
* Test that {@link Socks5BytestreamManager#getBytestreamManager(XMPPConnection)} returns one
|
||||
* bytestream manager for every connection
|
||||
*/
|
||||
@Test
|
||||
public void shouldHaveOneManagerForEveryConnection() {
|
||||
|
||||
// mock two connections
|
||||
Connection connection1 = mock(Connection.class);
|
||||
Connection connection2 = mock(Connection.class);
|
||||
XMPPConnection connection1 = mock(XMPPConnection.class);
|
||||
XMPPConnection connection2 = mock(XMPPConnection.class);
|
||||
|
||||
/*
|
||||
* create service discovery managers for the connections because the
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import java.io.OutputStream;
|
|||
import java.net.ServerSocket;
|
||||
import java.net.Socket;
|
||||
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.Packet;
|
||||
|
|
@ -55,7 +55,7 @@ public class Socks5ByteStreamRequestTest {
|
|||
|
||||
Protocol protocol;
|
||||
|
||||
Connection connection;
|
||||
XMPPConnection connection;
|
||||
|
||||
/**
|
||||
* Initialize fields used in the tests.
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import java.io.InputStream;
|
|||
import java.io.OutputStream;
|
||||
import java.net.Socket;
|
||||
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.XMPPError;
|
||||
|
|
@ -60,7 +60,7 @@ public class Socks5ClientForInitiatorTest {
|
|||
Protocol protocol;
|
||||
|
||||
// mocked XMPP connection
|
||||
Connection connection;
|
||||
XMPPConnection connection;
|
||||
|
||||
/**
|
||||
* Initialize fields used in the tests.
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ public class FileTransferNegotiatorTest {
|
|||
@Before
|
||||
public void setUp() throws Exception {
|
||||
// Uncomment this to enable debug output
|
||||
// Connection.DEBUG_ENABLED = true;
|
||||
// XMPPConnection.DEBUG_ENABLED = true;
|
||||
|
||||
connection = new DummyConnection();
|
||||
connection.connect();
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
//import java.util.concurrent.CountDownLatch;
|
||||
//import java.util.concurrent.TimeUnit;
|
||||
//
|
||||
//import org.jivesoftware.smack.Connection;
|
||||
//import org.jivesoftware.smack.XMPPConnection;
|
||||
//import org.jivesoftware.smack.DummyConnection;
|
||||
//import org.jivesoftware.smack.PacketInterceptor;
|
||||
//import org.jivesoftware.smack.PacketListener;
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
// return con;
|
||||
// }
|
||||
//
|
||||
// private void addInterceptor(final Connection con, final CountDownLatch latch) {
|
||||
// private void addInterceptor(final XMPPConnection con, final CountDownLatch latch) {
|
||||
// con.addPacketInterceptor(new PacketInterceptor() {
|
||||
// @Override
|
||||
// public void interceptPacket(Packet packet) {
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public class ItemValidationTest
|
|||
public void setUp() throws Exception
|
||||
{
|
||||
// Uncomment this to enable debug output
|
||||
// Connection.DEBUG_ENABLED = true;
|
||||
// XMPPConnection.DEBUG_ENABLED = true;
|
||||
|
||||
connection = new ThreadedDummyConnection();
|
||||
connection.connect();
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ import static org.mockito.Matchers.*;
|
|||
import static org.mockito.Mockito.*;
|
||||
|
||||
import org.jivesoftware.smack.PacketCollector;
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.filter.PacketFilter;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
|
|
@ -59,11 +59,11 @@ public class ConnectionUtils {
|
|||
* @return a mocked XMPP connection
|
||||
* @throws XMPPException
|
||||
*/
|
||||
public static Connection createMockedConnection(final Protocol protocol,
|
||||
public static XMPPConnection createMockedConnection(final Protocol protocol,
|
||||
String initiatorJID, String xmppServer) throws XMPPException {
|
||||
|
||||
// mock XMPP connection
|
||||
Connection connection = mock(Connection.class);
|
||||
XMPPConnection connection = mock(XMPPConnection.class);
|
||||
when(connection.getUser()).thenReturn(initiatorJID);
|
||||
when(connection.getServiceName()).thenReturn(xmppServer);
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ import org.jivesoftware.smack.packet.Packet;
|
|||
* // create protocol
|
||||
* Protocol protocol = new Protocol();
|
||||
* // create mocked connection
|
||||
* Connection connection = ConnectionUtils.createMockedConnection(protocol, "user@xmpp-server", "xmpp-server");
|
||||
* XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, "user@xmpp-server", "xmpp-server");
|
||||
*
|
||||
* // add reply packet to protocol
|
||||
* Packet reply = new Packet();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue