Some more rsm stuff working. Not there yet though

Author: ashward

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

@@ -142,11 +142,21 @@ private void addRecentItems() throws NodeStoreException {
 			try {
 				entry = xmlReader.read(new StringReader(item.getPayload()))
 						.getRootElement();
+				
+				Element entryIdEl = entry.element("id");
+				
+				String itemId = item.getId();
+				
+				if(entryIdEl != null) {
+					itemId = entryIdEl.getTextTrim();
+				}
+				
 				itemElement = itemsElement.addElement("item");
-				itemElement.addAttribute("id", item.getId());
+				itemElement.addAttribute("id", itemId);
+				
 				if (null == firstItemId)
-					firstItemId = item.getId();
-				lastItemId = item.getId();
+					firstItemId = itemId;
+				lastItemId = itemId;
 				itemElement.add(entry);
 			} catch (DocumentException e) {
 				logger.error("Error parsing a node entry, ignoring. "

src/test/java/org/buddycloud/channelserver/db/jdbc/JDBCNodeStoreTest.java

@@ -1565,25 +1565,25 @@ public void testGetRecentItemsCanBePaged() throws Exception {
 		store.addUserSubscription(new NodeSubscriptionImpl(
 				TEST_SERVER1_NODE2_ID, TEST_SERVER1_USER1_JID,
 				Subscriptions.subscribed));
+		
+		long now = System.currentTimeMillis();
 
 		NodeItem nodeItem1 = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "123",
-				new Date(System.currentTimeMillis() - 400), "payload");
+				new Date(now - 400), "<entry><id>123</id></entry>");
 		store.addNodeItem(nodeItem1);
 
 		NodeItem nodeItem2 = new NodeItemImpl(TEST_SERVER1_NODE2_ID, "123",
-				new Date(System.currentTimeMillis() - 400), "payload2");
+				new Date(now - 400), "<entry><id>123</id></entry>");
 		store.addNodeItem(nodeItem2);
 
 		NodeItem nodeItem3 = new NodeItemImpl(TEST_SERVER1_NODE2_ID, "124",
-				new Date(System.currentTimeMillis() - 300), "payload3");
+				new Date(now - 300), "<entry><id>124</id></entry>");
 		store.addNodeItem(nodeItem3);
 
 		NodeItem nodeItem4 = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "124",
-				new Date(System.currentTimeMillis() - 200), "payload3");
+				new Date(now - 200), "<entry><id>124</id></entry>");
 		store.addNodeItem(nodeItem4);
 
-		Thread.sleep(20);
-
 		CloseableIterator<NodeItem> items = store.getRecentItems(
 				TEST_SERVER1_USER1_JID, since, -1, 2, new GlobalItemIDImpl(TEST_SERVER1_CHANNELS_JID, TEST_SERVER1_NODE1_ID, "124"), null);
 

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

@@ -56,9 +56,6 @@ public class RecentItemsGetTest extends IQTestHandler {
 	private String TEST_NODE_1 = "node1";
 	private String TEST_NODE_2 = "node2";
 
-	private JID TEST_JID_1 = new JID("user1@server1");
-	private JID TEST_JID_2 = new JID("user2@server1");
-
 	@Before
 	public void setUp() throws Exception {
 
@@ -316,13 +313,12 @@ public void testCanControlGatheredEntriesUsingRsm() throws Exception {
 		Assert.assertEquals("node1:2", rsmResult.element("last").getText());
 	}
 
+	@SuppressWarnings("serial")
 	@Test
 	public void testPagingAfterItem() throws Exception {
 		Element rsm = new BaseElement(new QName("set", new Namespace("", "http://jabber.org/protocol/rsm")));
 
 		GlobalItemID itemID = new GlobalItemIDImpl(new JID("capulet.lit"), "/user/juliet@capulet.lit/posts", "item1");
-		GlobalItemID itemID2 = new GlobalItemIDImpl(new JID("montague.lit"), "/user/romeo@capulet.lit/posts", "item1");
-		GlobalItemID itemID3 = new GlobalItemIDImpl(new JID("capulet.lit"), "/user/juliet@capulet.lit/posts", "item2");
 
 		rsm.addElement("after").setText(itemID.toString());
 		rsm.addElement("max").setText("5");
@@ -337,20 +333,20 @@ public void testPagingAfterItem() throws Exception {
 				new NodeAffiliationImpl(node, jid, Affiliations.member, new Date()));
 
 		ArrayList<NodeItem> results = new ArrayList<NodeItem>() {{
-			add(new NodeItemImpl(TEST_NODE_1, "1", new Date(), "payload1"));
-			add(new NodeItemImpl(TEST_NODE_2, "1", new Date(), "payload2"));
+			add(new NodeItemImpl(TEST_NODE_1, "1", new Date(System.currentTimeMillis()), "<entry><id>entry1</id></entry>"));
+			add(new NodeItemImpl(TEST_NODE_2, "1", new Date(System.currentTimeMillis() - 100), "<entry><id>entry2</id></entry>"));
 		}};
 
 		Mockito.when(
 				channelManager.getRecentItems(Mockito.any(JID.class),
 						Mockito.any(Date.class), Mockito.anyInt(),
 						Mockito.anyInt(), Mockito.any(GlobalItemID.class),
 						Mockito.anyString())).thenReturn(
-				new ClosableIteratorImpl<NodeItem>(new ArrayList<NodeItem>().iterator()));
+				new ClosableIteratorImpl<NodeItem>(results.iterator()));
 		Mockito.when(
 				channelManager.getCountRecentItems(Mockito.any(JID.class),
 						Mockito.any(Date.class), Mockito.anyInt(),
-						Mockito.anyString())).thenReturn(0);
+						Mockito.anyString())).thenReturn(100);
 
 		recentItemsGet.process(element, jid, request, rsm);
 
@@ -361,9 +357,9 @@ public void testPagingAfterItem() throws Exception {
 		// Check the response has a valid rsm element
 		Element rsmOut = p.getElement().element("pubsub").element("set");
 
-		assertEquals("Unexpected count returned", rsmOut.element("count").getText(), "2");
-		assertEquals("Unexpected first returned", rsmOut.element("first").getText(), new GlobalItemIDImpl(new JID(""), nodeID, itemID));
-		assertEquals("Unexpected last returned", rsmOut.element("last").getText(), "2");
+		assertEquals("Unexpected count returned", "100", rsmOut.element("count").getText());
+		assertEquals("Unexpected first returned", "entry1", rsmOut.element("first").getText());
+		assertEquals("Unexpected last returned", "entry2", rsmOut.element("last").getText());
 	}
 
 	@Test