mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-11-25 21:42:07 +01:00
b16f34f61e
Smack's Managers should not remove itself when the connection is closed or should re-add themselves if the connection get reconnected. This should also fix some NPE's. We are currently going with two different designs of Manager: 1. The one with WeakReferences/WeakHashMaps (SDM, EntityCapsManager) and 2. the one where the managers remove their listeners on connectionClosed() *and* connectionClosedOnError(), and later add their listeners on reconnectionSuccessful(). The first design has the Connection instance only weak referenced. The other design does reference Connection strongly (e.g. the 'managers' map in IBBManager/S5BManager), but removes this references when connectionClosed(onError)() is called. git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_2@13788 b35dd754-fafc-0310-a699-88a17e54d16e
139 lines
5.2 KiB
Java
139 lines
5.2 KiB
Java
/**
|
|
* All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package org.jivesoftware.smackx.receipts;
|
|
|
|
import static org.junit.Assert.assertEquals;
|
|
import static org.junit.Assert.assertFalse;
|
|
import static org.junit.Assert.assertNotNull;
|
|
import static org.junit.Assert.assertTrue;
|
|
|
|
import java.io.IOException;
|
|
import java.io.StringReader;
|
|
import java.util.Properties;
|
|
|
|
import org.jivesoftware.smack.DummyConnection;
|
|
import org.jivesoftware.smack.packet.Message;
|
|
import org.jivesoftware.smack.packet.Packet;
|
|
import org.jivesoftware.smack.util.PacketParserUtils;
|
|
import org.jivesoftware.smackx.ServiceDiscoveryManager;
|
|
import org.junit.Test;
|
|
import org.xmlpull.mxp1.MXParser;
|
|
import org.xmlpull.v1.XmlPullParser;
|
|
import org.xmlpull.v1.XmlPullParserException;
|
|
|
|
import com.jamesmurty.utils.XMLBuilder;
|
|
|
|
public class DeliveryReceiptTest {
|
|
|
|
private static Properties outputProperties = new Properties();
|
|
static {
|
|
outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
|
|
}
|
|
|
|
@Test
|
|
public void receiptTest() throws Exception {
|
|
XmlPullParser parser;
|
|
String control;
|
|
|
|
control = XMLBuilder.create("message")
|
|
.a("from", "romeo@montague.com")
|
|
.e("request")
|
|
.a("xmlns", "urn:xmpp:receipts")
|
|
.asString(outputProperties);
|
|
|
|
parser = getParser(control, "message");
|
|
Packet p = PacketParserUtils.parseMessage(parser);
|
|
|
|
DeliveryReceiptRequest drr = (DeliveryReceiptRequest)p.getExtension(
|
|
DeliveryReceiptRequest.ELEMENT, DeliveryReceipt.NAMESPACE);
|
|
assertNotNull(drr);
|
|
|
|
assertTrue(DeliveryReceiptManager.hasDeliveryReceiptRequest(p));
|
|
|
|
Message m = new Message("romeo@montague.com", Message.Type.normal);
|
|
assertFalse(DeliveryReceiptManager.hasDeliveryReceiptRequest(m));
|
|
DeliveryReceiptManager.addDeliveryReceiptRequest(m);
|
|
assertTrue(DeliveryReceiptManager.hasDeliveryReceiptRequest(m));
|
|
}
|
|
|
|
@Test
|
|
public void receiptManagerListenerTest() throws Exception {
|
|
DummyConnection c = new DummyConnection();
|
|
ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(c);
|
|
DeliveryReceiptManager drm = DeliveryReceiptManager.getInstanceFor(c);
|
|
|
|
TestReceiptReceivedListener rrl = new TestReceiptReceivedListener();
|
|
drm.addReceiptReceivedListener(rrl);
|
|
|
|
Message m = new Message("romeo@montague.com", Message.Type.normal);
|
|
m.setFrom("julia@capulet.com");
|
|
m.setPacketID("reply-id");
|
|
m.addExtension(new DeliveryReceipt("original-test-id"));
|
|
drm.processPacket(m);
|
|
|
|
// ensure the listener got called
|
|
assertEquals("original-test-id", rrl.receiptId);
|
|
}
|
|
|
|
private static class TestReceiptReceivedListener implements ReceiptReceivedListener {
|
|
public String receiptId = null;
|
|
@Override
|
|
public void onReceiptReceived(String fromJid, String toJid, String receiptId) {
|
|
assertEquals("julia@capulet.com", fromJid);
|
|
assertEquals("romeo@montague.com", toJid);
|
|
assertEquals("original-test-id", receiptId);
|
|
this.receiptId = receiptId;
|
|
}
|
|
}
|
|
|
|
@Test
|
|
public void receiptManagerAutoReplyTest() throws Exception {
|
|
DummyConnection c = new DummyConnection();
|
|
ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(c);
|
|
DeliveryReceiptManager drm = DeliveryReceiptManager.getInstanceFor(c);
|
|
|
|
drm.enableAutoReceipts();
|
|
assertTrue(drm.getAutoReceiptsEnabled());
|
|
|
|
// test auto-receipts
|
|
Message m = new Message("julia@capulet.com", Message.Type.normal);
|
|
m.setFrom("romeo@montague.com");
|
|
m.setPacketID("test-receipt-request");
|
|
DeliveryReceiptManager.addDeliveryReceiptRequest(m);
|
|
|
|
// the DRM will send a reply-packet
|
|
assertEquals(0, c.getNumberOfSentPackets());
|
|
drm.processPacket(m);
|
|
assertEquals(1, c.getNumberOfSentPackets());
|
|
|
|
Packet reply = c.getSentPacket();
|
|
DeliveryReceipt r = (DeliveryReceipt)reply.getExtension("received", "urn:xmpp:receipts");
|
|
assertEquals("romeo@montague.com", reply.getTo());
|
|
assertEquals("test-receipt-request", r.getId());
|
|
}
|
|
|
|
private XmlPullParser getParser(String control, String startTag)
|
|
throws XmlPullParserException, IOException {
|
|
XmlPullParser parser = new MXParser();
|
|
parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
|
|
parser.setInput(new StringReader(control));
|
|
while (true) {
|
|
if (parser.next() == XmlPullParser.START_TAG
|
|
&& parser.getName().equals(startTag)) {
|
|
break;
|
|
}
|
|
}
|
|
return parser;
|
|
}
|
|
}
|