erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test (RSM): fix according to modification in sat.tmp.wokkel:

Browse source 
- parse has been renamed to fromElement in rev 1771 (b77dc676a4df)
    - use RSMResponse directly instead of ext_data in rev 1773 (6e867caf4621)
This commit is contained in:
souliane 2016-01-19 12:18:29 +01:00
commit a4fc134108
1 changed files with 23 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/tmp/wokkel/test/test_rsm.py
View file

@ -50,7 +50,7 @@ class RSMRequestTest(unittest.TestCase):
</set>
</query>
"""
request = RSMRequest.parse(parseXml(xml))
request = RSMRequest.fromElement(parseXml(xml))
self.assertEqual(1, request.max)
self.assertIdentical(None, request.index)
self.assertIdentical(None, request.after)
@ -69,7 +69,7 @@ class RSMRequestTest(unittest.TestCase):
</set>
</query>
"""
request = RSMRequest.parse(parseXml(xml))
request = RSMRequest.fromElement(parseXml(xml))
self.assertEqual(3, request.max)
self.assertIdentical(None, request.index)
self.assertEqual(u'peterpan@neverland.lit', request.after)
@ -88,7 +88,7 @@ class RSMRequestTest(unittest.TestCase):
</set>
</query>
"""
request = RSMRequest.parse(parseXml(xml))
request = RSMRequest.fromElement(parseXml(xml))
self.assertEqual(5, request.max)
self.assertIdentical(None, request.index)
self.assertIdentical(None, request.after)
@ -107,7 +107,7 @@ class RSMRequestTest(unittest.TestCase):
</set>
</query>
"""
request = RSMRequest.parse(parseXml(xml))
request = RSMRequest.fromElement(parseXml(xml))
self.assertEqual(7, request.max)
self.assertIdentical(None, request.index)
self.assertIdentical(None, request.after)
@ -126,7 +126,7 @@ class RSMRequestTest(unittest.TestCase):
</set>
</query>
"""
request = RSMRequest.parse(parseXml(xml))
request = RSMRequest.fromElement(parseXml(xml))
self.assertEqual(9, request.max)
self.assertEqual(371, request.index)
self.assertIdentical(None, request.after)
@ -144,7 +144,7 @@ class RSMRequestTest(unittest.TestCase):
</set>
</query>
"""
request = RSMRequest.parse(parseXml(xml))
request = RSMRequest.fromElement(parseXml(xml))
self.assertEqual(0, request.max)
self.assertIdentical(None, request.index)
self.assertIdentical(None, request.after)
@ -252,7 +252,7 @@ class RSMResponseTest(unittest.TestCase):
</set>
</query>
"""
response = RSMResponse.parse(parseXml(xml))
response = RSMResponse.fromElement(parseXml(xml))
self.assertEqual(800, response.count)
self.assertEqual(20, response.index)
self.assertEqual(u'stpeter@jabber.org', response.first)
@ -269,7 +269,7 @@ class RSMResponseTest(unittest.TestCase):
</set>
</query>
"""
response = RSMResponse.parse(parseXml(xml))
response = RSMResponse.fromElement(parseXml(xml))
self.assertEqual(800, response.count)
self.assertIdentical(None, response.first)
self.assertIdentical(None, response.last)
@ -320,16 +320,15 @@ class PubSubClientTest(unittest.TestCase):
"""
Test sending items request to get the first page.
"""
def cb(items):
def cb(response):
items, rsm = response
self.assertEquals(2, len(items))
self.assertEquals([item1, item2], items)
rsm = self.protocol.getRSMResponse(ext_data['id'])
self.assertDictEqual(rsm, {'count': '800', 'index': '0',
'first': 'item1', 'last': 'item2'})
ext_data = {'id': unicode(uuid.uuid4()), 'rsm': RSMRequest(2)}
d = self.protocol.items(JID('pubsub.example.org'), 'test',
ext_data=ext_data)
rsm_request=RSMRequest(2))
d.addCallback(cb)
iq = self.stub.output[-1]
@ -366,17 +365,15 @@ class PubSubClientTest(unittest.TestCase):
"""
Test sending items request to get the next page.
"""
def cb(items):
def cb(response):
items, rsm = response
self.assertEquals(2, len(items))
self.assertEquals([item1, item2], items)
rsm = self.protocol.getRSMResponse(ext_data['id'])
self.assertDictEqual(rsm, {'count': '800', 'index': '2',
'first': 'item3', 'last': 'item4'})
ext_data = {'id': unicode(uuid.uuid4()),
'rsm': RSMRequest(2, after=u'item2')}
d = self.protocol.items(JID('pubsub.example.org'), 'test',
ext_data=ext_data)
rsm_request=RSMRequest(2, after=u'item2'))
d.addCallback(cb)
iq = self.stub.output[-1]
@ -414,17 +411,15 @@ class PubSubClientTest(unittest.TestCase):
"""
Test sending items request to get the previous page.
"""
def cb(items):
def cb(response):
items, rsm = response
self.assertEquals(2, len(items))
self.assertEquals([item1, item2], items)
rsm = self.protocol.getRSMResponse(ext_data['id'])
self.assertDictEqual(rsm, {'count': '800', 'index': '0',
'first': 'item1', 'last': 'item2'})
ext_data = {'id': unicode(uuid.uuid4()),
'rsm': RSMRequest(2, before=u'item3')}
d = self.protocol.items(JID('pubsub.example.org'), 'test',
ext_data=ext_data)
rsm_request=RSMRequest(2, before=u'item3'))
d.addCallback(cb)
iq = self.stub.output[-1]
@ -462,16 +457,15 @@ class PubSubClientTest(unittest.TestCase):
"""
Test sending items request to get a page out of order.
"""
def cb(items):
def cb(response):
items, rsm = response
self.assertEquals(3, len(items))
self.assertEquals([item1, item2, item3], items)
rsm = self.protocol.getRSMResponse(ext_data['id'])
self.assertDictEqual(rsm, {'count': '800', 'index': '3',
'first': 'item4', 'last': 'item6'})
ext_data = {'id': unicode(uuid.uuid4()), 'rsm': RSMRequest(3, 3)}
d = self.protocol.items(JID('pubsub.example.org'), 'test',
ext_data=ext_data)
rsm_response=RSMRequest(3, 3))
d.addCallback(cb)
iq = self.stub.output[-1]
@ -511,14 +505,13 @@ class PubSubClientTest(unittest.TestCase):
"""
Test sending items request to count them.
"""
def cb(items):
def cb(response):
items, rsm = response
self.assertEquals(0, len(items))
rsm = self.protocol.getRSMResponse(ext_data['id'])
self.assertDictEqual(rsm, {'count': '800'})
ext_data = {'id': unicode(uuid.uuid4()), 'rsm': RSMRequest(0)}
d = self.protocol.items(JID('pubsub.example.org'), 'test',
ext_data=ext_data)
rsm_request=RSMRequest(0))
d.addCallback(cb)
iq = self.stub.output[-1]