Refactoring tags functionality into TagService

3 files changed, 65 insertions, 59 deletions

diff --git a/service/test/adapter/mail_service_test.py b/service/test/adapter/mail_service_test.py
index b6082b45..e96b7e11 100644
--- a/service/test/adapter/mail_service_test.py
+++ b/service/test/adapter/mail_service_test.py
@@ -25,15 +25,6 @@ class TestMailService(unittest.TestCase):
         self.mail_sender = mock()
         self.mail_service = MailService(self.mailboxes, self.mail_sender)
 
-    def test_search_without_query_returns_unfiltered_mailbox(self):
-        mailbox_inbox = mock()
-        when(mailbox_inbox).mails().thenReturn(["mail"])
-        when(self.mailboxes).inbox().thenReturn(mailbox_inbox)
-
-        mails = self.mail_service.mails({'tags': {}})
-
-        self.assertEqual(1, len(mails))
-
     def test_send_mail(self):
         mail = "mail"
 
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)
diff --git a/service/test/adapter/test_tag_service.py b/service/test/adapter/test_tag_service.py
new file mode 100644
index 00000000..20888092
--- /dev/null
+++ b/service/test/adapter/test_tag_service.py
@@ -0,0 +1,59 @@
+#
+# 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
+import tempfile
+import test_helper
+from pixelated.adapter.tag import Tag
+from pixelated.adapter.pixelated_mail import PixelatedMail
+from pixelated.adapter.tag_index import TagIndex
+from pixelated.adapter.tag_service import TagService
+
+
+class TagServiceTest(unittest.TestCase):
+    def setUp(self):
+        self.index_file_handler, self.index_file_path = tempfile.mkstemp()
+        self.tag_index = TagIndex(self.index_file_path)
+        self.tag_service = TagService(tag_index=self.tag_index)
+
+    def test_index_is_initialized_with_mail_tags_if_empty(self):
+        mail_one = PixelatedMail.from_leap_mail(test_helper.leap_mail(uid=0, extra_headers={'X-Tags': ['tag_1']}))
+        mail_two = PixelatedMail.from_leap_mail(test_helper.leap_mail(uid=1, extra_headers={'X-Tags': ['tag_2']}))
+        mails = [mail_one, mail_two]
+
+        self.tag_service.load_index(mails)
+
+        self.assertEqual(self.tag_service.all_tags(), {Tag('sent'), Tag('inbox'), Tag('drafts'), Tag('trash'), Tag('tag_1'), Tag('tag_2')})
+
+    def test_special_tags_always_exists(self):
+        self.tag_service.load_index([])
+
+        self.assertEqual(self.tag_service.all_tags(), {Tag('sent'), Tag('inbox'), Tag('drafts'), Tag('trash')})
+
+    def test_notify_tags_updated_method_properly_changes_tags_state(self):
+        mail_ident = 12
+        tag = Tag('one_tag')
+        tag.increment(mail_ident)
+        self.tag_service.load_index([])
+        self.tag_service.tag_index.set(tag)
+
+        self.assertEquals(0, self.tag_service.tag_index.get('inbox').total)
+        self.assertEquals(1, self.tag_service.tag_index.get('one_tag').total)
+
+        self.tag_service.notify_tags_updated(set(['inbox']), set(['one_tag']), mail_ident)
+
+        self.assertEquals(1, self.tag_service.tag_index.get('inbox').total)
+        self.assertIsNone(self.tag_service.tag_index.get('one_tag'))