better organization for integration test support classes

7 files changed, 40 insertions, 43 deletions

diff --git a/service/test/integration/delete_mail_test.py b/service/test/integration/delete_mail_test.py
index 69ab1f03..15232b0d 100644
--- a/service/test/integration/delete_mail_test.py
+++ b/service/test/integration/delete_mail_test.py
@@ -13,9 +13,8 @@
 #
 # 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 test.support.integration_helper import MailBuilder, SoledadTestBase
+from test.support.integration import *
 
 
 class DeleteMailTest(SoledadTestBase):
@@ -28,7 +27,7 @@ class DeleteMailTest(SoledadTestBase):
 
     def test_move_mail_to_trash_when_deleting(self):
         input_mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
-        self.add_mail_to_inbox(input_mail)
+        self.client.add_mail_to_inbox(input_mail)
 
         inbox_mails = self.get_mails_by_tag('inbox')
         self.assertEquals(1, len(inbox_mails))
@@ -41,7 +40,7 @@ class DeleteMailTest(SoledadTestBase):
         self.assertEquals(1, len(trash_mails))
 
     def test_delete_mail_when_trashing_mail_from_trash_mailbox(self):
-        mails = self.add_multiple_to_mailbox(1, 'trash')
+        mails = self.client.add_multiple_to_mailbox(1, 'trash')
         self.delete_mail(mails[0].ident)
 
         trash_mails = self.get_mails_by_tag('trash')
diff --git a/service/test/integration/drafts_test.py b/service/test/integration/drafts_test.py
index 41fda0df..2ba14dfd 100644
--- a/service/test/integration/drafts_test.py
+++ b/service/test/integration/drafts_test.py
@@ -13,9 +13,8 @@
 #
 # 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 test.support.integration_helper import MailBuilder, SoledadTestBase
+from test.support.integration import *
 
 
 class DraftsTest(SoledadTestBase):
diff --git a/service/test/integration/mark_as_read_unread_test.py b/service/test/integration/mark_as_read_unread_test.py
index c04cdbc6..55467e9e 100644
--- a/service/test/integration/mark_as_read_unread_test.py
+++ b/service/test/integration/mark_as_read_unread_test.py
@@ -13,9 +13,8 @@
 #
 # 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 test.support.integration_helper import MailBuilder, SoledadTestBase
+from test.support.integration import *
 from pixelated.adapter.status import Status
 
 
@@ -29,7 +28,7 @@ class MarkAsReadUnreadTest(SoledadTestBase):
 
     def test_mark_single_as_read(self):
         input_mail = MailBuilder().build_input_mail()
-        self.add_mail_to_inbox(input_mail)
+        self.client.add_mail_to_inbox(input_mail)
 
         mails = self.get_mails_by_tag('inbox')
         self.assertNotIn('read', mails[0].status)
@@ -41,7 +40,7 @@ class MarkAsReadUnreadTest(SoledadTestBase):
 
     def test_mark_single_as_unread(self):
         input_mail = MailBuilder().with_status([Status.SEEN]).build_input_mail()
-        self.add_mail_to_inbox(input_mail)
+        self.client.add_mail_to_inbox(input_mail)
 
         self.mark_as_unread(input_mail.ident)
         mail = self.get_mails_by_tag('inbox')[0]
@@ -52,8 +51,8 @@ class MarkAsReadUnreadTest(SoledadTestBase):
         input_mail = MailBuilder().with_status([Status.SEEN]).build_input_mail()
         input_mail2 = MailBuilder().with_status([Status.SEEN]).build_input_mail()
 
-        self.add_mail_to_inbox(input_mail)
-        self.add_mail_to_inbox(input_mail2)
+        self.client.add_mail_to_inbox(input_mail)
+        self.client.add_mail_to_inbox(input_mail2)
 
         self.mark_many_as_unread([input_mail.ident, input_mail2.ident])
 
@@ -66,8 +65,8 @@ class MarkAsReadUnreadTest(SoledadTestBase):
         input_mail = MailBuilder().build_input_mail()
         input_mail2 = MailBuilder().build_input_mail()
 
-        self.add_mail_to_inbox(input_mail)
-        self.add_mail_to_inbox(input_mail2)
+        self.client.add_mail_to_inbox(input_mail)
+        self.client.add_mail_to_inbox(input_mail2)
 
         mails = self.get_mails_by_tag('inbox')
 
@@ -86,8 +85,8 @@ class MarkAsReadUnreadTest(SoledadTestBase):
         input_mail = MailBuilder().build_input_mail()
         input_mail2 = MailBuilder().with_status([Status.SEEN]).build_input_mail()
 
-        self.add_mail_to_inbox(input_mail)
-        self.add_mail_to_inbox(input_mail2)
+        self.client.add_mail_to_inbox(input_mail)
+        self.client.add_mail_to_inbox(input_mail2)
 
         mails = self.get_mails_by_tag('inbox')
 
