1 files changed, 55 insertions, 0 deletions
diff --git a/juick-common/src/test/java/com/juick/MessageTest.java b/juick-common/src/test/java/com/juick/MessageTest.java
index 45c5730c2..d32058762 100644
--- a/juick-common/src/test/java/com/juick/MessageTest.java
+++ b/juick-common/src/test/java/com/juick/MessageTest.java
@@ -17,21 +17,42 @@
 
 package com.juick;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.juick.util.DateFormattersHolder;
 import com.juick.util.MessageUtils;
+import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.json.JSONObject;
 import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
 import rocks.xmpp.addr.Jid;
 import rocks.xmpp.core.session.Extension;
 import rocks.xmpp.core.session.XmppSession;
 import rocks.xmpp.core.session.XmppSessionConfiguration;
 
+import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.StringReader;
+import java.io.StringWriter;
+import java.text.ParseException;
+import java.time.Instant;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Created by aalexeev on 12/7/16.
@@ -189,4 +210,38 @@ public class MessageTest {
         Message juickMessage = xmppMessage.getExtension(Message.class);
         assertThat(juickMessage.getTags().get(0).getName(), equalTo("yo"));
     }
+    @Test
+    public void messageParserSerializer() throws ParseException, ParserConfigurationException,
+            IOException, SAXException, JAXBException {
+        Message msg = new Message();
+        msg.setTags(MessageUtils.parseTags("test test" + (char) 0xA0 + "2 test3"));
+        assertEquals("First tag must be", "test", msg.getTags().get(0).getName());
+        assertEquals("Third tag must be", "test3", msg.getTags().get(2).getName());
+        assertEquals("Count of tags must be", 3, msg.getTags().size());
+        Instant currentDate = Instant.now();
+        msg.setTimestamp(currentDate);
+        ObjectMapper serializer = new ObjectMapper();
+        serializer.registerModule(new Jdk8Module());
+        serializer.registerModule(new JavaTimeModule());
+        String jsonMessage = serializer.writeValueAsString(msg);
+        JSONObject jsonObject = new JSONObject(jsonMessage);
+        assertEquals("date should be in timestamp field", DateFormattersHolder.getMessageFormatterInstance().format(currentDate),
+                jsonObject.getString("timestamp"));
+
+
+        JAXBContext context = JAXBContext
+                .newInstance(Message.class);
+        Marshaller m = context.createMarshaller();
+
+        StringWriter sw = new StringWriter();
+        m.marshal(msg, sw);
+
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        Document doc = db.parse(new ByteArrayInputStream(sw.toString().getBytes(CharEncoding.UTF_8)));
+        Node juickNode = doc.getElementsByTagName("juick").item(0);
+        NamedNodeMap attrs = juickNode.getAttributes();
+        assertEquals("date should be in ts field", DateFormattersHolder.getMessageFormatterInstance().format(currentDate),
+                attrs.getNamedItem("ts").getNodeValue());
+    }
 }