From 85f2c8a85d26e35f0deb24a0a97dec11118918e1 Mon Sep 17 00:00:00 2001
From: David Rousselie <dax@happycoders.org>
Date: Thu, 26 Oct 2006 15:37:44 +0200
Subject: [PATCH] get_register_exist test pass

darcs-hash:20061026133744-86b55-09b304db0aeb6522d6ef383e83b0f6457b64ed17.gz
---
 run_tests.py                       | 10 +++++-----
 src/jcl/jabber/component.py        |  4 +---
 tests/jcl/jabber/test_component.py |  5 +++++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/run_tests.py b/run_tests.py
index 6371eba..e99c4cf 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -50,14 +50,14 @@ if __name__ == '__main__':
     feeder_suite = unittest.makeSuite(Feeder_TestCase, "test")
     sender_suite = unittest.makeSuite(Sender_TestCase, "test")
     jcl_suite = unittest.TestSuite()
-    jcl_suite.addTest(FeederComponent_TestCase('test_handle_get_register_exist'))
+#    jcl_suite.addTest(FeederComponent_TestCase('test_handle_get_register_exist'))
 #    jcl_suite.addTest(FeederComponent_TestCase('test_handle_presence_available_to_account_live_password'))
 #    jcl_suite = unittest.TestSuite((feeder_component_suite))
 #    jcl_suite = unittest.TestSuite((component_suite))
-#    jcl_suite = unittest.TestSuite((component_suite,
-#                                    feeder_component_suite,
-#                                    feeder_suite,
-#                                    sender_suite))
+    jcl_suite = unittest.TestSuite((component_suite,
+                                    feeder_component_suite,
+                                    feeder_suite,
+                                    sender_suite))
     test_support.run_suite(jcl_suite)
 
 
diff --git a/src/jcl/jabber/component.py b/src/jcl/jabber/component.py
index 5167800..5d79ec8 100644
--- a/src/jcl/jabber/component.py
+++ b/src/jcl/jabber/component.py
@@ -272,8 +272,6 @@ class JCLComponent(Component):
         """Discovery get nested nodes handler
         """
         self.__logger.debug("DISCO_GET_ITEMS")
-## TODO Lang
-##  lang_class = self.__lang.get_lang_class_from_node(info_query.get_node())
         base_from_jid = unicode(info_query.get_from().bare())
         disco_items = DiscoItems()
         if not node:
@@ -574,7 +572,7 @@ class JCLComponent(Component):
         reg_form = self.get_reg_form(lang_class)
         for (field_name, field) in reg_form.fields.items():
             if hasattr(self.account_class, field_name):
-                field.value = getattr(self.account_class, field_name)
+                field.value = getattr(account, field_name)
         return reg_form
     
     ###########################################################################
diff --git a/tests/jcl/jabber/test_component.py b/tests/jcl/jabber/test_component.py
index a798b9f..bbf5224 100644
--- a/tests/jcl/jabber/test_component.py
+++ b/tests/jcl/jabber/test_component.py
@@ -367,6 +367,11 @@ class JCLComponent_TestCase(unittest.TestCase):
                                and field.prop("label") == \
                                Lang.en.account_name]), \
                           1)
+        value = iq_sent.xpath_eval("jir:query/jxd:x/jxd:field/jxd:value", \
+                                   {"jir" : "jabber:iq:register", \
+                                    "jxd" : "jabber:x:data"})
+        self.assertEquals(len(value), 1)
+        self.assertEquals(value[0].content, "account1")
 
     def test_handle_set_register(self):
         pass