diff --git a/service/test/integration/retrieve_attachment_test.py b/service/test/integration/retrieve_attachment_test.py
index 4e0e76e0..5f754a27 100644
--- a/service/test/integration/retrieve_attachment_test.py
+++ b/service/test/integration/retrieve_attachment_test.py
@@ -13,9 +13,8 @@
 #
 # 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 test.support.integration_helper import SoledadTestBase
+from test.support.integration.soledad_test_base import SoledadTestBase
 
 
 class RetrieveAttachmentTest(SoledadTestBase):
@@ -35,7 +34,7 @@ class RetrieveAttachmentTest(SoledadTestBase):
                            'phash': ident,
                            'content-type': 'text/plain; charset=US-ASCII; name="attachment_pequeno.txt"'}
 
-        self.add_document_to_soledad(attachment_dict)
+        self.client.add_document_to_soledad(attachment_dict)
 
         attachment = self.get_attachment(ident, 'base64')
 
diff --git a/service/test/integration/search_test.py b/service/test/integration/search_test.py
index 7415b9a1..21326ec7 100644
--- a/service/test/integration/search_test.py
+++ b/service/test/integration/search_test.py
@@ -15,7 +15,7 @@
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 
 from nose.twistedtools import deferred
-from test.support.integration_helper import MailBuilder, SoledadTestBase
+from test.support.integration import *
 
 
 class SearchTest(SoledadTestBase):
@@ -26,7 +26,7 @@ class SearchTest(SoledadTestBase):
     @deferred(timeout=SoledadTestBase.DEFERRED_TIMEOUT)
     def test_that_tags_returns_all_tags(self):
         input_mail = MailBuilder().with_tags(['important']).build_input_mail()
-        self.add_mail_to_inbox(input_mail)
+        self.client.add_mail_to_inbox(input_mail)
 
         d = self.get_tags()
 
@@ -43,7 +43,7 @@ class SearchTest(SoledadTestBase):
     @deferred(timeout=SoledadTestBase.DEFERRED_TIMEOUT)
     def test_that_tags_are_filtered_by_query(self):
         input_mail = MailBuilder().with_tags(['ateu', 'catoa', 'luat', 'zuado']).build_input_mail()
-        self.add_mail_to_inbox(input_mail)
+        self.client.add_mail_to_inbox(input_mail)
 
         d = self.get_tags(q=["at"], skipDefaultTags=["true"])
 
@@ -60,7 +60,7 @@ class SearchTest(SoledadTestBase):
     @deferred(timeout=SoledadTestBase.DEFERRED_TIMEOUT)
     def test_that_default_tags_are_ignorable(self):
         input_mail = MailBuilder().with_tags(['sometag']).build_input_mail()
-        self.add_mail_to_inbox(input_mail)
+        self.client.add_mail_to_inbox(input_mail)
 
         d = self.get_tags(skipDefaultTags=["true"])
 
@@ -73,10 +73,10 @@ class SearchTest(SoledadTestBase):
 
     @deferred(timeout=SoledadTestBase.DEFERRED_TIMEOUT_LONG)
     def test_tags_count(self):
-        self.add_multiple_to_mailbox(num=10, mailbox='inbox', flags=['\\Recent'])
-        self.add_multiple_to_mailbox(num=5, mailbox='inbox', flags=['\\Seen'])
-        self.add_multiple_to_mailbox(num=3, mailbox='inbox', flags=['\\Recent'], tags=['important', 'later'])
-        self.add_multiple_to_mailbox(num=1, mailbox='inbox', flags=['\\Seen'], tags=['important'])
+        self.client.add_multiple_to_mailbox(num=10, mailbox='inbox', flags=['\\Recent'])
+        self.client.add_multiple_to_mailbox(num=5, mailbox='inbox', flags=['\\Seen'])
+        self.client.add_multiple_to_mailbox(num=3, mailbox='inbox', flags=['\\Recent'], tags=['important', 'later'])
+        self.client.add_multiple_to_mailbox(num=1, mailbox='inbox', flags=['\\Seen'], tags=['important'])
 
         d = self.get_tags()
 
@@ -91,8 +91,8 @@ class SearchTest(SoledadTestBase):
     def test_search_mails_different_window(self):
         input_mail = MailBuilder().build_input_mail()
         input_mail2 = MailBuilder().build_input_mail()
-        self.add_mail_to_inbox(input_mail)
-        self.add_mail_to_inbox(input_mail2)
+        self.client.add_mail_to_inbox(input_mail)
+        self.client.add_mail_to_inbox(input_mail2)
 
         first_page = self.get_mails_by_tag('inbox', page=1, window=1)
 
@@ -101,8 +101,8 @@ class SearchTest(SoledadTestBase):
     def test_search_mails_with_multiple_pages(self):
         input_mail = MailBuilder().build_input_mail()
         input_mail2 = MailBuilder().build_input_mail()
