use test client in test case through composition instead of inheritance

1 files changed, 31 insertions, 31 deletions

diff --git a/service/test/integration/test_search.py b/service/test/integration/test_search.py
index aafcb4fc..c36e29aa 100644
--- a/service/test/integration/test_search.py
+++ b/service/test/integration/test_search.py
@@ -23,10 +23,10 @@ class SearchTest(SoledadTestBase):
     @defer.inlineCallbacks
     def test_that_tags_returns_all_tags(self):
         input_mail = MailBuilder().build_input_mail()
-        mail = yield self.add_mail_to_inbox(input_mail)
-        yield self.mail_service.update_tags(mail.ident, ['important'])
+        mail = yield self.app_test_client.add_mail_to_inbox(input_mail)
+        yield self.app_test_client.mail_service.update_tags(mail.ident, ['important'])
 
-        all_tags = yield self.get_tags()
+        all_tags = yield self.app_test_client.get_tags()
 
         all_tag_names = [t['name'] for t in all_tags]
         self.assertTrue('inbox' in all_tag_names)
@@ -38,10 +38,10 @@ class SearchTest(SoledadTestBase):
     @defer.inlineCallbacks
     def test_that_tags_are_filtered_by_query(self):
         input_mail = MailBuilder().build_input_mail()
-        mail = yield self.add_mail_to_inbox(input_mail)
-        yield self.mail_service.update_tags(mail.ident, ['ateu', 'catoa', 'luat', 'zuado'])
+        mail = yield self.app_test_client.add_mail_to_inbox(input_mail)
+        yield self.app_test_client.mail_service.update_tags(mail.ident, ['ateu', 'catoa', 'luat', 'zuado'])
 
-        all_tags = yield self.get_tags(q=["at"], skipDefaultTags=["true"])
+        all_tags = yield self.app_test_client.get_tags(q=["at"], skipDefaultTags=["true"])
 
         all_tag_names = [t['name'] for t in all_tags]
         self.assertEqual(3, len(all_tag_names))
@@ -52,20 +52,20 @@ class SearchTest(SoledadTestBase):
     @defer.inlineCallbacks
     def test_tags_with_multiple_words_are_searchable(self):
         input_mail = MailBuilder().build_input_mail()
-        mail = yield self.add_mail_to_inbox(input_mail)
-        yield self.mail_service.update_tags(mail.ident, ['one tag four words'])
+        mail = yield self.app_test_client.add_mail_to_inbox(input_mail)
+        yield self.app_test_client.mail_service.update_tags(mail.ident, ['one tag four words'])
 
-        first_page = yield self.get_mails_by_tag('"one tag four words"', page=1, window=1)
+        first_page = yield self.app_test_client.get_mails_by_tag('"one tag four words"', page=1, window=1)
 
         self.assertEqual(len(first_page), 1)
 
     @defer.inlineCallbacks
     def test_that_default_tags_are_ignorable(self):
         input_mail = MailBuilder().build_input_mail()
-        mail = yield self.add_mail_to_inbox(input_mail)
-        yield self.mail_service.update_tags(mail.ident, ['sometag'])
+        mail = yield self.app_test_client.add_mail_to_inbox(input_mail)
+        yield self.app_test_client.mail_service.update_tags(mail.ident, ['sometag'])
 
-        all_tags = yield self.get_tags(skipDefaultTags=["true"])
+        all_tags = yield self.app_test_client.get_tags(skipDefaultTags=["true"])
 
         all_tag_names = [t['name'] for t in all_tags]
         self.assertEqual(1, len(all_tag_names))
@@ -73,12 +73,12 @@ class SearchTest(SoledadTestBase):
 
     @defer.inlineCallbacks
     def test_tags_count(self):
-        yield self.add_multiple_to_mailbox(num=10, mailbox='inbox', flags=['\\Recent'])
-        yield self.add_multiple_to_mailbox(num=5, mailbox='inbox', flags=['\\Seen'])
-        yield self.add_multiple_to_mailbox(num=3, mailbox='inbox', flags=['\\Recent'], tags=['important', 'later'])
-        yield self.add_multiple_to_mailbox(num=1, mailbox='inbox', flags=['\\Seen'], tags=['important'])
+        yield self.app_test_client.add_multiple_to_mailbox(num=10, mailbox='inbox', flags=['\\Recent'])
+        yield self.app_test_client.add_multiple_to_mailbox(num=5, mailbox='inbox', flags=['\\Seen'])
+        yield self.app_test_client.add_multiple_to_mailbox(num=3, mailbox='inbox', flags=['\\Recent'], tags=['important', 'later'])
+        yield self.app_test_client.add_multiple_to_mailbox(num=1, mailbox='inbox', flags=['\\Seen'], tags=['important'])
 
