[refactor] goodbye mailboxes.py and mailbox.py

All responsabilities are now provided by mail_store.
-- Issue #440

3 files changed, 4 insertions, 92 deletions

diff --git a/service/test/unit/adapter/test_mail_service.py b/service/test/unit/adapter/test_mail_service.py
index 43fd21d1..79161a04 100644
--- a/service/test/unit/adapter/test_mail_service.py
+++ b/service/test/unit/adapter/test_mail_service.py
@@ -121,12 +121,12 @@ class TestMailService(unittest.TestCase):
 
         verify(self.mail_store).move_mail_to_mailbox(1, 'TRASH')
 
+    @defer.inlineCallbacks
     def test_recover_mail(self):
         mail_to_recover = PixelatedMail.from_soledad(*leap_mail(), soledad_querier=None)
         when(self.mail_service).mail(1).thenReturn(mail_to_recover)
-        when(self.mailboxes).move_to_inbox(1).thenReturn(mail_to_recover)
+        when(self.mail_store).move_mail_to_mailbox(1, 'INBOX').thenReturn(mail_to_recover)
 
-        self.mail_service.recover_mail(1)
+        yield self.mail_service.recover_mail(1)
 
-        verify(self.mailboxes).move_to_inbox(1)
-        verify(self.search_engine).index_mail(mail_to_recover)
+        verify(self.mail_store).move_mail_to_mailbox(1, 'INBOX')
diff --git a/service/test/unit/adapter/test_mailbox.py b/service/test/unit/adapter/test_mailbox.py
deleted file mode 100644
index e3e02f04..00000000
--- a/service/test/unit/adapter/test_mailbox.py
+++ /dev/null
@@ -1,44 +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 <http://www.gnu.org/licenses/>.
-from twisted.trial import unittest
-
-from pixelated.adapter.model.mail import PixelatedMail
-from pixelated.adapter.services.mailbox import Mailbox
-from mockito import mock, when, verify
-from test.support import test_helper
-from twisted.internet import defer
-
-
-class PixelatedMailboxTest(unittest.TestCase):
-    def setUp(self):
-        self.querier = mock()
-        self.search_engine = mock()
-        self.mailbox = Mailbox('INBOX', self.querier, self.search_engine)
-
-    def test_remove_message_from_mailbox(self):
-        mail = PixelatedMail.from_soledad(*test_helper.leap_mail(), soledad_querier=self.querier)
-        when(self.querier).mail(1).thenReturn(mail)
-
-        self.mailbox.remove(1)
-
-        verify(self.querier).remove_mail(mail)
-
-    @defer.inlineCallbacks
-    def test_fresh_mailbox_checking_lastuid(self):
-        when(self.querier).get_lastuid('INBOX').thenReturn(0)
-        self.assertTrue(self.mailbox.fresh)
-        when(self.querier).get_lastuid('INBOX').thenReturn(1)
-        self.assertFalse((yield self.mailbox.fresh))
diff --git a/service/test/unit/adapter/test_mailboxes.py b/service/test/unit/adapter/test_mailboxes.py
deleted file mode 100644
index efd3df6b..00000000
--- a/service/test/unit/adapter/test_mailboxes.py
+++ /dev/null
@@ -1,44 +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 <http://www.gnu.org/licenses/>.
-import unittest
-
-from pixelated.adapter.model.mail import PixelatedMail
-from pixelated.adapter.services.mailboxes import Mailboxes
-from mockito import mock, when, verify
-from twisted.internet import defer
-from test.support import test_helper
-from mock import MagicMock
-
-
-class PixelatedMailboxesTest(unittest.TestCase):
-
-    def setUp(self):
-        self.querier = mock()
-        self.mail_store = mock()
-        self.search_engine = mock()
-        self.account = MagicMock()
-        self.mailboxes = Mailboxes(self.account, self.mail_store, self.querier, self.search_engine)
-
-    @defer.inlineCallbacks
-    def test_move_to_inbox(self):
-        mail = PixelatedMail.from_soledad(*test_helper.leap_mail(), soledad_querier=self.querier)
-        when(self.querier).mail(1).thenReturn(mail)
-        when(mail).save().thenReturn(None)
-
-        mail.set_mailbox('TRASH')
-        recovered_mail = yield self.mailboxes.move_to_inbox(1)
-        self.assertEquals('INBOX', recovered_mail.mailbox_name)
-        verify(mail).save()