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

Complete FeederComponent tests

Browse Source 
- raise NotImplementedError exception for abstracts methods
- implement test_handle_tick

darcs-hash:20061105195847-86b55-af88958079cd5321808c2540d8c498bf47f60999.gz
This commit is contained in:
David Rousselie
2006-11-05 20:58:47 +01:00
parent 5c1804f484
commit b2fca94692
6 changed files with 125 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
run_tests.py
View File

@@ -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_tick'))
# 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)

2
src/jcl/jabber/component.py
View File

@@ -460,7 +460,7 @@ class JCLComponent(Component, object):
self.account_class.q.user_jid == base_from_jid
and self.account_class.q.name == name)
if accounts.count() >= 1:
self._send_presence_available(_account[0], show, lang_class)
self._send_presence_available(accounts[0], show, lang_class)
self.db_disconnect()
return 1

30
src/jcl/jabber/error.py Normal file
View File

@@ -0,0 +1,30 @@
##
## error.py
## Login : David Rousselie <dax@happycoders.org>
## Started on Sun Nov 5 20:13:48 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
##
"""Jabber exception classes"""
__revision__ = "$Id: error.py,v 1.1 2006/11/05 20:13:48 dax Exp $"
class FieldError(Exception):
"""Error raised when error exists on Jabber Data Form fields"""
pass

22
src/jcl/jabber/feeder.py
View File

@@ -53,36 +53,34 @@ class FeederComponent(JCLComponent):
self.sender = Sender()
self.check_interval = 1
self.__logger = logging.getLogger("jcl.jabber.JCLComponent")
self.__logger = logging.getLogger("jcl.jabber.FeederComponent")
def handle_tick(self):
"""Implement main feed/send behavior"""
pass
self.db_connect()
for acc in self.account_class.select():
print "OK"
# for data in self.feeder.feed(account):
# self.sender.send(account, data)
for _account in self.account_class.select(orderBy = "user_jid"):
for data in self.feeder.feed(_account):
self.sender.send(_account, data)
self.db_disconnect()
class Feeder(object):
"""Abstract feeder class"""
def __init__(self):
pass
def __init__(self, stream = None):
self.stream = stream
def feed(self, account):
"""Feed data for given account"""
pass
raise NotImplementedError
class Sender(object):
"""Abstract sender class"""
def __init__(self):
pass
def __init__(self, stream = None):
self.stream = stream
def send(self, to_account, data):
"""Send data to given account"""
pass
raise NotImplementedError

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

@@ -121,7 +121,8 @@ class JCLComponent_TestCase(unittest.TestCase):
"localhost",
"5347",
'sqlite://' + DB_URL)
self.max_tick_count = 2
self.comp.account_class = Account
self.max_tick_count = 1
self.saved_time_handler = None
def tearDown(self):
@@ -1175,6 +1176,7 @@ class JCLComponent_TestCase(unittest.TestCase):
"subscribed")
def test_handle_presence_subscribed(self):
# TODO
pass
def test_handle_presence_unsubscribe(self):

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

