Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-09-10 18:59:41 +02:00
Code Issues Releases Wiki Activity

s/XMPPConnection/TCPConnection

Browse source
This commit is contained in:
Florian Schmaus 2014-03-02 15:23:54 +01:00
parent 07649cc758
commit 84a3fd7bd9
25 changed files with 114 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/src/integration-test/java/org/jivesoftware/smack/LoginTest.java
View file

@ -37,7 +37,7 @@ public class LoginTest extends SmackTestCase {
*/
public void testInvalidLogin() {
try {
XMPPConnection connection = createConnection();
TCPConnection connection = createConnection();
connection.connect();
try {
// Login with an invalid user
@ -67,8 +67,8 @@ public class LoginTest extends SmackTestCase {
if (!isTestAnonymousLogin()) return;
try {
XMPPConnection conn1 = createConnection();
XMPPConnection conn2 = createConnection();
TCPConnection conn1 = createConnection();
TCPConnection conn2 = createConnection();
conn1.connect();
conn2.connect();
try {
@ -106,12 +106,12 @@ public class LoginTest extends SmackTestCase {
try {
ConnectionConfiguration config = new ConnectionConfiguration(getHost(), getPort());
config.setSASLAuthenticationEnabled(false);
XMPPConnection conn1 = new XMPPConnection(config);
TCPConnection conn1 = new XMPPConnection(config);
conn1.connect();
config = new ConnectionConfiguration(getHost(), getPort());
config.setSASLAuthenticationEnabled(false);
XMPPConnection conn2 = new XMPPConnection(config);
TCPConnection conn2 = new XMPPConnection(config);
conn2.connect();
try {
@ -143,7 +143,7 @@ public class LoginTest extends SmackTestCase {
*/
public void testLoginWithNoResource() {
try {
XMPPConnection conn = createConnection();
TCPConnection conn = createConnection();
conn.connect();
try {
conn.getAccountManager().createAccount("user_1", "user_1", getAccountCreationParameters());

8
core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java
View file

@ -194,7 +194,7 @@ public class MessageTest extends SmackTestCase {
// Create another connection for the same user of connection 1
ConnectionConfiguration connectionConfiguration =
new ConnectionConfiguration(getHost(), getPort(), getServiceName());
XMPPConnection conn3 = new XMPPConnection(connectionConfiguration);
TCPConnection conn3 = new XMPPConnection(connectionConfiguration);
conn3.connect();
conn3.login(getUsername(0), getPassword(0), "Home");
// Set this connection as highest priority
@ -243,7 +243,7 @@ public class MessageTest extends SmackTestCase {
// Create another connection for the same user of connection 1
ConnectionConfiguration connectionConfiguration =
new ConnectionConfiguration(getHost(), getPort(), getServiceName());
XMPPConnection conn3 = new XMPPConnection(connectionConfiguration);
TCPConnection conn3 = new XMPPConnection(connectionConfiguration);
conn3.connect();
conn3.login(getUsername(0), getPassword(0), "Home");
// Set this connection as highest priority
@ -292,7 +292,7 @@ public class MessageTest extends SmackTestCase {
// Create another connection for the same user of connection 1
ConnectionConfiguration connectionConfiguration =
new ConnectionConfiguration(getHost(), getPort(), getServiceName());
XMPPConnection conn3 = new XMPPConnection(connectionConfiguration);
TCPConnection conn3 = new XMPPConnection(connectionConfiguration);
conn3.connect();
conn3.login(getUsername(0), getPassword(0), "Home");
// Set this connection as highest priority
@ -308,7 +308,7 @@ public class MessageTest extends SmackTestCase {
connectionConfiguration =
new ConnectionConfiguration(getHost(), getPort(), getServiceName());
XMPPConnection conn4 = new XMPPConnection(connectionConfiguration);
TCPConnection conn4 = new XMPPConnection(connectionConfiguration);
conn4.connect();
conn4.login(getUsername(0), getPassword(0), "Home2");
presence = new Presence(Presence.Type.available);

8
core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java
View file

@ -39,7 +39,7 @@ public class PresenceTest extends SmackTestCase {
* Connection(1) has logged from two different places with different presence priorities.
*/
public void testMessageToHighestPriority() {
XMPPConnection conn = null;
TCPConnection conn = null;
try {
// User_1 will log in again using another resource
conn = createConnection();
@ -142,7 +142,7 @@ public class PresenceTest extends SmackTestCase {
getConnection(1).sendPacket(new Presence(Presence.Type.unavailable));
// User_1 will log in again using another resource (that is going to be available)
XMPPConnection conn = createConnection();
TCPConnection conn = createConnection();
conn.connect();
conn.login(getUsername(1), getPassword(1), "OtherPlace");
@ -169,7 +169,7 @@ public class PresenceTest extends SmackTestCase {
// Create another connection for the same user of connection 1
ConnectionConfiguration connectionConfiguration =
new ConnectionConfiguration(getHost(), getPort(), getServiceName());
XMPPConnection conn4 = new XMPPConnection(connectionConfiguration);
TCPConnection conn4 = new XMPPConnection(connectionConfiguration);
conn4.connect();
conn4.login(getUsername(1), getPassword(1), "Home");
@ -257,7 +257,7 @@ public class PresenceTest extends SmackTestCase {
getConnection(0).disconnect();
// See if conneciton 0 can get offline status.
XMPPConnection con0 = getConnection(0);
TCPConnection con0 = getConnection(0);
con0.connect();
con0.login(getUsername(0), getUsername(0));

34
core/src/integration-test/java/org/jivesoftware/smack/ReconnectionTest.java
View file

@ -40,9 +40,9 @@ public class ReconnectionTest extends SmackTestCase {
*/
public void testAutomaticReconnection() throws Exception {
XMPPConnection connection = getConnection(0);
TCPConnection connection = getConnection(0);
CountDownLatch latch = new CountDownLatch(1);
XMPPConnectionTestListener listener = new XMPPConnectionTestListener(latch);
TCPConnectionTestListener listener = new XMPPConnectionTestListener(latch);
connection.addConnectionListener(listener);
// Simulates an error in the connection
@ -63,7 +63,7 @@ public class ReconnectionTest extends SmackTestCase {
config.setCompressionEnabled(true);
config.setSASLAuthenticationEnabled(true);
XMPPConnection connection = new XMPPConnection(config);
TCPConnection connection = new XMPPConnection(config);
// Connect to the server
connection.connect();
// Log into the server
@ -75,7 +75,7 @@ public class ReconnectionTest extends SmackTestCase {
executeSomeServerInteraction(connection);
CountDownLatch latch = new CountDownLatch(1);
XMPPConnectionTestListener listener = new XMPPConnectionTestListener(latch);
TCPConnectionTestListener listener = new XMPPConnectionTestListener(latch);
connection.addConnectionListener(listener);
// Simulates an error in the connection
@ -95,9 +95,9 @@ public class ReconnectionTest extends SmackTestCase {
* Simulates a connection error, disables the reconnection mechanism and then reconnects.
*/
public void testManualReconnectionWithCancelation() throws Exception {
XMPPConnection connection = getConnection(0);
TCPConnection connection = getConnection(0);
CountDownLatch latch = new CountDownLatch(1);
XMPPConnectionTestListener listener = new XMPPConnectionTestListener(latch);
TCPConnectionTestListener listener = new XMPPConnectionTestListener(latch);
connection.addConnectionListener(listener);
// Produces a connection error
@ -126,10 +126,10 @@ public class ReconnectionTest extends SmackTestCase {
* Closes the connection and then reconnects.
*/
public void testCloseAndManualReconnection() throws Exception {
XMPPConnection connection = getConnection(0);
TCPConnection connection = getConnection(0);
String username = connection.getConfiguration().getUsername();
String password = connection.getConfiguration().getPassword();
XMPPConnectionTestListener listener = new XMPPConnectionTestListener();
TCPConnectionTestListener listener = new XMPPConnectionTestListener();
connection.addConnectionListener(listener);
// Produces a normal disconnection
@ -154,9 +154,9 @@ public class ReconnectionTest extends SmackTestCase {
* Closes the connection and then reconnects.
*/
public void testAnonymousReconnection() throws Exception {
XMPPConnection connection = createConnection();
TCPConnection connection = createConnection();
connection.connect();
XMPPConnectionTestListener listener = new XMPPConnectionTestListener();
TCPConnectionTestListener listener = new XMPPConnectionTestListener();
connection.addConnectionListener(listener);
// Makes the anounymous login
@ -172,13 +172,13 @@ public class ReconnectionTest extends SmackTestCase {
assertEquals("Failed the manual connection", true, connection.isAnonymous());
}
private XMPPConnection createXMPPConnection() throws Exception {
XMPPConnection connection;
private TCPConnection createXMPPConnection() throws Exception {
TCPConnection connection;
// Create the configuration
ConnectionConfiguration config = new ConnectionConfiguration(getHost(), getPort());
config.setCompressionEnabled(Boolean.getBoolean("test.compressionEnabled"));
config.setSASLAuthenticationEnabled(true);
connection = new XMPPConnection(config);
connection = new TCPConnection(config);
return connection;
}
@ -186,7 +186,7 @@ public class ReconnectionTest extends SmackTestCase {
/**
* Execute some server interaction in order to test that the regenerated connection works fine.
*/
private void executeSomeServerInteraction(XMPPConnection connection) throws XMPPException {
private void executeSomeServerInteraction(TCPConnection connection) throws XMPPException {
PingManager pingManager = PingManager.getInstanceFor(connection);
pingManager.pingMyServer();
}
@ -195,7 +195,7 @@ public class ReconnectionTest extends SmackTestCase {
return 1;
}
private class XMPPConnectionTestListener implements ConnectionListener {
private class TCPConnectionTestListener implements ConnectionListener {
// Variables to support listener notifications verification
private volatile boolean connectionClosed = false;
@ -207,11 +207,11 @@ public class ReconnectionTest extends SmackTestCase {
private volatile boolean reconnectionCanceled = false;
private CountDownLatch countDownLatch;
private XMPPConnectionTestListener(CountDownLatch latch) {
private TCPConnectionTestListener(CountDownLatch latch) {
countDownLatch = latch;
}
private XMPPConnectionTestListener() {
private TCPConnectionTestListener() {
}
/**
* Methods to test the listener.

2
core/src/integration-test/java/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java
View file

@ -35,7 +35,7 @@ public class RosterInitializedBeforeConnectTest extends RosterSmackTest {
// initialize all rosters before login
for (int i = 0; i < getMaxConnections(); i++) {
XMPPConnection connection = getConnection(i);
TCPConnection connection = getConnection(i);
assertFalse(connection.isConnected());
Roster roster = connection.getRoster();

8
core/src/integration-test/java/org/jivesoftware/smack/RosterListenerTest.java
View file

@ -36,7 +36,7 @@ public class RosterListenerTest extends SmackTestCase {
public void testAddingRosterListenerBeforeConnect() throws Exception {
int inviterIndex = 0;
int inviteeIndex = 1;
XMPPConnection inviterConnection = getConnection(inviterIndex);
TCPConnection inviterConnection = getConnection(inviterIndex);
connectAndLogin(inviterIndex);
assertTrue("Inviter is not online", inviterConnection.isConnected());
@ -46,7 +46,7 @@ public class RosterListenerTest extends SmackTestCase {
// add user1 to roster to create roster events stored at XMPP server
inviterRoster.createEntry(getBareJID(inviteeIndex), getUsername(inviteeIndex), null);
XMPPConnection inviteeConnection = getConnection(inviteeIndex);
TCPConnection inviteeConnection = getConnection(inviteeIndex);
assertFalse("Invitee is already online", inviteeConnection.isConnected());
// collector for added entries
@ -88,7 +88,7 @@ public class RosterListenerTest extends SmackTestCase {
public void testAddingRosterListenerAfterConnect() throws Exception {
int inviterIndex = 0;
int inviteeIndex = 1;
XMPPConnection inviterConnection = getConnection(inviterIndex);
TCPConnection inviterConnection = getConnection(inviterIndex);
connectAndLogin(inviterIndex);
assertTrue("Inviter is not online", inviterConnection.isConnected());
@ -99,7 +99,7 @@ public class RosterListenerTest extends SmackTestCase {
Thread.sleep(500); // wait for XMPP server
XMPPConnection inviteeConnection = getConnection(inviteeIndex);
TCPConnection inviteeConnection = getConnection(inviteeIndex);
connectAndLogin(inviteeIndex);
assertTrue("Invitee is not online", inviteeConnection.isConnected());

8
core/src/integration-test/java/org/jivesoftware/smack/RosterSmackTest.java
View file

@ -329,7 +329,7 @@ public class RosterSmackTest extends SmackTestCase {
// Log in from another resource so we can test the roster
XMPPConnection con2 = createConnection();
TCPConnection con2 = createConnection();
con2.connect();
con2.login(getUsername(0), getUsername(0), "MyNewResource");
@ -435,7 +435,7 @@ public class RosterSmackTest extends SmackTestCase {
// Create another connection for the same user of connection 1
ConnectionConfiguration connectionConfiguration =
new ConnectionConfiguration(getHost(), getPort(), getServiceName());
XMPPConnection conn4 = new XMPPConnection(connectionConfiguration);
TCPConnection conn4 = new XMPPConnection(connectionConfiguration);
conn4.connect();
conn4.login(getUsername(1), getPassword(1), "Home");
@ -502,7 +502,7 @@ public class RosterSmackTest extends SmackTestCase {
// Create another connection for the same user of connection 1
ConnectionConfiguration connectionConfiguration =
new ConnectionConfiguration(getHost(), getPort(), getServiceName());
XMPPConnection conn4 = new XMPPConnection(connectionConfiguration);
TCPConnection conn4 = new XMPPConnection(connectionConfiguration);
conn4.connect();
conn4.login(getUsername(1), getPassword(1), "Home");
@ -567,7 +567,7 @@ public class RosterSmackTest extends SmackTestCase {
// Create another connection for the same user of connection 0
ConnectionConfiguration connectionConfiguration =
new ConnectionConfiguration(getHost(), getPort(), getServiceName());
XMPPConnection conn2 = new XMPPConnection(connectionConfiguration);
TCPConnection conn2 = new XMPPConnection(connectionConfiguration);
conn2.connect();
conn2.login(getUsername(0), getPassword(0), "Home");

22
core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java
View file

@ -29,7 +29,7 @@ import javax.net.SocketFactory;
import junit.framework.TestCase;
import org.jivesoftware.smack.ConnectionConfiguration;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.TCPConnection;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.util.ConnectionUtils;
import org.xmlpull.v1.XmlPullParserFactory;
@ -70,7 +70,7 @@ public abstract class SmackTestCase extends TestCase {
private String chatDomain = "chat";
private String mucDomain = "conference";
private XMPPConnection[] connections = null;
private TCPConnection[] connections = null;
/**
* Constructor for SmackTestCase.
@ -120,7 +120,7 @@ public abstract class SmackTestCase extends TestCase {
}
/**
* Returns the XMPPConnection located at the requested position. Each test case holds a
* Returns the TCPConnection located at the requested position. Each test case holds a
* pool of connections which is initialized while setting up the test case. The maximum
* number of connections is controlled by the message {@link #getMaxConnections()} which
* every subclass must implement.<p>
@ -129,9 +129,9 @@ public abstract class SmackTestCase extends TestCase {
* IllegalArgumentException will be thrown.
*
* @param index the position in the pool of the connection to look for.
* @return the XMPPConnection located at the requested position.
* @return the TCPConnection located at the requested position.
*/
protected XMPPConnection getConnection(int index) {
protected TCPConnection getConnection(int index) {
if (index > getMaxConnections()) {
throw new IllegalArgumentException("Index out of bounds");
}
@ -139,12 +139,12 @@ public abstract class SmackTestCase extends TestCase {
}
/**
* Creates a new XMPPConnection using the connection preferences. This is useful when
* Creates a new TCPConnection using the connection preferences. This is useful when
* not using a connection from the connection pool in a test case.
*
* @return a new XMPP connection.
*/
protected XMPPConnection createConnection() {
protected TCPConnection createConnection() {
// Create the configuration for this new connection
ConnectionConfiguration config = new ConnectionConfiguration(host, port);
config.setCompressionEnabled(compressionEnabled);
@ -152,7 +152,7 @@ public abstract class SmackTestCase extends TestCase {
if (getSocketFactory() == null) {
config.setSocketFactory(getSocketFactory());
}
return new XMPPConnection(config);
return new TCPConnection(config);
}
/**
@ -235,7 +235,7 @@ public abstract class SmackTestCase extends TestCase {
if (getMaxConnections() < 1) {
return;
}
connections = new XMPPConnection[getMaxConnections()];
connections = new TCPConnection[getMaxConnections()];
usernames = new String[getMaxConnections()];
passwords = new String[getMaxConnections()];
@ -301,7 +301,7 @@ public abstract class SmackTestCase extends TestCase {
if (passwordPrefix != null)
password = (samePassword ? passwordPrefix : passwordPrefix + (connectionIndex + 1));
XMPPConnection con = getConnection(connectionIndex);
TCPConnection con = getConnection(connectionIndex);
if (!con.isConnected())
con.connect();
@ -340,7 +340,7 @@ public abstract class SmackTestCase extends TestCase {
try {
// If not connected, connect so that we can delete the account.
if (!getConnection(i).isConnected()) {
XMPPConnection con = getConnection(i);
TCPConnection con = getConnection(i);
con.connect();
con.login(getUsername(i), getUsername(i));
}

6
core/src/main/java/org/jivesoftware/smack/Connection.java
View file

@ -49,13 +49,13 @@ import org.jivesoftware.smack.packet.Presence;
/**
* The abstract Connection class provides an interface for connections to a
* XMPP server and implements shared methods which are used by the
* different types of connections (e.g. XMPPConnection or BoshConnection).
* different types of connections (e.g. TCPConnection or BoshConnection).
*
* To create a connection to a XMPP server a simple usage of this API might
* look like the following:
* <pre>
* // Create a connection to the igniterealtime.org XMPP server.
* Connection con = new XMPPConnection("igniterealtime.org");
* Connection con = new TCPConnection("igniterealtime.org");
* // Connect to the server
* con.connect();
* // Most servers require you to login before performing other tasks.
@ -81,7 +81,7 @@ import org.jivesoftware.smack.packet.Presence;
* again. To stop the reconnection process, use {@link #disconnect()}. Once stopped
* you can use {@link #connect()} to manually connect to the server.
*
* @see XMPPConnection
* @see TCPConnection
* @author Matt Tucker
* @author Guenther Niess
*/