-        self.add_mail_to_inbox(input_mail)
-        self.add_mail_to_inbox(input_mail2)
+        self.client.add_mail_to_inbox(input_mail)
+        self.client.add_mail_to_inbox(input_mail2)
 
         first_page = self.get_mails_by_tag('inbox', page=1, window=1)
         second_page = self.get_mails_by_tag('inbox', page=2, window=1)
@@ -114,7 +114,7 @@ class SearchTest(SoledadTestBase):
 
     def test_page_zero_fetches_first_page(self):
         input_mail = MailBuilder().build_input_mail()
-        self.add_mail_to_inbox(input_mail)
+        self.client.add_mail_to_inbox(input_mail)
         page = self.get_mails_by_tag('inbox', page=0, window=1)
         self.assertEqual(page[0].ident, input_mail.ident)
 
@@ -127,8 +127,8 @@ class SearchTest(SoledadTestBase):
         input_mail = MailBuilder().with_date('2014-10-15T15:15').build_input_mail()
         input_mail2 = MailBuilder().with_date('2014-10-15T15:16').build_input_mail()
 
-        self.add_mail_to_inbox(input_mail)
-        self.add_mail_to_inbox(input_mail2)
+        self.client.add_mail_to_inbox(input_mail)
+        self.client.add_mail_to_inbox(input_mail2)
 
         results = self.get_mails_by_tag('inbox')
         self.assertEqual(results[0].ident, input_mail2.ident)
diff --git a/service/test/integration/soledad_querier_test.py b/service/test/integration/soledad_querier_test.py
index e8be431b..4a99a620 100644
--- a/service/test/integration/soledad_querier_test.py
+++ b/service/test/integration/soledad_querier_test.py
@@ -15,9 +15,9 @@
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 
 import copy
-import unittest
 import time
-from test.support.integration_helper import SoledadTestBase, MailBuilder
+
+from test.support.integration import *
 from leap.mail.imap.fields import WithMsgFields
 
 
@@ -25,6 +25,8 @@ class SoledadQuerierTest(SoledadTestBase, WithMsgFields):
 
     def setUp(self):
         SoledadTestBase.setUp(self)
+        self.soledad = self.client.soledad
+        self.soledad_querier = self.client.soledad_querier
 
     def tearDown(self):
         SoledadTestBase.tearDown(self)
@@ -42,7 +44,7 @@ class SoledadQuerierTest(SoledadTestBase, WithMsgFields):
         return [m for m in self.soledad.get_from_index('by-type', 'mbox') if m.content['mbox'] == mailbox_name]
 
     def test_remove_dup_mailboxes_keeps_the_one_with_the_highest_last_uid(self):
-        self.add_multiple_to_mailbox(3, 'INBOX')  # by now we already have one inbox with 3 mails
+        self.client.add_multiple_to_mailbox(3, 'INBOX')  # by now we already have one inbox with 3 mails
         self._create_mailbox('INBOX')  # now we have a duplicate
 
         # make sure we have two
@@ -77,7 +79,7 @@ class SoledadQuerierTest(SoledadTestBase, WithMsgFields):
         self.assertEqual(1, len(mails))
 
     def test_get_mails_by_chash(self):
-        mails = self.add_multiple_to_mailbox(3, 'INBOX')
+        mails = self.client.add_multiple_to_mailbox(3, 'INBOX')
         chashes = [mail.ident for mail in mails]
 
         fetched_mails = self.soledad_querier.mails(chashes)
diff --git a/service/test/integration/tags_test.py b/service/test/integration/tags_test.py
index bb3bdbdb..03d6f4b3 100644
--- a/service/test/integration/tags_test.py
+++ b/service/test/integration/tags_test.py
@@ -14,9 +14,8 @@
 # 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 json
-import unittest
 
-from test.support.integration_helper import MailBuilder, SoledadTestBase
+from test.support.integration import *
 
 
 class TagsTest(SoledadTestBase):
@@ -32,7 +31,7 @@ class TagsTest(SoledadTestBase):
 
     def test_add_tag_to_an_inbox_mail_and_query(self):
         mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
-        self.add_mail_to_inbox(mail)
+        self.client.add_mail_to_inbox(mail)
 
         self.post_tags(mail.ident, self._tags_json(['IMPORTANT']))
 
@@ -44,10 +43,10 @@ class TagsTest(SoledadTestBase):
 
     def test_addition_of_reserved_tags_is_not_allowed(self):
         mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
-        self.add_mail_to_inbox(mail)
+        self.client.add_mail_to_inbox(mail)
 
         response = self.post_tags(mail.ident, self._tags_json(['DRAFTS']))
         self.assertEquals("None of the following words can be used as tags: drafts", response)
 
-        mail = self.mailboxes.inbox().mail(mail.ident)
+        mail = self.client.mailboxes.inbox().mail(mail.ident)
         self.assertNotIn('drafts', mail.tags)