Changeset 92:f69b08281bec
- Timestamp:
- Feb 12, 2011, 12:08:30 AM (11 years ago)
- Branch:
- default
- Location:
- wokkel
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
wokkel/pubsub.py
r90 r92 1 1 # -*- test-case-name: wokkel.test.test_pubsub -*- 2 2 # 3 # Copyright (c) 2003-201 0Ralph Meijer3 # Copyright (c) 2003-2011 Ralph Meijer 4 4 # See LICENSE for details. 5 5 … … 534 534 535 535 verbs = [] 536 children= []536 verbElements = [] 537 537 for child in element.pubsub.elements(): 538 538 key = (self.stanzaType, child.uri, child.name) … … 543 543 544 544 verbs.append(verb) 545 children.append(child)545 verbElements.append(child) 546 546 547 547 if not verbs: … … 551 551 if 'optionsSet' in verbs and 'subscribe' in verbs: 552 552 self.verb = 'subscribe' 553 child = children[verbs.index('subscribe')]553 verbElement = verbElements[verbs.index('subscribe')] 554 554 else: 555 555 raise NotImplementedError() 556 556 else: 557 557 self.verb = verbs[0] 558 verbElement = verbElements[0] 558 559 559 560 for parameter in self._parameters[self.verb]: 560 getattr(self, '_parse_%s' % parameter)( child)561 getattr(self, '_parse_%s' % parameter)(verbElement) 561 562 562 563 … … 1182 1183 def _toResponse_subscribe(self, result, resource, request): 1183 1184 response = domish.Element((NS_PUBSUB, "pubsub")) 1184 subscription =response.addChild(result.toElement())1185 response.addChild(result.toElement()) 1185 1186 return response 1186 1187 -
wokkel/test/test_pubsub.py
r90 r92 1 # Copyright (c) 2003-201 0Ralph Meijer1 # Copyright (c) 2003-2011 Ralph Meijer 2 2 # See LICENSE for details. 3 3 … … 1057 1057 1058 1058 1059 def test_fromElementPublishItemsOptions(self): 1060 """ 1061 Test parsing a publish request with items and options. 1062 1063 Note that publishing options are not supported, but passing them 1064 shouldn't affect processing of the publish request itself. 1065 """ 1066 1067 xml = """ 1068 <iq type='set' to='pubsub.example.org' 1069 from='user@example.org'> 1070 <pubsub xmlns='http://jabber.org/protocol/pubsub'> 1071 <publish node='test'> 1072 <item id="item1"/> 1073 <item id="item2"/> 1074 </publish> 1075 <publish-options/> 1076 </pubsub> 1077 </iq> 1078 """ 1079 1080 request = pubsub.PubSubRequest.fromElement(parseXml(xml)) 1081 self.assertEqual(2, len(request.items)) 1082 self.assertEqual(u'item1', request.items[0]["id"]) 1083 self.assertEqual(u'item2', request.items[1]["id"]) 1084 1059 1085 def test_fromElementPublishNoNode(self): 1060 1086 """ … … 1546 1572 request = pubsub.PubSubRequest.fromElement(parseXml(xml)) 1547 1573 self.assertEqual({}, request.options.getValues()) 1574 self.assertEqual(u'mynode', request.nodeIdentifier) 1548 1575 1549 1576 … … 1568 1595 request = pubsub.PubSubRequest.fromElement(parseXml(xml)) 1569 1596 self.assertEqual({}, request.options.getValues()) 1597 self.assertEqual(u'mynode', request.nodeIdentifier) 1570 1598 1571 1599 … … 2286 2314 2287 2315 2288 def test_on_unsubscribe (self):2316 def test_on_unsubscribeSubscriptionIdentifier(self): 2289 2317 """ 2290 2318 A successful unsubscription with subid should return an empty response.
Note: See TracChangeset
for help on using the changeset viewer.