diff -r ff8448fb07e7 -r 14c99c89edf4 tests/job.py --- a/tests/job.py Mon Feb 13 19:50:01 2012 +0100 +++ b/tests/job.py Mon Feb 13 19:52:54 2012 +0100 @@ -11,7 +11,7 @@ from iro.model.pool import data from iro.model.message import SMS, Fax, Mail -from iro.model.schema import Job, User +from iro.model.schema import Job, User, Offer as DBOffer, Userright from iro.telnumber import Telnumber @@ -21,7 +21,7 @@ from .dbtestcase import DBTestCase -class DumpPool(): +class DummyPool(): def run(self, f,*a,**k): return f(*a,**k) @@ -32,7 +32,7 @@ def setUp(self): DBTestCase.setUp(self) self.pool = data.pool - data.pool = DumpPool() + data.pool = DummyPool() def tearDown(self): exJobs.clear() @@ -50,7 +50,7 @@ self.assertTrue(vInteger(job.dbjob, None, minv=0 )) self.assertEqual(job.message, SMS('test')) self.assertEqual(job.recipients, [Telnumber('123456789')]) - self.assertEqual(job.offers,['test']) + self.assertEqual(job.offers,[]) self.assertEqual(job.tasks,{}) with self.session() as session: @@ -59,6 +59,16 @@ self.assertEqual(exJobs[job.dbjob],job) + def testCreate2(self): + with self.session() as session: + u = User(name='test',apikey='abcdef123456789') + session.add(u) + o=DBOffer(name="test", provider="bla", route="basic", typ="sms") + u.rights.append(Userright(o)) + + job = exJobs.create(u, [Telnumber('123456789')], SMS('test'), ['test']) + self.assertEqual(job.offers,['test']) + def testGet(self): with self.session() as session: u = User(name='test',apikey='abcdef123456789') @@ -119,6 +129,8 @@ with self.session() as session: u = User(name='test',apikey='abcdef123456789') session.add(u) + o=DBOffer(name="test", provider="bla", route="basic", typ="sms") + u.rights.append(Userright(o)) offers["test"] = Offer("test")