Skip to content

Commit 5a110b6

Browse files
author
Lloyd Watkin
committed
Retrieve single item working
1 parent 4409e70 commit 5a110b6

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

  • src
    • main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/items
    • test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/items

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/items/UserItemsGet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)
111111
makeRemoteRequest();
112112
return;
113113
}
114-
114+
115115
try {
116116
if (false == nodeExists()) {
117117
setErrorCondition(PacketError.Type.cancel,
@@ -128,6 +128,7 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)
128128
outQueue.put(reply);
129129
return;
130130
}
131+
xmlReader = new SAXReader();
131132
if (null == element.element("item")) {
132133
getItems();
133134
} else {
@@ -222,7 +223,6 @@ private void getItems() throws Exception {
222223
Element items = pubsub.addElement("items");
223224
items.addAttribute("node", node);
224225

225-
xmlReader = new SAXReader();
226226
entry = null;
227227
int totalEntriesCount = 0;
228228

src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/items/UserItemsGetTest.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -691,25 +691,28 @@ public void testGetItemNotFoundIfSingleItemNotFound() throws Exception {
691691

692692
@Test
693693
public void testCanRetrieveSingleItem() throws Exception {
694-
694+
695695
String id = "12345";
696696
String payload = "<entry>entry text</entry>";
697697

698698
element.addAttribute("node", node);
699699
element.addElement("item").addAttribute("id", id);
700700

701-
NodeItem nodeItem = new NodeItemImpl(node, id, new Date(), payload);
702-
Mockito.when(channelManager.getNodeItem(eq(node), Mockito.anyString()))
703-
.thenReturn(nodeItem);
701+
NodeItem item = new NodeItemImpl(node, id, new Date(), payload);
702+
703+
Mockito.when(channelManager.isLocalNode(Mockito.anyString())).thenReturn(true);
704+
Mockito.when(channelManager.nodeExists(Mockito.anyString())).thenReturn(true);
705+
Mockito.when(channelManager.getNodeItem(Mockito.anyString(), Mockito.anyString()))
706+
.thenReturn(item);
704707
Mockito.when(channelManager.getUserSubscription(node, jid)).thenReturn(
705708
new NodeSubscriptionImpl(node, jid, Subscriptions.subscribed));
706709
Mockito.when(channelManager.getUserAffiliation(node, jid)).thenReturn(
707710
new NodeAffiliationImpl(node, jid, Affiliations.member, new Date()));
708711

709712
itemsGet.process(element, jid, request, null);
710-
711-
Packet p = queue.poll();
713+
712714
Packet response = queue.poll();
715+
713716
Element element = response.getElement();
714717

715718
Assert.assertEquals(IQ.Type.result.toString(),

0 commit comments

Comments
 (0)