mirror of
https://github.com/vanitasvitae/Smack.git
synced 2025-09-10 01:29:38 +02:00
SMACK-412 Split the ping implementation to a server ping to replace keepalive and a simplified ping manager for manual pings of other entities.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13569 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
a55b54f20b
commit
aab1dcdabe
19 changed files with 749 additions and 651 deletions
162
test-unit/org/jivesoftware/smack/ping/ServerPingTest.java
Normal file
162
test-unit/org/jivesoftware/smack/ping/ServerPingTest.java
Normal file
|
@ -0,0 +1,162 @@
|
|||
package org.jivesoftware.smack.ping;
|
||||
|
||||
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.util.Properties;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.DummyConnection;
|
||||
import org.jivesoftware.smack.PacketInterceptor;
|
||||
import org.jivesoftware.smack.PacketListener;
|
||||
import org.jivesoftware.smack.SmackConfiguration;
|
||||
import org.jivesoftware.smack.TestUtils;
|
||||
import org.jivesoftware.smack.ThreadedDummyConnection;
|
||||
import org.jivesoftware.smack.filter.IQTypeFilter;
|
||||
import org.jivesoftware.smack.filter.PacketTypeFilter;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.Packet;
|
||||
import org.jivesoftware.smack.ping.packet.Ping;
|
||||
import org.jivesoftware.smack.util.PacketParserUtils;
|
||||
import org.junit.Test;
|
||||
|
||||
public class ServerPingTest {
|
||||
private static String TO = "juliet@capulet.lit/balcony";
|
||||
private static String ID = "s2c1";
|
||||
|
||||
private static Properties outputProperties = new Properties();
|
||||
{
|
||||
outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
|
||||
}
|
||||
|
||||
/*
|
||||
* Stanza copied from spec
|
||||
*/
|
||||
@Test
|
||||
public void validatePingStanzaXML() throws Exception {
|
||||
// @formatter:off
|
||||
String control = "<iq to='juliet@capulet.lit/balcony' id='s2c1' type='get'>"
|
||||
+ "<ping xmlns='urn:xmpp:ping'/>" + "</iq>";
|
||||
// @formatter:on
|
||||
|
||||
Ping ping = new Ping(TO);
|
||||
ping.setPacketID(ID);
|
||||
|
||||
assertXMLEqual(control, ping.toXML());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void checkProvider() throws Exception {
|
||||
// @formatter:off
|
||||
String control = "<iq from='capulet.lit' to='juliet@capulet.lit/balcony' id='s2c1' type='get'>"
|
||||
+ "<ping xmlns='urn:xmpp:ping'/>" + "</iq>";
|
||||
// @formatter:on
|
||||
DummyConnection con = new DummyConnection();
|
||||
IQ pingRequest = PacketParserUtils.parseIQ(TestUtils.getIQParser(control), con);
|
||||
|
||||
assertTrue(pingRequest instanceof Ping);
|
||||
|
||||
con.processPacket(pingRequest);
|
||||
|
||||
Packet pongPacket = con.getSentPacket();
|
||||
assertTrue(pongPacket instanceof IQ);
|
||||
|
||||
IQ pong = (IQ) pongPacket;
|
||||
assertEquals("juliet@capulet.lit/balcony", pong.getFrom());
|
||||
assertEquals("capulet.lit", pong.getTo());
|
||||
assertEquals("s2c1", pong.getPacketID());
|
||||
assertEquals(IQ.Type.RESULT, pong.getType());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void serverPingFailSingleConnection() throws Exception {
|
||||
DummyConnection connection = getConnection();
|
||||
CountDownLatch latch = new CountDownLatch(2);
|
||||
addInterceptor(connection, latch);
|
||||
addPingFailedListener(connection, latch);
|
||||
|
||||
// Time based testing kind of sucks, but this should be reliable on a DummyConnection since there
|
||||
// is no actual server involved. This will provide enough time to ping and wait for the lack of response.
|
||||
assertTrue(latch.await(getWaitTime(), TimeUnit.MILLISECONDS));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void serverPingSuccessfulSingleConnection() throws Exception {
|
||||
ThreadedDummyConnection connection = getThreadedConnection();
|
||||
final CountDownLatch latch = new CountDownLatch(1);
|
||||
|
||||
connection.addPacketListener(new PacketListener() {
|
||||
@Override
|
||||
public void processPacket(Packet packet) {
|
||||
latch.countDown();
|
||||
}
|
||||
}, new IQTypeFilter(IQ.Type.RESULT));
|
||||
|
||||
// Time based testing kind of sucks, but this should be reliable on a DummyConnection since there
|
||||
// is no actual server involved. This will provide enough time to ping and wait for the lack of response.
|
||||
assertTrue(latch.await(getWaitTime(), TimeUnit.MILLISECONDS));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void serverPingFailMultipleConnection() throws Exception {
|
||||
CountDownLatch latch = new CountDownLatch(6);
|
||||
SmackConfiguration.setPacketReplyTimeout(15000);
|
||||
|
||||
DummyConnection con1 = getConnection();
|
||||
addInterceptor(con1, latch);
|
||||
addPingFailedListener(con1, latch);
|
||||
|
||||
DummyConnection con2 = getConnection();
|
||||
addInterceptor(con2, latch);
|
||||
addPingFailedListener(con2, latch);
|
||||
|
||||
DummyConnection con3 = getConnection();
|
||||
addInterceptor(con3, latch);
|
||||
addPingFailedListener(con2, latch);
|
||||
|
||||
assertTrue(latch.await(getWaitTime(), TimeUnit.MILLISECONDS));
|
||||
}
|
||||
|
||||
private void addPingFailedListener(DummyConnection con, final CountDownLatch latch) {
|
||||
ServerPingManager manager = ServerPingManager.getInstanceFor(con);
|
||||
manager.addPingFailedListener(new PingFailedListener() {
|
||||
@Override
|
||||
public void pingFailed() {
|
||||
latch.countDown();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private DummyConnection getConnection() {
|
||||
DummyConnection con = new DummyConnection();
|
||||
ServerPingManager mgr = ServerPingManager.getInstanceFor(con);
|
||||
mgr.setPingInterval(ServerPingManager.PING_MINIMUM);
|
||||
|
||||
return con;
|
||||
}
|
||||
|
||||
private ThreadedDummyConnection getThreadedConnection() {
|
||||
ThreadedDummyConnection con = new ThreadedDummyConnection();
|
||||
ServerPingManager mgr = ServerPingManager.getInstanceFor(con);
|
||||
mgr.setPingInterval(ServerPingManager.PING_MINIMUM);
|
||||
|
||||
return con;
|
||||
}
|
||||
|
||||
private void addInterceptor(final Connection con, final CountDownLatch latch) {
|
||||
con.addPacketInterceptor(new PacketInterceptor() {
|
||||
@Override
|
||||
public void interceptPacket(Packet packet) {
|
||||
con.removePacketInterceptor(this);
|
||||
latch.countDown();
|
||||
}
|
||||
}, new PacketTypeFilter(Ping.class));
|
||||
}
|
||||
|
||||
private long getWaitTime() {
|
||||
return ServerPingManager.PING_MINIMUM + SmackConfiguration.getPacketReplyTimeout() + 3000;
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue