added collection tests

conn_tests/test_pubsubserver.py

@@ -109,8 +109,26 @@ def test010unsubscribenode(self):
 		self.failUnless(self.xmpp2['xep_0060'].unsubscribe(self.pshost, "testnode2"), "Got error response when unsubscribing.")
 
 	def test011createcollectionnode(self):
-		"Create a collection node"
-		self.failUnless(self.xmpp1['xep_0060'].create_node(self.pshost, "testnode3", self.statev['defaultconfig'], True), "Could not create collection node")
+		"Create a collection node w/ Account #2"
+		self.failUnless(self.xmpp2['xep_0060'].create_node(self.pshost, "testnode3", self.statev['defaultconfig'], True), "Could not create collection node")
+
+	def test012subscribecollection(self):
+		"Subscribe Account #1 to collection"
+		self.failUnless(self.xmpp1['xep_0060'].subscribe(self.pshost, "testnode3"))
+
+	def test013assignnodetocollection(self):
+		"Assign node to collection"
+		self.failUnless(self.xmpp2['xep_0060'].addNodeToCollection(self.pshost, 'testnode2', 'testnode3'))
+
+	def test014publishcollection(self):
+		"""Publishing item to collection child"""
+		item = ET.Element('{http://netflint.net/protocol/test}test')
+		w = Waiter('wait publish2', StanzaPath('message/pubsub_event/items@node=testnode2'))
+		self.xmpp1.registerHandler(w)
+		result = self.xmpp2['xep_0060'].setItem(self.pshost, "testnode2", (('test2', item),))
+		msg = w.wait(5) # got to get a result in 5 seconds
+		self.failUnless(msg != False, "Account #1 did not get message event: perhaps node was advertised incorrectly?")
+		self.failUnless(result)
 
 	def test900cleanup(self):
 		"Cleaning up"
@@ -168,7 +186,7 @@ def test900cleanup(self):
 
 	TestPubsubServer.xmpp1 = xmpp1
 	TestPubsubServer.xmpp2 = xmpp2
-	TestPubsubServer.pshost = 'pubsub.recon'
+	TestPubsubServer.pshost = config.get('settings', 'pubsub')
 	xmpp1.waitforstart.get(True)
 	xmpp2.waitforstart.get(True)
 	testsuite = unittest.TestLoader().loadTestsFromTestCase(TestPubsubServer)

conn_tests/testconfig.ini

@@ -1,5 +1,6 @@
 [settings]
 enabled=true
+pubsub=pubsub.recon
 
 [account1]
 jid=fritzy@recon