Mercurial > libervia-pubsub
diff sat_pubsub/test/test_storage.py @ 266:560b6cdc50b2 0.1.0
fix the backend and storage tests
author | souliane <souliane@mailoo.org> |
---|---|
date | Sat, 22 Feb 2014 08:05:03 +0100 |
parents | d55620ceafed |
children | b757c29b20d7 |
line wrap: on
line diff
--- a/sat_pubsub/test/test_storage.py Sat Feb 22 08:04:09 2014 +0100 +++ b/sat_pubsub/test/test_storage.py Sat Feb 22 08:05:03 2014 +0100 @@ -62,7 +62,7 @@ from twisted.internet import defer from twisted.words.xish import domish -from sat_pubsub import error, iidavoll +from sat_pubsub import error, iidavoll, const OWNER = jid.JID('owner@example.com/Work') SUBSCRIBER = jid.JID('subscriber@example.com/Home') @@ -166,6 +166,7 @@ "pubsub#send_last_published_item": 'on_sub', "pubsub#node_type": 'leaf', "pubsub#access_model": 'open', + const.OPT_PUBLISH_MODEL: const.VAL_PMODEL_OPEN } def unsetPersistItems(_): @@ -363,12 +364,12 @@ def test_storeItems(self): def cb1(void): - return self.node.getItemsById(['new']) + return self.node.getItemsById("", False, ['new']) def cb2(result): self.assertEqual(ITEM_NEW.toXml(), result[0].toXml()) - d = self.node.storeItems([ITEM_NEW], PUBLISHER) + d = self.node.storeItems([(const.VAL_AMODEL_DEFAULT, {}, ITEM_NEW)], PUBLISHER) d.addCallback(cb1) d.addCallback(cb2) return d @@ -376,12 +377,12 @@ def test_storeUpdatedItems(self): def cb1(void): - return self.node.getItemsById(['current']) + return self.node.getItemsById("", False, ['current']) def cb2(result): self.assertEqual(ITEM_UPDATED.toXml(), result[0].toXml()) - d = self.node.storeItems([ITEM_UPDATED], PUBLISHER) + d = self.node.storeItems([(const.VAL_AMODEL_DEFAULT, {}, ITEM_UPDATED)], PUBLISHER) d.addCallback(cb1) d.addCallback(cb2) return d @@ -390,7 +391,7 @@ def test_removeItems(self): def cb1(result): self.assertEqual(['to-be-deleted'], result) - return self.node.getItemsById(['to-be-deleted']) + return self.node.getItemsById("", False, ['to-be-deleted']) def cb2(result): self.assertEqual(0, len(result)) @@ -414,8 +415,7 @@ def cb(result): items = [item.toXml() for item in result] self.assertIn(ITEM.toXml(), items) - - d = self.node.getItems() + d = self.node.getItems("", False) d.addCallback(cb) return d @@ -425,7 +425,7 @@ self.assertEqual(1, len(result)) self.assertEqual(ITEM.toXml(), result[0].toXml()) - d = self.node.getItems(1) + d = self.node.getItems("", False, 1) d.addCallback(cb) return d @@ -434,7 +434,7 @@ def cb(result): self.assertEqual(1, len(result)) - d = self.node.getItemsById(['current']) + d = self.node.getItemsById("", False, ['current']) d.addCallback(cb) return d @@ -443,7 +443,7 @@ def cb(result): self.assertEqual(0, len(result)) - d = self.node.getItemsById(['non-existing']) + d = self.node.getItemsById("", False, ['non-existing']) d.addCallback(cb) return d @@ -455,7 +455,7 @@ return d def cb2(node): - return node.getItems() + return node.getItems("", False) def cb3(result): self.assertEqual([], result)