From 667c75e1af204dec1ab6b64c575ff17ffa2458aa Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Tue, 23 Dec 2014 15:28:28 -0200 Subject: deleting unused code --- service/pixelated/adapter/services/mailbox.py | 13 ------ .../adapter/soledad/soledad_reader_mixin.py | 4 -- service/test/unit/adapter/mailboxes_test.py | 46 ---------------------- 3 files changed, 63 deletions(-) delete mode 100644 service/test/unit/adapter/mailboxes_test.py (limited to 'service') diff --git a/service/pixelated/adapter/services/mailbox.py b/service/pixelated/adapter/services/mailbox.py index 508dec31..40d9cb8e 100644 --- a/service/pixelated/adapter/services/mailbox.py +++ b/service/pixelated/adapter/services/mailbox.py @@ -22,19 +22,6 @@ class Mailbox: self.mailbox_tag = mailbox_name.lower() self.querier = querier - def mails(self): - _mails = self.querier.all_mails_by_mailbox(self.mailbox_name) - - result = [] - for mail in _mails: - result.append(mail) - return result - - def mails_by_tags(self, tags): - if 'all' in tags or self.mailbox_tag in tags: - return self.mails() - return [mail for mail in self.mails() if len(mail.tags.intersection(tags)) > 0] - def mail(self, mail_id): return self.querier.mail(mail_id) diff --git a/service/pixelated/adapter/soledad/soledad_reader_mixin.py b/service/pixelated/adapter/soledad/soledad_reader_mixin.py index d0bd2053..9cb20a9a 100644 --- a/service/pixelated/adapter/soledad/soledad_reader_mixin.py +++ b/service/pixelated/adapter/soledad/soledad_reader_mixin.py @@ -28,10 +28,6 @@ class SoledadReaderMixin(SoledadDbFacadeMixin, object): return [] return self._build_mails_from_fdocs(fdocs_chash) - def all_mails_by_mailbox(self, mailbox_name): - fdocs_chash = [(fdoc, fdoc.content['chash']) for fdoc in self.get_all_flags_by_mbox(mailbox_name)] - return self._build_mails_from_fdocs(fdocs_chash) - def _build_mails_from_fdocs(self, fdocs_chash): if len(fdocs_chash) == 0: return [] diff --git a/service/test/unit/adapter/mailboxes_test.py b/service/test/unit/adapter/mailboxes_test.py deleted file mode 100644 index 542877d1..00000000 --- a/service/test/unit/adapter/mailboxes_test.py +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (c) 2014 ThoughtWorks, Inc. -# -# Pixelated is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Pixelated 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Pixelated. If not, see . -import unittest - -from mockito import * -from pixelated.adapter.services.mailbox import Mailbox -from pixelated.adapter.services.mailboxes import Mailboxes - - -class PixelatedMailboxesTest(unittest.TestCase): - def setUp(self): - - self.querier = mock() - self.account = mock() - self.account.mailboxes = [] - self.drafts_mailbox = mock() - self.drafts_mailbox.mailbox_name = 'drafts' - self.mailboxes = Mailboxes(self.account, self.querier) - self.mailboxes.drafts = lambda: self.drafts_mailbox - - def test_search_for_tags(self): - mailbox = mock() - self.mailboxes.mailboxes = lambda: [mailbox] - - tags_to_search_for = {'tags': ['inbox', 'custom_tag']} - - when(Mailbox).create('INBOX', self.querier).thenReturn(mailbox) - when(mailbox).mails_by_tags(any(list)).thenReturn(["mail"]) - - mails = self.mailboxes.mails_by_tag(tags_to_search_for['tags']) - - self.assertEqual(1, len(mails)) - self.assertEqual("mail", mails[0]) -- cgit v1.2.3