diff options
author | Alex Clayton <alex.clayton@isode.com> | 2014-11-13 15:15:41 (GMT) |
---|---|---|
committer | Alex Clayton <alex.clayton@isode.com> | 2014-11-26 09:39:53 (GMT) |
commit | b89bf2f3363bac56fcc5d02f5fb690c73eaaacdf (patch) | |
tree | 39893e33d2bb88f0eef3e04ae9533bb1d6139c17 /test/com/isode/stroke/parser/payloadparsers/MAMQueryParserTest.java | |
parent | 47cad5fd7883b8c7273ea11073643aa585b485c6 (diff) | |
download | stroke-b89bf2f3363bac56fcc5d02f5fb690c73eaaacdf.zip stroke-b89bf2f3363bac56fcc5d02f5fb690c73eaaacdf.tar.bz2 |
Bring Stroke inline with Swiften with respect to MAM
Some patches for MAM had gone into swiften without being ported to stroke. This patch should bring stroke
update to date with Swiften.
The swiften patches in question are
9b762e1cf26cfe12cf601d9ea95cf91b3f95c799 -- Add node attribute to MAMQuery
8096f80861667381b777af774cfd446d6fc8cda8 -- Brining XEP-0313 (MAM) implementation in line with version 3.0.
Test-information:
Ran the updated JUnit tests in Eclipse they all passed ok.
Ran make and make test in a stroke checkout. Everything build ok and the JUNit tests passed.
Change-Id: I95bf5d598808f48fe2d7af12c0f07d852d68c115
Diffstat (limited to 'test/com/isode/stroke/parser/payloadparsers/MAMQueryParserTest.java')
-rw-r--r-- | test/com/isode/stroke/parser/payloadparsers/MAMQueryParserTest.java | 59 |
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() { |