diff options
| author | Duda Dornelles <ddornell@thoughtworks.com> | 2014-10-15 09:42:08 +0200 |
|---|---|---|
| committer | Duda Dornelles <ddornell@thoughtworks.com> | 2014-10-15 09:42:08 +0200 |
| commit | 89d26f3cd389f41b83d27ea225944a0ff8bc2e95 (patch) | |
| tree | 31275a0e7c350fd2b9acc2d1210d972bb9a0d3c8 /service/test/unit/adapter/listener_test.py | |
| parent | 6d08b8e65d2c1679d4b489ac196116847f91b3a7 (diff) | |
Getting rid of singletons and optimizing imports
Diffstat (limited to 'service/test/unit/adapter/listener_test.py')
| -rw-r--r-- | service/test/unit/adapter/listener_test.py | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/service/test/unit/adapter/listener_test.py b/service/test/unit/adapter/listener_test.py index 284c6b16..e131aebd 100644 --- a/service/test/unit/adapter/listener_test.py +++ b/service/test/unit/adapter/listener_test.py @@ -16,16 +16,12 @@ import unittest from mockito import * -import pixelated.adapter.soledad_querier - -querier = mock() -when(pixelated.adapter.soledad_querier).get_soledad_querier_instance().thenReturn(querier) - from pixelated.adapter.listener import MailboxListener class MailboxListenerTest(unittest.TestCase): def setUp(self): + self.querier = mock() self.account = mock() self.account.mailboxes = [] @@ -36,11 +32,11 @@ class MailboxListenerTest(unittest.TestCase): mailbox.listeners = set() when(mailbox).addListener = lambda x: mailbox.listeners.add(x) - self.assertNotIn(MailboxListener('INBOX'), mailbox.listeners) + self.assertNotIn(MailboxListener('INBOX', self.querier), mailbox.listeners) - MailboxListener.listen(self.account, 'INBOX') + MailboxListener.listen(self.account, 'INBOX', self.querier) - self.assertIn(MailboxListener('INBOX'), mailbox.listeners) + self.assertIn(MailboxListener('INBOX', self.querier), mailbox.listeners) def test_reindex_missing_idents(self): search_engine = mock() @@ -48,12 +44,11 @@ class MailboxListenerTest(unittest.TestCase): MailboxListener.SEARCH_ENGINE = search_engine - listener = MailboxListener('INBOX') - listener.querier = querier - when(querier).idents_by_mailbox('INBOX').thenReturn({'ident1', 'ident2', 'missing_ident'}) - querier.used_arguments = [] - querier.mails = lambda x: querier.used_arguments.append(x) + listener = MailboxListener('INBOX', self.querier) + when(self.querier).idents_by_mailbox('INBOX').thenReturn({'ident1', 'ident2', 'missing_ident'}) + self.querier.used_arguments = [] + self.querier.mails = lambda x: self.querier.used_arguments.append(x) listener.newMessages(10, 5) - verify(querier, times=1).idents_by_mailbox('INBOX') - self.assertIn({'missing_ident'}, querier.used_arguments) + verify(self.querier, times=1).idents_by_mailbox('INBOX') + self.assertIn({'missing_ident'}, self.querier.used_arguments) |