Do not rely on element argument

Author: lloydwatkin

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

@@ -110,7 +110,7 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm) throws Exc
                 return;
             }
             xmlReader = new SAXReader();
-            if (element.element(XMLConstants.ITEM_ELEM) == null) {
+            if (null == items.element(XMLConstants.ITEM_ELEM)) {
                 getItems();
             } else {
                 if (!getItem()) {
@@ -135,8 +135,7 @@ protected boolean isValidStanza() {
     }
 
     private boolean getItem() throws Exception {
-        NodeItem nodeItem = channelManager.getNodeItem(node, element.element(XMLConstants.ITEM_ELEM).attributeValue(XMLConstants.ID_ATTR));
-
+        NodeItem nodeItem = channelManager.getNodeItem(node, items.element(XMLConstants.ITEM_ELEM).attributeValue(XMLConstants.ID_ATTR));
         if (nodeItem == null) {
             if (!Configuration.getInstance().isLocalNode(node)) {
                 makeRemoteRequest();
@@ -192,7 +191,7 @@ private void getItems() throws Exception {
             parentOnly = true;
         }
 
-        String maxItems = element.attributeValue(XMLConstants.MAX_ITEMS_ATTR);
+        String maxItems = items.attributeValue(XMLConstants.MAX_ITEMS_ATTR);
 
         if (maxItems != null) {
             maxItemsToReturn = Integer.parseInt(maxItems);

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

@@ -416,29 +416,34 @@ public void canRetrieveSingleItem() throws Exception {
         Mockito.when(channelManager.nodeExists(Mockito.anyString()))
                 .thenReturn(true);
 
-        NodeItem item = new NodeItemImpl(node, id, new Date(), payload);
+        NodeItem dbItem = new NodeItemImpl(node, id, new Date(), payload);
         Mockito.when(
-                channelManager.getNodeItem(Mockito.anyString(),
-                        Mockito.anyString())).thenReturn(item);
+                channelManager.getNodeItem(Mockito.eq(node),
+                        Mockito.eq(id))).thenReturn(dbItem);
 
+        IQ request = this.request.createCopy();
+        Element item = request.getChildElement().element("items").addElement("item");
+        item.addAttribute("id", id);
+        System.out.println(request.toXML());
         itemsGet.process(element, jid, request, null);
-        Packet response = queue.poll();
+        IQ response = (IQ) queue.poll();
 
-        Element element = response.getElement();
+        Element element = response.getChildElement();
+        Element items = element.element("items");
 
-        Assert.assertEquals(IQ.Type.result.toString(),
-                element.attributeValue("type"));
-        Assert.assertEquals(node, element.element("pubsub").element("items")
+        Assert.assertEquals(IQ.Type.result,
+               response.getType());
+        Assert.assertEquals(node, items
                 .attributeValue("node"));
 
-        Assert.assertEquals(1, element.element("pubsub").element("items")
+        Assert.assertEquals(1, items
                 .nodeCount());
-        Assert.assertEquals(node, element.element("pubsub").element("items")
+        Assert.assertEquals(node, items
                 .attributeValue("node"));
-        Assert.assertEquals(id, element.element("pubsub").element("items")
+        Assert.assertEquals(id, items
                 .element("item").attributeValue("id"));
         Assert.assertEquals("entry text",
-                element.element("pubsub").element("items").element("item")
+                items.element("item")
                         .elementText("entry"));
     }