1 files changed, 6 insertions, 50 deletions
diff --git a/service/test/adapter/pixelated_mailbox_test.py b/service/test/adapter/pixelated_mailbox_test.py
index 6b84616f..6574d407 100644
--- a/service/test/adapter/pixelated_mailbox_test.py
+++ b/service/test/adapter/pixelated_mailbox_test.py
@@ -14,64 +14,20 @@
 # 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
-import os
-
+from mockito import *
 import test_helper
-from pixelated.adapter.tag import Tag
-from pixelated.adapter.tag_index import TagIndex
 from pixelated.adapter.pixelated_mailbox import PixelatedMailbox
 
 
 class TestPixelatedMailbox(unittest.TestCase):
-
     def setUp(self):
-        self.db_file_path = '/tmp/test_tags'
-
-    def tearDown(self):
-        TagIndex(self.db_file_path)._close_db()
-        os.remove(self.db_file_path + '.db')
-
-    def test_special_tags_always_exists(self):
-        mailbox = PixelatedMailbox(test_helper.leap_mailbox(), self.db_file_path)
-        self.assertEquals(mailbox.SPECIAL_TAGS, mailbox.all_tags())
-
-    def test_retrieve_all_tags_from_mailbox(self):
-        tag_index = TagIndex(self.db_file_path)
-        tag_index.set(Tag('one_tag'))
-        tag_index.set(Tag('two_tag'))
-        mailbox = PixelatedMailbox(test_helper.leap_mailbox(), self.db_file_path)
-        expected_tags = set([Tag('one_tag'), Tag('two_tag')]).union(mailbox.SPECIAL_TAGS)
-        self.assertEquals(expected_tags, mailbox.all_tags())
-
-    def test_notify_tags_updated_method_properly_changes_tags_state(self):
-        tag_index = TagIndex(self.db_file_path)
-        tag = Tag('one_tag')
-        tag.increment(12)
-        tag_index.set(tag)
-        mailbox = PixelatedMailbox(test_helper.leap_mailbox(), self.db_file_path)
-        self.assertEquals(0, mailbox.tag_index.get('inbox').total)
-        self.assertEquals(1, mailbox.tag_index.get('one_tag').total)
-
-        mailbox.notify_tags_updated(set(['inbox']), set(['one_tag']), 12)
-
-        self.assertEquals(1, mailbox.tag_index.get('inbox').total)
-        self.assertIsNone(mailbox.tag_index.get('one_tag'))
-
-    def test_mailbox_tag_is_added_when_new_mail_arrives(self):
         mail_one = test_helper.leap_mail(uid=0, mbox='SENT')
-
         leap_mailbox = test_helper.leap_mailbox(messages=[mail_one], mailbox_name='SENT')
-        mailbox = PixelatedMailbox(leap_mailbox, self.db_file_path)
-
-        from pixelated.support.id_gen import gen_pixelated_uid
-        mail = mailbox.mail(gen_pixelated_uid('SENT', 0))
-        self.assertIn('sent', mail.tags)
 
-    def test_index_is_initialized_with_mail_tags_if_empty(self):
-        mail_one = test_helper.leap_mail(uid=0, extra_headers={'X-Tags': ['tag_1']})
-        mail_two = test_helper.leap_mail(uid=1, extra_headers={'X-Tags': ['tag_2']})
+        self.tag_service = mock()
+        self.mailbox = PixelatedMailbox(leap_mailbox, self.tag_service)
 
-        leap_mailbox = test_helper.leap_mailbox(messages=[mail_one, mail_two])
+    def test_mailbox_tag_is_added_when_new_mail_arrives(self):
+        mails = self.mailbox.mails()
 
-        mailbox = PixelatedMailbox(leap_mailbox, self.db_file_path)
-        self.assertEquals(set([Tag('tag_1'), Tag('tag_2'), Tag('inbox'), Tag('sent'), Tag('drafts'), Tag('trash')]), mailbox.all_tags())
+        self.assertIn('sent', mails[0].tags)