david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor AccountExample to support account types naming convention

Browse Source 
darcs-hash:20070131172203-86b55-ee6b5c58dfe7ba50a04a62b5bbbf39c5c43d430d.gz
This commit is contained in:
David Rousselie
2007-01-31 18:22:03 +01:00
parent 56f48bb516
commit ae6406b807
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/jcl/jabber/test_component.py
View File

@@ -44,7 +44,7 @@ from jcl.model.account import Account
from jcl.lang import Lang from jcl.lang import Lang
from jcl.jabber.x import DataForm from jcl.jabber.x import DataForm
from tests.jcl.model.account import AccountExample from tests.jcl.model.account import ExampleAccount
DB_PATH = "/tmp/test.db" DB_PATH = "/tmp/test.db"
DB_URL = DB_PATH# + "?debug=1&debugThreading=1" DB_URL = DB_PATH# + "?debug=1&debugThreading=1"
@@ -124,14 +124,14 @@ class JCLComponent_TestCase(unittest.TestCase):
'sqlite://' + DB_URL) 'sqlite://' + DB_URL)
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL) account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
Account.createTable(ifNotExists = True) Account.createTable(ifNotExists = True)
AccountExample.createTable(ifNotExists = True) ExampleAccount.createTable(ifNotExists = True)
del account.hub.threadConnection del account.hub.threadConnection
self.max_tick_count = 1 self.max_tick_count = 1
self.saved_time_handler = None self.saved_time_handler = None
def tearDown(self): def tearDown(self):
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL) account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
AccountExample.dropTable(ifExists = True) ExampleAccount.dropTable(ifExists = True)
Account.dropTable(ifExists = True) Account.dropTable(ifExists = True)
del TheURIOpener.cachedURIs['sqlite://' + DB_URL] del TheURIOpener.cachedURIs['sqlite://' + DB_URL]
account.hub.threadConnection.close() account.hub.threadConnection.close()
@@ -451,7 +451,7 @@ class JCLComponent_TestCase(unittest.TestCase):
def test_handle_get_register_new_complex(self): def test_handle_get_register_new_complex(self):
self.comp.stream = MockStream() self.comp.stream = MockStream()
self.comp.stream_class = MockStream self.comp.stream_class = MockStream
self.comp.account_classes = [AccountExample] self.comp.account_classes = [ExampleAccount]
self.comp.handle_get_register(Iq(stanza_type = "get", \ self.comp.handle_get_register(Iq(stanza_type = "get", \
from_jid = "user1@test.com", \ from_jid = "user1@test.com", \
to_jid = "jcl.test.com")) to_jid = "jcl.test.com"))
@@ -564,7 +564,7 @@ class JCLComponent_TestCase(unittest.TestCase):
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL) account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
self.comp.stream = MockStream() self.comp.stream = MockStream()
self.comp.stream_class = MockStream self.comp.stream_class = MockStream
account1 = AccountExample(user_jid = "user1@test.com", \ account1 = ExampleAccount(user_jid = "user1@test.com", \
name = "account1", \ name = "account1", \
jid = "account1@jcl.test.com", \ jid = "account1@jcl.test.com", \
login = "mylogin", \ login = "mylogin", \
@@ -572,7 +572,7 @@ class JCLComponent_TestCase(unittest.TestCase):
store_password = False, \ store_password = False, \
test_enum = "choice3", \ test_enum = "choice3", \
test_int = 21) test_int = 21)
account11 = AccountExample(user_jid = "user1@test.com", \ account11 = ExampleAccount(user_jid = "user1@test.com", \
name = "account11", \ name = "account11", \
jid = "account11@jcl.test.com", \ jid = "account11@jcl.test.com", \
login = "mylogin", \ login = "mylogin", \
@@ -580,7 +580,7 @@ class JCLComponent_TestCase(unittest.TestCase):
store_password = False, \ store_password = False, \
test_enum = "choice3", \ test_enum = "choice3", \
test_int = 21) test_int = 21)
account21 = AccountExample(user_jid = "user2@test.com", \ account21 = ExampleAccount(user_jid = "user2@test.com", \
name = "account21", \ name = "account21", \
jid = "account21@jcl.test.com", \ jid = "account21@jcl.test.com", \
login = "mylogin", \ login = "mylogin", \
@@ -726,7 +726,7 @@ class JCLComponent_TestCase(unittest.TestCase):
def test_handle_set_register_new_complex(self): def test_handle_set_register_new_complex(self):
self.comp.stream = MockStream() self.comp.stream = MockStream()
self.comp.stream_class = MockStream self.comp.stream_class = MockStream
self.comp.account_classes = [AccountExample] self.comp.account_classes = [ExampleAccount]
x_data = DataForm() x_data = DataForm()
x_data.xmlns = "jabber:x:data" x_data.xmlns = "jabber:x:data"
x_data.type = "submit" x_data.type = "submit"
@@ -805,7 +805,7 @@ class JCLComponent_TestCase(unittest.TestCase):
def test_handle_set_register_new_default_values(self): def test_handle_set_register_new_default_values(self):
self.comp.stream = MockStream() self.comp.stream = MockStream()
self.comp.stream_class = MockStream self.comp.stream_class = MockStream
self.comp.account_classes = [AccountExample] self.comp.account_classes = [ExampleAccount]
x_data = DataForm() x_data = DataForm()
x_data.xmlns = "jabber:x:data" x_data.xmlns = "jabber:x:data"
x_data.type = "submit" x_data.type = "submit"
@@ -871,7 +871,7 @@ class JCLComponent_TestCase(unittest.TestCase):
def test_handle_set_register_new_field_mandatory(self): def test_handle_set_register_new_field_mandatory(self):
self.comp.stream = MockStream() self.comp.stream = MockStream()
self.comp.stream_class = MockStream self.comp.stream_class = MockStream
self.comp.account_classes = [AccountExample] self.comp.account_classes = [ExampleAccount]
x_data = DataForm() x_data = DataForm()
x_data.xmlns = "jabber:x:data" x_data.xmlns = "jabber:x:data"
x_data.type = "submit" x_data.type = "submit"
@@ -906,7 +906,7 @@ class JCLComponent_TestCase(unittest.TestCase):
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL) account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
self.comp.stream = MockStream() self.comp.stream = MockStream()
self.comp.stream_class = MockStream self.comp.stream_class = MockStream
existing_account = AccountExample(user_jid = "user1@test.com", \ existing_account = ExampleAccount(user_jid = "user1@test.com", \
name = "account1", \ name = "account1", \
jid = "account1@jcl.test.com", \ jid = "account1@jcl.test.com", \
login = "mylogin", \ login = "mylogin", \
@@ -914,7 +914,7 @@ class JCLComponent_TestCase(unittest.TestCase):
store_password = True, \ store_password = True, \
test_enum = "choice1", \ test_enum = "choice1", \
test_int = 21) test_int = 21)
another_account = AccountExample(user_jid = "user1@test.com", \ another_account = ExampleAccount(user_jid = "user1@test.com", \
name = "account2", \ name = "account2", \
jid = "account2@jcl.test.com", \ jid = "account2@jcl.test.com", \
login = "mylogin", \ login = "mylogin", \
@@ -1212,14 +1212,14 @@ class JCLComponent_TestCase(unittest.TestCase):
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL) account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
self.comp.stream = MockStream() self.comp.stream = MockStream()
self.comp.stream_class = MockStream self.comp.stream_class = MockStream
account11 = AccountExample(user_jid = "user1@test.com", \ account11 = ExampleAccount(user_jid = "user1@test.com", \
name = "account11", \ name = "account11", \
jid = "account11@jcl.test.com") jid = "account11@jcl.test.com")
account11.store_password = False account11.store_password = False
account12 = AccountExample(user_jid = "user1@test.com", \ account12 = ExampleAccount(user_jid = "user1@test.com", \
name = "account12", \ name = "account12", \
jid = "account12@jcl.test.com") jid = "account12@jcl.test.com")
account2 = AccountExample(user_jid = "user2@test.com", \ account2 = ExampleAccount(user_jid = "user2@test.com", \
name = "account2", \ name = "account2", \
jid = "account2@jcl.test.com") jid = "account2@jcl.test.com")
del account.hub.threadConnection del account.hub.threadConnection
@@ -1645,14 +1645,14 @@ class JCLComponent_TestCase(unittest.TestCase):
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL) account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
self.comp.stream = MockStream() self.comp.stream = MockStream()
self.comp.stream_class = MockStream self.comp.stream_class = MockStream
account11 = AccountExample(user_jid = "user1@test.com", \ account11 = ExampleAccount(user_jid = "user1@test.com", \
name = "account11", \ name = "account11", \
jid = "account11@jcl.test.com") jid = "account11@jcl.test.com")
account11.waiting_password_reply = True account11.waiting_password_reply = True
account12 = AccountExample(user_jid = "user1@test.com", \ account12 = ExampleAccount(user_jid = "user1@test.com", \
name = "account12", \ name = "account12", \
jid = "account12@jcl.test.com") jid = "account12@jcl.test.com")
account2 = AccountExample(user_jid = "user2@test.com", \ account2 = ExampleAccount(user_jid = "user2@test.com", \
name = "account2", \ name = "account2", \
jid = "account2@jcl.test.com") jid = "account2@jcl.test.com")
del account.hub.threadConnection del account.hub.threadConnection

6
tests/jcl/jabber/test_feeder.py
View File

@@ -38,7 +38,7 @@ from jcl.jabber.feeder import FeederComponent, Feeder, Sender
from jcl.model.account import Account from jcl.model.account import Account
from jcl.model import account from jcl.model import account
from tests.jcl.model.account import AccountExample from tests.jcl.model.account import ExampleAccount
DB_PATH = "/tmp/test.db" DB_PATH = "/tmp/test.db"
DB_URL = DB_PATH #+ "?debug=1&debugThreading=1" DB_URL = DB_PATH #+ "?debug=1&debugThreading=1"
@@ -54,13 +54,13 @@ class FeederComponent_TestCase(JCLComponent_TestCase):
'sqlite://' + DB_URL) 'sqlite://' + DB_URL)
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL) account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
Account.createTable(ifNotExists = True) Account.createTable(ifNotExists = True)
AccountExample.createTable(ifNotExists = True) ExampleAccount.createTable(ifNotExists = True)
del account.hub.threadConnection del account.hub.threadConnection
def tearDown(self): def tearDown(self):
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL) account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
Account.dropTable(ifExists = True) Account.dropTable(ifExists = True)
AccountExample.dropTable(ifExists = True) ExampleAccount.dropTable(ifExists = True)
del TheURIOpener.cachedURIs['sqlite://' + DB_URL] del TheURIOpener.cachedURIs['sqlite://' + DB_URL]
account.hub.threadConnection.close() account.hub.threadConnection.close()
del account.hub.threadConnection del account.hub.threadConnection

