diff options
| -rw-r--r-- | sleekxmpp/plugins/xep_0060/pubsub.py | 18 | ||||
| -rw-r--r-- | tests/test_stream_xep_0060.py | 81 |
2 files changed, 95 insertions, 4 deletions
diff --git a/sleekxmpp/plugins/xep_0060/pubsub.py b/sleekxmpp/plugins/xep_0060/pubsub.py index f9999f73..9ce643d9 100644 --- a/sleekxmpp/plugins/xep_0060/pubsub.py +++ b/sleekxmpp/plugins/xep_0060/pubsub.py @@ -169,11 +169,21 @@ class xep_0060(base_plugin): iq['pubsub']['unsubscribe']['subid'] = subid return iq.send(block=block, callback=callback, timeout=timeout) - def get_subscription_options(self): - pass + def get_subscription_options(self, jid, node, user_jid, ifrom=None, + block=True, callback=None, timeout=None): + iq = self.xmpp.Iq(sto=jid, sfrom=ifrom, stype='get') + iq['pubsub']['options']['node'] = node + iq['pubsub']['options']['jid'] = user_jid + return iq.send(block=block, callback=callback, timeout=timeout) - def set_subscription_options(self): - pass + def set_subscription_options(self, jid, node, user_jid, options, + ifrom=None, block=True, callback=None, + timeout=None): + iq = self.xmpp.Iq(sto=jid, sfrom=ifrom, stype='get') + iq['pubsub']['options']['node'] = node + iq['pubsub']['options']['jid'] = user_jid + iq['pubsub']['options'].append(options) + return iq.send(block=block, callback=callback, timeout=timeout) def get_node_config(self, jid, node=None, ifrom=None, block=None, callback=None, timeout=None): diff --git a/tests/test_stream_xep_0060.py b/tests/test_stream_xep_0060.py index 1d912ca5..a740884e 100644 --- a/tests/test_stream_xep_0060.py +++ b/tests/test_stream_xep_0060.py @@ -124,5 +124,86 @@ class TestStreamPubsub(SleekTest): t.join() + def testSubscribe(self): + """Test subscribing to a node""" + + def run_test(jid, bare, ifrom, send, recv): + t = threading.Thread(name='subscribe', + target=self.xmpp['xep_0060'].subscribe, + args=('pubsub.example.com', 'some_node'), + kwargs={'subscribee': jid, + 'bare': bare, + 'ifrom': ifrom}) + t.start() + self.send(send) + self.recv(recv) + t.join() + + # Case 1: No subscribee, default 'from' JID, bare JID + run_test(None, True, None, + """ + <iq type="set" id="1" to="pubsub.example.com"> + <pubsub xmlns="http://jabber.org/protocol/pubsub"> + <subscribe node="some_node" jid="tester@localhost" /> + </pubsub> + </iq> + """, + """ + <iq type="result" id="1" + to="tester@localhost" from="pubsub.example.com" /> + """) + + # Case 2: No subscribee, given 'from' JID, bare JID + run_test(None, True, 'foo@comp.example.com/bar', + """ + <iq type="set" id="2" + to="pubsub.example.com" from="foo@comp.example.com/bar"> + <pubsub xmlns="http://jabber.org/protocol/pubsub"> + <subscribe node="some_node" jid="foo@comp.example.com" /> + </pubsub> + </iq> + """, + """ + <iq type="result" id="2" + to="foo@comp.example.com/bar" from="pubsub.example.com" /> + """) + + # Case 3: No subscribee, given 'from' JID, full JID + run_test(None, False, 'foo@comp.example.com/bar', + """ + <iq type="set" id="3" + to="pubsub.example.com" from="foo@comp.example.com/bar"> + <pubsub xmlns="http://jabber.org/protocol/pubsub"> + <subscribe node="some_node" jid="foo@comp.example.com/bar" /> + </pubsub> + </iq> + """, + """ + <iq type="result" id="3" + to="foo@comp.example.com/bar" from="pubsub.example.com" /> + """) + + # Case 4: Subscribee + run_test('user@example.com/foo', True, 'foo@comp.example.com/bar', + """ + <iq type="set" id="4" + to="pubsub.example.com" from="foo@comp.example.com/bar"> + <pubsub xmlns="http://jabber.org/protocol/pubsub"> + <subscribe node="some_node" jid="user@example.com/foo" /> + </pubsub> + </iq> + """, + """ + <iq type="result" id="4" + to="foo@comp.example.com/bar" from="pubsub.example.com" /> + """) + + def testSubscribeWithOptions(self): + pass + + def testUnsubscribe(self): + pass + + suite = unittest.TestLoader().loadTestsFromTestCase(TestStreamPubsub) |