-        tags_count = yield self.get_tags()
+        tags_count = yield self.app_test_client.get_tags()
 
         self.assertEqual(self.get_count(tags_count, 'inbox')['total'], 19)
         self.assertEqual(self.get_count(tags_count, 'inbox')['read'], 6)
@@ -89,10 +89,10 @@ class SearchTest(SoledadTestBase):
     def test_search_mails_different_window(self):
         input_mail = MailBuilder().build_input_mail()
         input_mail2 = MailBuilder().build_input_mail()
-        yield self.add_mail_to_inbox(input_mail)
-        yield self.add_mail_to_inbox(input_mail2)
+        yield self.app_test_client.add_mail_to_inbox(input_mail)
+        yield self.app_test_client.add_mail_to_inbox(input_mail2)
 
-        first_page = yield self.get_mails_by_tag('inbox', page=1, window=1)
+        first_page = yield self.app_test_client.get_mails_by_tag('inbox', page=1, window=1)
 
         self.assertEqual(len(first_page), 1)
 
@@ -100,11 +100,11 @@ class SearchTest(SoledadTestBase):
     def test_search_mails_with_multiple_pages(self):
         input_mail = MailBuilder().build_input_mail()
         input_mail2 = MailBuilder().build_input_mail()
-        mail1 = yield self.add_mail_to_inbox(input_mail)
-        mail2 = yield self.add_mail_to_inbox(input_mail2)
+        mail1 = yield self.app_test_client.add_mail_to_inbox(input_mail)
+        mail2 = yield self.app_test_client.add_mail_to_inbox(input_mail2)
 
-        first_page = yield self.get_mails_by_tag('inbox', page=1, window=1)
-        second_page = yield self.get_mails_by_tag('inbox', page=2, window=1)
+        first_page = yield self.app_test_client.get_mails_by_tag('inbox', page=1, window=1)
+        second_page = yield self.app_test_client.get_mails_by_tag('inbox', page=2, window=1)
 
         idents = [mail1.ident, mail2.ident]
 
@@ -114,8 +114,8 @@ class SearchTest(SoledadTestBase):
     @defer.inlineCallbacks
     def test_page_zero_fetches_first_page(self):
         input_mail = MailBuilder().build_input_mail()
-        mail = yield self.add_mail_to_inbox(input_mail)
-        page = yield self.get_mails_by_tag('inbox', page=0, window=1)
+        mail = yield self.app_test_client.add_mail_to_inbox(input_mail)
+        page = yield self.app_test_client.get_mails_by_tag('inbox', page=0, window=1)
         self.assertEqual(page[0].ident, mail.ident)
 
     def get_count(self, tags_count, mailbox):
@@ -128,10 +128,10 @@ 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()
 
-        mail1 = yield self.add_mail_to_inbox(input_mail)
-        mail2 = yield self.add_mail_to_inbox(input_mail2)
+        mail1 = yield self.app_test_client.add_mail_to_inbox(input_mail)
+        mail2 = yield self.app_test_client.add_mail_to_inbox(input_mail2)
 
-        results = yield self.get_mails_by_tag('inbox')
+        results = yield self.app_test_client.get_mails_by_tag('inbox')
         self.assertEqual(results[0].ident, mail2.ident)
         self.assertEqual(results[1].ident, mail1.ident)
 
@@ -140,8 +140,8 @@ class SearchTest(SoledadTestBase):
         body = u'bl\xe1'
         input_mail = MailBuilder().with_body(body.encode('utf-8')).build_input_mail()
 
-        mail = yield self.add_mail_to_inbox(input_mail)
-        results = yield self.search(body)
+        mail = yield self.app_test_client.add_mail_to_inbox(input_mail)
+        results = yield self.app_test_client.search(body)
 
         self.assertGreater(len(results), 0, 'No results returned from search')
         self.assertEquals(results[0].ident, mail.ident)