Changeset 81:1334124db2fd for wokkel/test

Timestamp:

Jan 5, 2010, 2:55:40 PM (12 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Make PubSubRequest?.options be a form and use new form type checking

File:

• wokkel/test/test_pubsub.py (modified) (13 diffs)

wokkel/test/test_pubsub.py

@@ -1 @@
-# Copyright (c) 2003-2009 Ralph Meijer
+# Copyright (c) 2003-2010 Ralph Meijer
 # See LICENSE for details.
 
@@ -806 +806 @@
         self.assertEqual('test', request.nodeIdentifier)
         self.assertEqual(JID('user@example.org/Home'), request.subscriber)
-        self.assertEqual({'pubsub#deliver': '1'}, request.options)
+        self.assertEqual({'pubsub#deliver': '1'}, request.options.getValues())
 
 
@@ -826 +826 @@
 
         request = pubsub.PubSubRequest.fromElement(parseXml(xml))
-        self.assertEqual({}, request.options)
+        self.assertEqual('cancel', request.options.formType)
 
 
@@ -841 +841 @@
               <x xmlns='jabber:x:data' type='result'>
                 <field var='FORM_TYPE' type='hidden'>
-                  <value>http://jabber.org/protocol/pubsub#node_config</value>
+                  <value>http://jabber.org/protocol/pubsub#subscribe_options</value>
                 </field>
                 <field var='pubsub#deliver'><value>1</value></field>
@@ -854 +854 @@
                                 parseXml(xml))
         self.assertEqual('bad-request', err.condition)
+        self.assertEqual("Unexpected form type 'result'", err.text)
         self.assertEqual(None, err.appCondition)
 
@@ -1054 +1055 @@
         self.assertEqual('test', request.nodeIdentifier)
         self.assertEqual({'pubsub#deliver_payloads': '0',
-                          'pubsub#persist_items': '1'}, request.options)
+                          'pubsub#persist_items': '1'},
+                         request.options.getValues())
 
 
@@ -1074 +1076 @@
 
         request = pubsub.PubSubRequest.fromElement(parseXml(xml))
-        self.assertEqual({}, request.options)
+        self.assertEqual('cancel', request.options.formType)
 
 
@@ -1103 +1105 @@
                                 parseXml(xml))
         self.assertEqual('bad-request', err.condition)
+        self.assertEqual("Unexpected form type 'result'", err.text)
         self.assertEqual(None, err.appCondition)
 
@@ -1896 +1899 @@
                                   'pubsub#persist_items': '1',
                                   'pubsub#owner': JID('user@example.org'),
-                                  'x-myfield': ['a', 'b']})
+                                  'x-myfield': 'a'})
 
         def cb(element):
@@ -1969 +1972 @@
         def configureSet(request):
             self.assertEqual({'pubsub#deliver_payloads': False,
-                              'pubsub#persist_items': True}, request.options)
+                              'pubsub#persist_items': True},
+                             request.options.getValues())
             return defer.succeed(None)
 
@@ -2041 +2045 @@
         def configureSet(request):
             self.assertEquals(['pubsub#deliver_payloads'],
-                              request.options.keys())
+                              request.options.fields.keys())
 
         self.resource.getConfigurationOptions = getConfigurationOptions
@@ -2073 +2077 @@
         def cb(result):
             self.assertEquals('bad-request', result.condition)
+            self.assertEqual("Unexpected form type 'result'", result.text)
 
         d = self.handleRequest(xml)
@@ -2596 +2601 @@
 
 
+    def test_setConfigurationOptionsDict(self):
+        """
+        Options should be passed as a dictionary, not a form.
+        """
+
+        xml = """
+        <iq type='set' to='pubsub.example.org'
+                       from='user@example.org'>
+          <pubsub xmlns='http://jabber.org/protocol/pubsub#owner'>
+            <configure node='test'>
+              <x xmlns='jabber:x:data' type='submit'>
+                <field var='FORM_TYPE' type='hidden'>
+                  <value>http://jabber.org/protocol/pubsub#node_config</value>
+                </field>
+                <field var='pubsub#deliver_payloads'><value>0</value></field>
+                <field var='pubsub#persist_items'><value>1</value></field>
+              </x>
+            </configure>
+          </pubsub>
+        </iq>
+        """
+
+        def getConfigurationOptions():
+            return {
+                "pubsub#persist_items":
+                    {"type": "boolean",
+                     "label": "Persist items to storage"},
+                "pubsub#deliver_payloads":
+                    {"type": "boolean",
+                     "label": "Deliver payloads with event notifications"}
+                }
+
+        def setConfiguration(requestor, service, nodeIdentifier, options):
+            self.assertEquals({'pubsub#deliver_payloads': False,
+                               'pubsub#persist_items': True}, options)
+
+
+        self.service.getConfigurationOptions = getConfigurationOptions
+        self.service.setConfiguration = setConfiguration
+        return self.handleRequest(xml)
+
+
     def test_items(self):
         """