Skip to content

If no 'notify' attribute on <item/> send notifications #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martin-hewitt merged 1 commit into from
Jan 23, 2014
Merged

If no 'notify' attribute on <item/> send notifications #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/ItemDelete.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ private void sendNotifications() throws NodeStoreException {
String notify = request.getElement().element("pubsub")
.element("retract").attributeValue("notify");

if (notify == null || (!notify.equals("true") && !notify.equals("1"))) {
if ((notify != null) && (notify.equals("false") || notify.equals("0"))) {
return;
}
ResultSet<NodeSubscription> subscriptions = channelManager
Expand Down
1 change: 0 additions & 1 deletion ...in/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/Publish.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ private void sendNotifications() throws NodeStoreException,
msg.getElement().addAttribute("remote-server-discover", "false");
msg.setType(Message.Type.headline);
msg.setFrom(request.getTo());
msg.getElement().addAttribute("remote-server-discover", "false");
Element event = msg.addChildElement("event",
JabberPubsub.NS_PUBSUB_EVENT);
Element items = event.addElement("items");
Expand Down
56 changes: 49 additions & 7 deletions .../org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/ItemDeleteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,8 @@ public void testProvidingInvalidStanzaReturnsError() throws Exception {
Mockito.when(channelManagerMock.nodeExists(node)).thenReturn(true);
itemDelete.setChannelManager(channelManagerMock);

request = toIq(readStanzaAsString(
"/iq/pubsub/item/delete/request.stanza").replaceFirst(
"<item id='item-id' notify='true' />", ""));
IQ request = toIq(readStanzaAsString("/iq/pubsub/item/delete/request.stanza"));
request.getChildElement().element("retract").element("item").detach();
itemDelete.process(element, jid, request, null);

Packet response = queue.poll(100, TimeUnit.MILLISECONDS);
Expand All @@ -148,9 +147,9 @@ public void testNotProvidingItemIdReturnsError() throws Exception {
Mockito.when(channelManagerMock.nodeExists(node)).thenReturn(true);
itemDelete.setChannelManager(channelManagerMock);

request = toIq(readStanzaAsString(
"/iq/pubsub/item/delete/request.stanza").replaceFirst(
"id='item-id'", ""));
IQ request = toIq(readStanzaAsString("/iq/pubsub/item/delete/request.stanza"));
request.getChildElement().element("retract").element("item")
.attribute("id").detach();
itemDelete.process(element, jid, request, null);

Packet response = queue.poll(100, TimeUnit.MILLISECONDS);
Expand Down Expand Up @@ -348,7 +347,7 @@ public void testRequestingNotificationsSendsRetractionNotifications()
itemDelete.process(element, jid, request, null);

Mockito.verify(channelManagerMock).deleteNodeItemById(node, "item-id");
IQ response = (IQ) queue.poll(100, TimeUnit.MILLISECONDS);
IQ response = (IQ) queue.poll();

Assert.assertEquals(IQ.Type.result.toString(), response.getElement()
.attribute("type").getValue());
Expand All @@ -361,4 +360,47 @@ public void testRequestingNotificationsSendsRetractionNotifications()
notification.getElement().element("event").element("items")
.element("retract").attributeValue("id"));
}

@Test
public void testNoNotifyAttributeStillSendsNotifications() throws Exception {
NodeAffiliation affiliation = new NodeAffiliationImpl(node, jid,
Affiliations.member, new Date());

NodeItem nodeItem = new NodeItemImpl(node, "item-id", new Date(),
payload.replaceAll("romeo@shakespeare.lit",
"juliet@shakespeare.lit"));

IQ request = toIq(readStanzaAsString("/iq/pubsub/item/delete/request.stanza"));
request.getChildElement().element("retract").element("item")
.attribute("notify").detach();

ArrayList<NodeSubscription> subscriptions = new ArrayList<NodeSubscription>();
NodeSubscriptionImpl subscription1 = new NodeSubscriptionImpl(node,
new JID("romeo@shakespeare.lit"), Subscriptions.pending);
NodeSubscriptionImpl subscription2 = new NodeSubscriptionImpl(node,
new JID("juliet@shakespeare.lit"), Subscriptions.subscribed);
subscriptions.add(subscription1);
subscriptions.add(subscription2);

Mockito.when(channelManagerMock.isLocalNode(node)).thenReturn(true);
Mockito.when(channelManagerMock.nodeExists(node)).thenReturn(true);
Mockito.when(channelManagerMock.getNodeItem(node, "item-id"))
.thenReturn(nodeItem);
Mockito.when(
channelManagerMock.getUserAffiliation(Mockito.anyString(),
Mockito.any(JID.class))).thenReturn(affiliation);

Mockito.doReturn(new ResultSetImpl<NodeSubscription>(subscriptions))
.when(channelManagerMock).getNodeSubscriptionListeners(node);

itemDelete.setChannelManager(channelManagerMock);

itemDelete.process(element, jid, request, null);

Mockito.verify(channelManagerMock).deleteNodeItemById(node, "item-id");

// Check that one notification is sent (on subscriber + 2 admins)
Assert.assertEquals(4, queue.size());

}
}