1 files changed, 58 insertions, 1 deletions
diff --git a/test/com/isode/stroke/parser/payloadparsers/MAMQueryParserTest.java b/test/com/isode/stroke/parser/payloadparsers/MAMQueryParserTest.java
index 1cd09d1..454843e 100644
--- a/test/com/isode/stroke/parser/payloadparsers/MAMQueryParserTest.java
+++ b/test/com/isode/stroke/parser/payloadparsers/MAMQueryParserTest.java
@@ -25,7 +25,7 @@ public class MAMQueryParserTest {
         DummyEventLoop eventLoop = new DummyEventLoop();
         PayloadsParserTester parser = new PayloadsParserTester(eventLoop);
         assertTrue(parser.parse(
-            "<query queryid=\"id0\" xmlns=\"urn:xmpp:mam:0\">"
+            "<query queryid=\"id0\" xmlns=\"urn:xmpp:mam:0\" node=\"node1\">"
           +     "<x type=\"form\" xmlns=\"jabber:x:data\">"
           +        "<field type=\"text-single\" var=\"FORM_TYPE\">"
           +             "<value>urn:xmpp:mam:0</value>"
@@ -43,6 +43,8 @@ public class MAMQueryParserTest {
         assertTrue(payload != null);
         assertTrue(payload.getQueryID() != null);
         assertEquals("id0", payload.getQueryID());
+        assertTrue(payload.getNode() != null);
+        assertEquals("node1",payload.getNode());
 
         assertTrue(payload.getForm() != null);
         
@@ -58,6 +60,61 @@ public class MAMQueryParserTest {
         assertTrue(resultSet.getMaxItems() != null);
         assertEquals(resultSet.getMaxItems(), new Long(10));
     }
+    
+    @Test
+    public void testParse_XEP0313_Example3() {
+        DummyEventLoop eventLoop = new DummyEventLoop();
+        PayloadsParserTester parser = new PayloadsParserTester(eventLoop);
+        assertTrue(parser.parse(
+                "<query xmlns='urn:xmpp:mam:0'>"
+                    +"<x xmlns='jabber:x:data'>"
+                        +"<field var='FORM_TYPE'>"
+                           +"<value>urn:xmpp:mam:0</value>"
+                       +"</field>"
+                       +"<field var='with'>"
+                         +"<value>juliet@capulet.lit</value>"
+                       +"</field>"
+                   +"</x>"
+               +"</query>"));
+        
+        MAMQuery payload = (MAMQuery) parser.getPayload();
+        assertTrue(payload != null);
+        assertTrue(payload.getForm() != null);
+        assertTrue(payload.getForm().getField("FORM_TYPE") != null);
+        assertTrue(payload.getForm().getField("with") != null);
+        assertEquals("urn:xmpp:mam:0",payload.getForm().getField("FORM_TYPE").getTextSingleValue());
+        assertEquals("juliet@capulet.lit",payload.getForm().getField("with").getTextSingleValue()); 
+    }
+    
+    @Test
+    public void testParse_XEP0313_Example4() {
+        DummyEventLoop eventLoop = new DummyEventLoop();
+        PayloadsParserTester parser = new PayloadsParserTester(eventLoop);
+        assertTrue(parser.parse(
+            "<query xmlns='urn:xmpp:mam:0'>"
+                +"<x xmlns='jabber:x:data'>"
+                    +"<field var='FORM_TYPE'>"
+                        +"<value>urn:xmpp:mam:0</value>"
+                    +"</field>"
+                    +"<field var='start'>"
+                        +"<value>2010-06-07T00:00:00Z</value>"
+                    +"</field>"
+                    +"<field var='end'>"
+                        +"<value>2010-07-07T13:23:54Z</value>"
+                    +"</field>"
+                +"</x>"
+            +"</query>"));
+        
+        MAMQuery payload = (MAMQuery) parser.getPayload();
+        assertTrue(payload != null);
+        assertTrue(payload.getForm() != null);
+        assertTrue(payload.getForm().getField("FORM_TYPE") != null);
+        assertTrue(payload.getForm().getField("start") != null);
+        assertTrue(payload.getForm().getField("end") != null);
+        assertEquals("urn:xmpp:mam:0",payload.getForm().getField("FORM_TYPE").getTextSingleValue());
+        assertEquals("2010-06-07T00:00:00Z",payload.getForm().getField("start").getTextSingleValue());
+        assertEquals("2010-07-07T13:23:54Z",payload.getForm().getField("end").getTextSingleValue());
+    }
 
     @Test
     public void testParseEmpty() {