Add a test to ensure that "in reply to" ID is saved to database (as local ID type)

Author: Lloyd Watkin

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/Publish.java

@@ -104,7 +104,7 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)
 			saveNodeItem();
 			sendResponseStanza();
 			sendNotifications();
-			
+
 		} catch (NodeStoreException e) {
 			setErrorCondition(PacketError.Type.wait,
 					PacketError.Condition.internal_server_error);
@@ -127,9 +127,10 @@ private void extractItemDetails() throws InterruptedException {
 		if (null == inReplyToElement) {
 			return;
 		}
-		inReplyTo = inReplyToElement.attributeValue("ref");
+		inReplyTo = GlobalItemIDImpl.toLocalId(inReplyToElement
+				.attributeValue("ref"));
 	}
-	
+
 	public void setEntryValidator(ValidateEntry validator) {
 		this.validator = validator;
 	}
@@ -141,11 +142,12 @@ private ValidateEntry getEntryValidator() {
 		return this.validator;
 	}
 
-	private void sendInvalidEntryResponse()
-			throws InterruptedException {
-		LOGGER.info("Entry is not valid: '" + entryContent.getErrorMessage() + "'.");
+	private void sendInvalidEntryResponse() throws InterruptedException {
+		LOGGER.info("Entry is not valid: '" + entryContent.getErrorMessage()
+				+ "'.");
 		createExtendedErrorReply(PacketError.Type.modify,
-				PacketError.Condition.bad_request, entryContent.getErrorMessage());
+				PacketError.Condition.bad_request,
+				entryContent.getErrorMessage());
 		outQueue.put(response);
 	}
 
@@ -229,7 +231,8 @@ private boolean checkNode() throws InterruptedException, NodeStoreException {
 		if ((node == null) || (true == node.equals(""))) {
 			response.setType(Type.error);
 
-			Element badRequest = new DOMElement(PacketError.Condition.bad_request.toXMPP(),
+			Element badRequest = new DOMElement(
+					PacketError.Condition.bad_request.toXMPP(),
 					new org.dom4j.Namespace("", JabberPubsub.NS_XMPP_STANZAS));
 
 			Element nodeIdRequired = new DOMElement(NODE_ID_REQUIRED,
@@ -250,8 +253,7 @@ private boolean checkNode() throws InterruptedException, NodeStoreException {
 			isLocalNode = channelManager.isLocalNode(node);
 		} catch (IllegalArgumentException e) {
 			response.setType(Type.error);
-			PacketError pe = new PacketError(
-					PacketError.Condition.bad_request,
+			PacketError pe = new PacketError(PacketError.Condition.bad_request,
 					PacketError.Type.modify);
 			response.setError(pe);
 			LOGGER.error(e);

src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/PublishTest.java

@@ -24,6 +24,7 @@
 import org.dom4j.tree.BaseElement;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
@@ -89,9 +90,7 @@ public void setUp() throws Exception {
 
 		Mockito.when(validateEntry.isValid()).thenReturn(true);
 
-		Mockito.when(
-				validateEntry.getPayload()).thenReturn(
-				entry);
+		Mockito.when(validateEntry.getPayload()).thenReturn(entry);
 
 	}
 
@@ -391,4 +390,26 @@ public void sendsOutExpectedNotifications() throws Exception {
 		Assert.assertEquals(new JID("user2@server1"), notification.getTo());
 
 	}
+
+	@Test
+	public void inReplyToIdIsSavedToDatabase() throws Exception {
+		IQ request = readStanzaAsIq("/iq/pubsub/publish/reply.stanza");
+		Mockito.when(validateEntry.getPayload()).thenReturn(
+				request.getChildElement().element("publish").element("item")
+						.element("entry"));
+
+		publish.process(element, jid, request, null);
+
+		Assert.assertEquals(IQ.Type.result, ((IQ) queue.poll()).getType());
+
+		ArgumentCaptor<NodeItemImpl> argument = ArgumentCaptor
+				.forClass(NodeItemImpl.class);
+
+		Mockito.verify(channelManager, Mockito.times(1)).addNodeItem(
+				argument.capture());
+
+		Assert.assertEquals("fc362eb42085f017ed9ccd9c4004b095", argument
+				.getValue().getInReplyTo());
+		Assert.assertEquals(node, argument.getValue().getNodeId());
+	}
 }