Made LeapMail compatible with SearchEngine.

4 files changed, 21 insertions, 12 deletions

diff --git a/service/test/integration/test_leap_mailstore.py b/service/test/integration/test_leap_mailstore.py
index 614d75cc..f111d2b1 100644
--- a/service/test/integration/test_leap_mailstore.py
+++ b/service/test/integration/test_leap_mailstore.py
@@ -29,7 +29,7 @@ class LeapMailStoreTest(SoledadTestBase):
         mail_id = yield self._create_mail_in_soledad(mail)
         expected_mail_dict = {'body': u'Dignissimos ducimus veritatis. Est tenetur consequatur quia occaecati. Vel sit sit voluptas.\n\nEarum distinctio eos. Accusantium qui sint ut quia assumenda. Facere dignissimos inventore autem sit amet. Pariatur voluptatem sint est.\n\nUt recusandae praesentium aspernatur. Exercitationem amet placeat deserunt quae consequatur eum. Unde doloremque suscipit quia.\n\n', 'header': {u'date': u'Tue, 21 Apr 2015 08:43:27 +0000 (UTC)', u'to': u'carmel@murazikortiz.name', u'x-tw-pixelated-tags': u'nite, macro, trash', u'from': u'darby.senger@zemlak.biz', u'subject': u'Itaque consequatur repellendus provident sunt quia.'}, 'ident': mail_id, 'tags': set([])}
 
-        result = yield self.store.get_mail(mail_id, include_body=True)
+        result = yield self.mail_store.get_mail(mail_id, include_body=True)
         self.assertIsNotNone(result)
         self.assertEqual(expected_mail_dict, result.as_dict())
 
@@ -38,7 +38,7 @@ class LeapMailStoreTest(SoledadTestBase):
         mail = load_mail_from_file('mbox00000000')
         yield self._create_mail_in_soledad(mail)
 
-        mails = yield self.store.all_mails()
+        mails = yield self.mail_store.all_mails()
 
         self.assertEqual(1, len(mails))
         self.assertEqual('Itaque consequatur repellendus provident sunt quia.', mails[0].subject)
@@ -47,23 +47,23 @@ class LeapMailStoreTest(SoledadTestBase):
     def test_add_and_remove_mail(self):
         yield self.adaptor.initialize_store(self.soledad)
         mail = load_mail_from_file('mbox00000000')
-        yield self.store.add_mailbox('INBOX')
+        yield self.mail_store.add_mailbox('INBOX')
 
-        msg = yield self.store.add_mail('INBOX', mail.as_string())
+        msg = yield self.mail_store.add_mail('INBOX', mail.as_string())
 
-        yield self.store.delete_mail(msg.mail_id)
+        yield self.mail_store.delete_mail(msg.mail_id)
 
-        deleted_msg = yield self.store.get_mail(msg.mail_id)
+        deleted_msg = yield self.mail_store.get_mail(msg.mail_id)
 
         self.assertIsNone(deleted_msg)
 
     @defer.inlineCallbacks
     def test_get_mailbox_mail_ids(self):
         mail = load_mail_from_file('mbox00000000')
-        yield self.store.add_mailbox('INBOX')
-        mail = yield self.store.add_mail('INBOX', mail.as_string())
+        yield self.mail_store.add_mailbox('INBOX')
+        mail = yield self.mail_store.add_mail('INBOX', mail.as_string())
 
-        mails = yield self.store.get_mailbox_mail_ids('INBOX')
+        mails = yield self.mail_store.get_mailbox_mail_ids('INBOX')
 
         self.assertEqual(1, len(mails))
         self.assertEqual(mail.mail_id, mails[0])
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py
index c5e419b1..28d378b3 100644
--- a/service/test/support/integration/app_test_client.py
+++ b/service/test/support/integration/app_test_client.py
@@ -32,6 +32,7 @@ from twisted.internet.defer import succeed
 from twisted.web.resource import getChildForRequest
 from twisted.web.server import Site
 from pixelated.adapter.mailstore import LeapMailStore
+from pixelated.adapter.mailstore.searchable_mailstore import SearchableMailStore
 
 from pixelated.adapter.model.mail import PixelatedMail
 from pixelated.adapter.search import SearchEngine
@@ -65,14 +66,14 @@ class AppTestClient(object):
 
         self.soledad = yield initialize_soledad(tempdir=soledad_test_folder)
 
-        self.mail_store = LeapMailStore(self.soledad)
-
         self.soledad_querier = self._create_soledad_querier(self.soledad, self.INDEX_KEY)
         self.keymanager = mock()
 
         self.search_engine = SearchEngine(self.INDEX_KEY, agent_home=soledad_test_folder)
         self.mail_sender = self._create_mail_sender()
 
+        self.mail_store = SearchableMailStore(LeapMailStore(self.soledad), self.search_engine)
+
         account_ready_cb = defer.Deferred()
         self.account = IMAPAccount(self.ACCOUNT, self.soledad, account_ready_cb)
         yield account_ready_cb
diff --git a/service/test/support/integration/soledad_test_base.py b/service/test/support/integration/soledad_test_base.py
index 1a2645d1..e3e582d2 100644
--- a/service/test/support/integration/soledad_test_base.py
+++ b/service/test/support/integration/soledad_test_base.py
@@ -35,7 +35,6 @@ class SoledadTestBase(unittest.TestCase, AppTestClient):
         self.adaptor = SoledadMailAdaptor()
         self.mbox_uuid = str(uuid4())
         yield self.start_client()
-        self.store = LeapMailStore(self.soledad)
 
     def tearDown(self):
         set_events_enabled(True)
diff --git a/service/test/unit/adapter/mailstore/test_leap_mailstore.py b/service/test/unit/adapter/mailstore/test_leap_mailstore.py
index ed5fce84..4565cc6d 100644
--- a/service/test/unit/adapter/mailstore/test_leap_mailstore.py
+++ b/service/test/unit/adapter/mailstore/test_leap_mailstore.py
@@ -64,6 +64,15 @@ class TestLeapMail(TestCase):
 
         self.assertEqual(body, mail.as_dict()['body'])
 
+    def test_raw_constructed_by_headers_and_body(self):
+        body = 'some body content'
+        mail = LeapMail('doc id', 'INBOX', {'From': 'test@example.test', 'Subject': 'A test Mail', 'To': 'receiver@example.test'}, ('foo', 'bar'), body=body)
+
+        result = mail.raw
+
+        expected_raw = 'To: receiver@example.test\nFrom: test@example.test\nSubject: A test Mail\n\nsome body content'
+        self.assertEqual(expected_raw, result)
+
 
 class TestLeapMailStore(TestCase):
     def setUp(self):