Merge branch 'master' of github.com:buddycloud/buddycloud-server-java into replies-from-time-past

Conflicts:
	src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/RepliesGetTest.java

Author: lloydwatkin

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

@@ -87,14 +87,15 @@ private boolean itemExists() throws NodeStoreException {
     }
 
     protected void addRsmElement() throws NodeStoreException {
-        if (null == firstItemId) {
-            return;
-        }
+
         Element rsm = pubsub.addElement(XMLConstants.SET_ELEM);
         rsm.addNamespace("", NS_RSM);
-        rsm.addElement("first").setText(firstItemId);
-        rsm.addElement("last").setText(lastItemId);
-        rsm.addElement("count").setText(String.valueOf(channelManager.getCountNodeItemReplies(node, parentId)));
+        if (null != firstItemId) {
+            rsm.addElement("first").setText(firstItemId);
+            rsm.addElement("last").setText(lastItemId);
+        }
+        rsm.addElement("count").setText(
+            String.valueOf(channelManager.getCountNodeItemReplies(node, parentId)));
     }
 
     private void addReplies() throws NodeStoreException {

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

@@ -241,7 +241,35 @@ public void testRsmElementIsAddedCorrectly() throws Exception {
         Assert.assertEquals("4", rsmResult.elementText("last"));
         Assert.assertEquals(String.valueOf(TOTAL_RESULTS), rsmResult.elementText("count"));
     }
-    
+
+    @Test
+    public void rsmStillAddedWhenThereAreNoResults() throws Exception {
+
+      Element rsm = request.getChildElement().addElement("set");
+      rsm.addNamespace("", RepliesGet.NS_RSM);
+      rsm.addElement("max").setText("4");
+      rsm.addElement("after").setText("1");
+
+      ArrayList<NodeItem> expectedResults = new ArrayList<NodeItem>();
+      Mockito.when(channelManager.getNodeItemReplies(Mockito.anyString(), Mockito.anyString(), Mockito.eq("1"), Mockito.eq(true), Mockito.eq(4))).thenReturn(
+              new ClosableIteratorImpl<NodeItem>(expectedResults.iterator()));
+      
+      Mockito.when(channelManager.getCountNodeItemReplies(Mockito.anyString(), Mockito.anyString())).thenReturn(0);
+
+      repliesGet.process(element, jid, request, null);
+      Packet response = queue.poll();
+
+      Element items = response.getElement().element("pubsub").element("items");
+
+      Assert.assertEquals("/user/channeluser@example.com/posts", items.attributeValue("node"));
+      Assert.assertEquals(0, items.elements("item").size());
+
+      Element rsmResult = response.getElement().element("pubsub").element("set");
+      Assert.assertNull(rsmResult.elementText("first"));
+      Assert.assertNull(rsmResult.elementText("last"));
+      Assert.assertEquals("0", rsmResult.elementText("count"));
+    }
+
     @Test
     public void providingBeforeValueInRsmElementInvokesPastItemLookup() throws Exception {
 
@@ -257,7 +285,7 @@ public void providingBeforeValueInRsmElementInvokesPastItemLookup() throws Excep
       expectedResults.add(new NodeItemImpl(TEST_NODE, "3", new Date(), "<entry>value3</entry>"));
       expectedResults.add(new NodeItemImpl(TEST_NODE, "4", new Date(), "<entry>value4</entry>"));
 
-      Mockito.when(channelManager.getNodeItemReplies(Mockito.anyString(), Mockito.anyString(), Mockito.eq("1"), Mockito.eq(false), Mockito.eq(4))).thenReturn(
+      Mockito.when(channelManager.getNodeItemReplies(Mockito.anyString(), Mockito.anyString(), Mockito.eq("2"), Mockito.eq(false), Mockito.eq(4))).thenReturn(
               new ClosableIteratorImpl<NodeItem>(expectedResults.iterator()));
 
       repliesGet.process(element, jid, request, null);
@@ -267,4 +295,5 @@ public void providingBeforeValueInRsmElementInvokesPastItemLookup() throws Excep
 
       Assert.assertEquals(4, items.elements("item").size());
     }
+    
 }