2
tests/jcl/model/account.py
View File

@@ -28,7 +28,7 @@ from jcl.lang import Lang
from jcl.model import account from jcl.model import account
from jcl.model.account import Account, PresenceAccount from jcl.model.account import Account, PresenceAccount
class AccountExample(Account): class ExampleAccount(Account):
login = StringCol(default = "") login = StringCol(default = "")
password = StringCol(default = None) password = StringCol(default = None)
store_password = BoolCol(default = True) store_password = BoolCol(default = True)

8
tests/jcl/model/test_account.py
View File

@@ -31,7 +31,7 @@ from jcl.jabber.error import FieldError
from jcl.model import account from jcl.model import account
from jcl.model.account import Account, PresenceAccount from jcl.model.account import Account, PresenceAccount
from tests.jcl.model.account import AccountExample, PresenceAccountExample from tests.jcl.model.account import ExampleAccount, PresenceAccountExample
DB_PATH = "/tmp/test.db" DB_PATH = "/tmp/test.db"
DB_URL = DB_PATH# + "?debug=1&debugThreading=1" DB_URL = DB_PATH# + "?debug=1&debugThreading=1"
@@ -94,12 +94,12 @@ class Account_TestCase(unittest.TestCase):
os.unlink(DB_PATH) os.unlink(DB_PATH)
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL) account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
Account.createTable(ifNotExists = True) Account.createTable(ifNotExists = True)
AccountExample.createTable(ifNotExists = True) ExampleAccount.createTable(ifNotExists = True)
del account.hub.threadConnection del account.hub.threadConnection
def tearDown(self): def tearDown(self):
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL) account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
AccountExample.dropTable(ifExists = True) ExampleAccount.dropTable(ifExists = True)
Account.dropTable(ifExists = True) Account.dropTable(ifExists = True)
del TheURIOpener.cachedURIs['sqlite://' + DB_URL] del TheURIOpener.cachedURIs['sqlite://' + DB_URL]
account.hub.threadConnection.close() account.hub.threadConnection.close()
@@ -119,7 +119,7 @@ class Account_TestCase(unittest.TestCase):
def test_set_status_live_password(self): def test_set_status_live_password(self):
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL) account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
account11 = AccountExample(user_jid = "test1@test.com", \ account11 = ExampleAccount(user_jid = "test1@test.com", \
name = "account11", \ name = "account11", \
jid = "account11@jcl.test.com", \ jid = "account11@jcl.test.com", \
login = "mylogin", \ login = "mylogin", \