diff --git a/tests/jcl/model/test_account.py b/tests/jcl/model/test_account.py
new file mode 100644
index 0000000..27dbc54
--- /dev/null
+++ b/tests/jcl/model/test_account.py
@@ -0,0 +1,134 @@
+##
+## test_account.py
+## Login : David Rousselie <dax@happycoders.org>
+## Started on  Wed Nov 22 19:32:53 2006 David Rousselie
+## $Id$
+## 
+## Copyright (C) 2006 David Rousselie
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+## 
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+## 
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+
+import unittest
+
+import os
+
+from sqlobject import *
+from sqlobject.dbconnection import TheURIOpener
+
+from jcl.jabber.error import FieldError
+from jcl.model import account
+from jcl.model.account import Account
+
+from tests.jcl.model.account import AccountExample
+
+DB_PATH = "/tmp/test.db"
+DB_URL = DB_PATH# + "?debug=1&debugThreading=1"
+
+class AccountModule_TestCase(unittest.TestCase):
+    def test_default_post_func(self):
+        result = account.default_post_func("test")
+        self.assertEquals(result, "test")
+
+    def test_boolean_post_func_1(self):
+        result = account.boolean_post_func("1")
+        self.assertTrue(result)
+
+    def test_boolean_post_func_0(self):
+        result = account.boolean_post_func("0")
+        self.assertFalse(result)
+
+    def test_boolean_post_func_True(self):
+        result = account.boolean_post_func("True")
+        self.assertTrue(result)
+        
+    def test_boolean_post_func_true(self):
+        result = account.boolean_post_func("true")
+        self.assertTrue(result)
+
+    def test_boolean_post_func_False(self):
+        result = account.boolean_post_func("False")
+        self.assertFalse(result)
+
+    def test_boolean_post_func_false(self):
+        result = account.boolean_post_func("false")
+        self.assertFalse(result)
+
+    def test_int_post_func(self):
+        result = account.int_post_func("42")
+        self.assertEquals(result, 42)
+
+    def test_string_not_null_post_func_not_null(self):
+        result = account.string_not_null_post_func("ok")
+        self.assertEquals(result, "ok")
+
+    def test_string_not_null_post_func_none(self):
+        self.assertRaises(FieldError, \
+                          account.string_not_null_post_func, \
+                          None)
+
+    def test_string_not_null_post_func_empty(self):
+        self.assertRaises(FieldError, \
+                          account.string_not_null_post_func, \
+                          "")
+
+    def test_mandatory_field(self):
+        self.assertRaises(FieldError, \
+                          account.mandatory_field, \
+                          "")
+        
+class Account_TestCase(unittest.TestCase):
+    def setUp(self):
+        if os.path.exists(DB_PATH):
+            os.unlink(DB_PATH)
+
+    def tearDown(self):
+        account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
+        AccountExample.dropTable(ifExists = True)
+        Account.dropTable(ifExists = True)
+        del TheURIOpener.cachedURIs['sqlite://' + DB_URL]
+        account.hub.threadConnection.close()
+        del account.hub.threadConnection
+        if os.path.exists(DB_PATH):
+            os.unlink(DB_PATH)
+        
+    def test_set_status(self):
+        account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
+        Account.createTable(ifNotExists = True)
+        account11 = Account(user_jid = "test1@test.com", \
+                            name = "account11", \
+                            jid = "account11@jcl.test.com")
+        account11.status = account.OFFLINE
+        self.assertEquals(account11.status, account.OFFLINE)
+        # TODO : test first_check attribute
+        del account.hub.threadConnection
+
+    def test_set_status_live_password(self):
+        account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
+        AccountExample.createTable(ifNotExists = True)
+        account11 = AccountExample(user_jid = "test1@test.com", \
+                                   name = "account11", \
+                                   jid = "account11@jcl.test.com", \
+                                   login = "mylogin", \
+                                   password = "mypassword", \
+                                   store_password = False, \
+                                   test_enum = "choice3", \
+                                   test_int = 21)
+        account11.waiting_password_reply = True
+        account11.status = account.OFFLINE
+        self.assertEquals(account11.status, account.OFFLINE)
+        self.assertEquals(account11.waiting_password_reply, False)
+        self.assertEquals(account11.password, None)
+        del account.hub.threadConnection
+