From edc1a693ae06a21c1128b4b0d770d15560141b6e Mon Sep 17 00:00:00 2001
From: David Rousselie <dax@happycoders.org>
Date: Wed, 28 Dec 2005 13:07:04 +0100
Subject: [PATCH] component tests pass

Make component tests pass with no registration (no usage of storage)

darcs-hash:20051228120704-86b55-aa921f4d888e64d1dcbeef9874dfd2d1a6bf6ce0.gz
---
 jabber/component.py     |  2 +-
 tests/dummy_server.py   |  4 +-
 tests/test_component.py | 81 ++++++++++++++++++++++++++++++++++++-----
 3 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/jabber/component.py b/jabber/component.py
index c402a9a..c9c6650 100644
--- a/jabber/component.py
+++ b/jabber/component.py
@@ -426,7 +426,7 @@ class MailComponent(Component):
 					self.message)
     
     def stream_state_changed(self,state,arg):
-        print "*** State changed: %s %r ***" % (state,arg)
+        self.__logger.debug("*** State changed: %s %r ***" % (state,arg))
 
     """ Discovery get info handler """
     def disco_get_info(self, node, iq):
diff --git a/tests/dummy_server.py b/tests/dummy_server.py
index 4235cef..83e7c31 100644
--- a/tests/dummy_server.py
+++ b/tests/dummy_server.py
@@ -71,14 +71,14 @@ class DummyServer:
                 else:
                     response = self.responses[idx]
                 if response is not None:
-                    print >>sys.stderr, 'Sending : ', response
+#                    print >>sys.stderr, 'Sending : ', response
                     conn.send(response)
                 data = rfile.readline()
                 if not data:
                     break
                 else:
                     self.real_queries.append(data)
-                    print >>sys.stderr, 'Receive : ', data
+#                    print >>sys.stderr, 'Receive : ', data
         conn.close()
 
     def verify_queries(self):
diff --git a/tests/test_component.py b/tests/test_component.py
index 013083c..3b46bae 100644
--- a/tests/test_component.py
+++ b/tests/test_component.py
@@ -102,7 +102,6 @@ class MailComponent_TestCase_NoReg(unittest.TestCase):
         self.failUnless(self.server.verify_queries())
 
     def test_get_register(self):
-        pass
         self.server.responses = ["<?xml version='1.0'?><stream:stream xmlns:stream='http://etherx.jabber.org/streams' xmlns='jabber:component:accept' id='4258238724' from='localhost'>", \
                                  "<handshake/><iq type='get' to='jmc.localhost' from='test@localhost/test' id='aad9a'><query xmlns='jabber:iq:register'/></iq>", \
                                  "</stream:stream>"]
@@ -207,16 +206,78 @@ class MailComponent_TestCase_NoReg(unittest.TestCase):
         self.failUnless(self.server.verify_queries())
         
 
-        #self.mail_component.get_version()
+    def test_disco_get_info(self):
+        self.server.responses = ["<?xml version='1.0'?><stream:stream xmlns:stream='http://etherx.jabber.org/streams' xmlns='jabber:component:accept' id='4258238724' from='localhost'>", \
+                                 "<handshake/><iq type='get' to='jmc.localhost' from='test@localhost/test' id='aad9a'><query xmlns='http://jabber.org/protocol/disco#info'/></iq>", \
+                                 "</stream:stream>"]
+        self.server.queries = ["<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + \
+                               "<stream:stream xmlns:stream=\"http://etherx.jabber.org/streams\" xmlns=\"jabber:component:accept\" to=\"jmc.localhost\" version=\"1.0\">", \
+                               "<handshake>[0-9abcdef]*</handshake>", \
+                               "<iq from=\"jmc.localhost\" to=\"test@localhost/test\" type=\"result\" id=\"aad9a\">" + \
+                               "<query xmlns=\"http://jabber.org/protocol/disco#info\">" + \
+                               "<feature var=\"jabber:iq:version\"/>" + \
+                               "<feature var=\"jabber:iq:register\"/>" + \
+                               "<identity name=\"Jabber Mail Component\" category=\"headline\" type=\"mail\"/>" + \
+                               "</query></iq>" + \
+                               "</stream:stream>"]
+        self.mail_component.run(1)
+        self.failUnless(self.server.verify_queries())
 
-#     def test_disco_get_info(self):
-#         pass
-
-#     def test_get_register(self):
-#         pass
-
-#     def test_set_register(self):
-#         pass
+#    def test_set_register(self):
+#         self.server.responses = ["<?xml version='1.0'?><stream:stream xmlns:stream='http://etherx.jabber.org/streams' xmlns='jabber:component:accept' id='4258238724' from='localhost'>", \
+#                                  "<handshake/>" + \
+#                                  "<iq from='test@localhost/test' to='jmc.localhost' type='set' id='aacaa'>" + \
+#                                  "<query xmlns='jabber:iq:register'>" + \
+#                                  "<x xmlns='jabber:x:data' type='submit'>" + \
+#                                  "<field type='text-single' var='name'>" + \
+#                                  "<value>test</value>" + \
+#                                  "</field>" + \
+#                                  "<field type='text-single' var='login'>" + \
+#                                  "<value>logintest</value>" + \
+#                                  "</field>" + \
+#                                  "<field type='text-private' var='password'>" + \
+#                                  "<value>passtest</value>" + \
+#                                  "</field>" + \
+#                                  "<field type='text-single' var='host'>" + \
+#                                  "<value>hosttest</value>" + \
+#                                  "</field>" + \
+#                                  "<field type='text-single' var='port'>" + \
+#                                  "<value>993</value>" + \
+#                                  "</field>" + \
+#                                  "<field type='list-single' var='type'>" + \
+#                                  "<value>imaps</value>" + \
+#                                  "</field>" + \
+#                                  "<field type='text-single' var='mailbox'>" + \
+#                                  "<value>INBOX</value>" + \
+#                                  "</field>" + \
+#                                  "<field type='list-single' var='ffc_action'>" + \
+#                                  "<value>2</value>" + \
+#                                  "</field>" + \
+#                                  "<field type='list-single' var='online_action'>" + \
+#                                  "<value>2</value>" + \
+#                                  "</field>" + \
+#                                  "<field type='list-single' var='away_action'>" + \
+#                                  "<value>1</value>" + \
+#                                  "</field>" + \
+#                                  "<field type='list-single' var='ea_action'>" + \
+#                                  "<value>1</value>" + \
+#                                  "</field>" + \
+#                                  "<field type='list-single' var='offline_action'>" + \
+#                                  "<value>0</value>" + \
+#                                  "</field>" + \
+#                                  "<field type='text-single' var='interval'>" + \
+#                                  "<value>5</value>" + \
+#                                  "</field>" + \
+#                                  "</x>" + \
+#                                  "</query></iq>" + \
+#                                  "<stream:stream>"]
+#         self.server.queries = ["<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + \
+#                                "<stream:stream xmlns:stream=\"http://etherx.jabber.org/streams\" xmlns=\"jabber:component:accept\" to=\"jmc.localhost\" version=\"1.0\">", \
+#                                "<handshake>[0-9abcdef]*</handshake>", \
+#                                "<iq from=\"jmc.localhost\" to=\"test@localhost/Psi\" type=\"result\" id=\"aacaa\"/>",
+#                                "<stream:stream>"]
+#         self.mail_component.run(1)
+#         self.failUnless(self.server.verify_queries())
     
 class MailComponent_TestCase_Reg(unittest.TestCase):
     def setUp(self):