@@ -29,6 +29,8 @@ import time
from sqlobject import *
from sqlobject.dbconnection import TheURIOpener
from pyxmpp.message import Message
from tests.jcl.jabber.test_component import JCLComponent_TestCase, MockStream
from jcl.jabber.component import JCLComponent
@@ -76,51 +78,88 @@ class FeederComponent_TestCase(JCLComponent_TestCase):
if self.comp.queue.qsize():
raise self.comp.queue.get(0)
# handle_tick is implemented in FeederComponent
def test_run_ni_handle_tick(self):
pass
# handle_tick is implemented in FeederComponent
# so no need to check for NotImplemented raise assertion
self.assertTrue(True)
def test_handle_tick(self):
# TODO
class AccountFeeder(Feeder):
def feed(self, _account):
return ["user_jid: " + _account.user_jid, \
"jid: " + _account.jid]
class MessageAccountSender(Sender):
def send(self, _account, data):
self.stream.send(Message(\
from_jid = _account.jid, \
to_jid = _account.user_jid, \
subject = "Simple Message for account " + _account.name, \
body = data))
self.comp.stream = MockStream()
self.comp.stream_class = MockStream
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
account11 = Account(user_jid = "user1@test.com", \
name = "account11", \
jid = "account11@jcl.test.com")
account12 = Account(user_jid = "user1@test.com", \
name = "account12", \
jid = "account12@jcl.test.com")
account2 = Account(user_jid = "user2@test.com", \
name = "account2", \
jid = "account2@jcl.test.com")
self.comp.feeder = AccountFeeder(self.comp.stream)
self.comp.sender = MessageAccountSender(self.comp.stream)
self.comp.handle_tick()
self.assertTrue(True)
messages_sent = self.comp.stream.sent
self.assertEquals(len(messages_sent), 6)
self.assertEqual(messages_sent[0].get_from(), "account11@jcl.test.com")
self.assertEqual(messages_sent[0].get_to(), "user1@test.com")
self.assertEqual(messages_sent[0].get_subject(), \
"Simple Message for account account11")
self.assertEqual(messages_sent[0].get_body(), \
"user_jid: user1@test.com")
self.assertEqual(messages_sent[1].get_from(), "account11@jcl.test.com")
self.assertEqual(messages_sent[1].get_to(), "user1@test.com")
self.assertEqual(messages_sent[1].get_subject(), \
"Simple Message for account account11")
self.assertEqual(messages_sent[1].get_body(), \
"jid: account11@jcl.test.com")
self.assertEqual(messages_sent[2].get_from(), "account12@jcl.test.com")
self.assertEqual(messages_sent[2].get_to(), "user1@test.com")
self.assertEqual(messages_sent[2].get_subject(), \
"Simple Message for account account12")
self.assertEqual(messages_sent[2].get_body(), \
"user_jid: user1@test.com")
self.assertEqual(messages_sent[3].get_from(), "account12@jcl.test.com")
self.assertEqual(messages_sent[3].get_to(), "user1@test.com")
self.assertEqual(messages_sent[3].get_subject(), \
"Simple Message for account account12")
self.assertEqual(messages_sent[3].get_body(), \
"jid: account12@jcl.test.com")
self.assertEqual(messages_sent[4].get_from(), "account2@jcl.test.com")
self.assertEqual(messages_sent[4].get_to(), "user2@test.com")
self.assertEqual(messages_sent[4].get_subject(), \
"Simple Message for account account2")
self.assertEqual(messages_sent[4].get_body(), \
"user_jid: user2@test.com")
self.assertEqual(messages_sent[5].get_from(), "account2@jcl.test.com")
self.assertEqual(messages_sent[5].get_to(), "user2@test.com")
self.assertEqual(messages_sent[5].get_subject(), \
"Simple Message for account account2")
self.assertEqual(messages_sent[5].get_body(), \
"jid: account2@jcl.test.com")
class Feeder_TestCase(unittest.TestCase):
def setUp(self):
if os.path.exists(DB_PATH):
os.unlink(DB_PATH)
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
Account.createTable()
def tearDown(self):
Account.dropTable(ifExists = True)
del account.hub.threadConnection
# os.unlink(DB_PATH)
def test_feed_exist(self):
feeder = Feeder()
feeder.feed(Account(user_jid = "test@test.com", \
name = "test", \
jid = "test@jcl.test.com"))
self.assertTrue(True)
self.assertRaises(NotImplementedError, feeder.feed, None)
class Sender_TestCase(unittest.TestCase):
def setUp(self):
if os.path.exists(DB_PATH):
os.unlink(DB_PATH)
account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
Account.createTable()
def tearDown(self):
Account.dropTable(ifExists = True)
del account.hub.threadConnection
# os.unlink(DB_PATH)
def test_send_exist(self):
sender = Sender()
account = Account(user_jid = "test@test.com", \
name = "test", \
jid = "test@jcl.test.com")
sender.send(to_account = account, \
data = "Hello World")
self.assertTrue(True)
self.assertRaises(NotImplementedError, sender.send, None, None)