getting rid of "pixelated" in the names of many classes - redundant

6 files changed, 31 insertions, 30 deletions

diff --git a/service/test/unit/adapter/pixelated_mail_sender_test.py b/service/test/unit/adapter/mail_sender_test.py
index 01de1cb0..721d61b7 100644
--- a/service/test/unit/adapter/pixelated_mail_sender_test.py
+++ b/service/test/unit/adapter/mail_sender_test.py
@@ -16,16 +16,16 @@
 import unittest
 
 from pixelated.adapter.mail import PixelatedMail
-from pixelated.adapter.pixelated_mail_sender import PixelatedMailSender
+from pixelated.adapter.mail_sender import MailSender
 from mockito import *
 from test.support import test_helper
 
 
-class PixelatedMailSenderTest(unittest.TestCase):
+class MailSenderTest(unittest.TestCase):
     def setUp(self):
         self.mail_address = "pixelated@pixelated.org"
         self.smtp_client = mock()
-        self.mail_sender = PixelatedMailSender(self.mail_address, self.smtp_client)
+        self.mail_sender = MailSender(self.mail_address, self.smtp_client)
 
     def test_send_mail_sends_to_To_Cc_and_Bcc(self):
         headers = {
diff --git a/service/test/unit/adapter/pixelated_mail_test.py b/service/test/unit/adapter/mail_test.py
index 20038e96..20038e96 100644
--- a/service/test/unit/adapter/pixelated_mail_test.py
+++ b/service/test/unit/adapter/mail_test.py
diff --git a/service/test/unit/adapter/listener_test.py b/service/test/unit/adapter/mailbox_indexer_listener_test.py
index e131aebd..1f28ec7b 100644
--- a/service/test/unit/adapter/listener_test.py
+++ b/service/test/unit/adapter/mailbox_indexer_listener_test.py
@@ -16,7 +16,7 @@
 import unittest
 
 from mockito import *
-from pixelated.adapter.listener import MailboxListener
+from pixelated.adapter.mailbox_indexer_listener import MailboxIndexerListener
 
 
 class MailboxListenerTest(unittest.TestCase):
@@ -32,19 +32,19 @@ class MailboxListenerTest(unittest.TestCase):
         mailbox.listeners = set()
         when(mailbox).addListener = lambda x: mailbox.listeners.add(x)
 
-        self.assertNotIn(MailboxListener('INBOX', self.querier), mailbox.listeners)
+        self.assertNotIn(MailboxIndexerListener('INBOX', self.querier), mailbox.listeners)
 
-        MailboxListener.listen(self.account, 'INBOX', self.querier)
+        MailboxIndexerListener.listen(self.account, 'INBOX', self.querier)
 
-        self.assertIn(MailboxListener('INBOX', self.querier), mailbox.listeners)
+        self.assertIn(MailboxIndexerListener('INBOX', self.querier), mailbox.listeners)
 
     def test_reindex_missing_idents(self):
         search_engine = mock()
         when(search_engine).search('tag:inbox').thenReturn(['ident1', 'ident2'])
 
-        MailboxListener.SEARCH_ENGINE = search_engine
+        MailboxIndexerListener.SEARCH_ENGINE = search_engine
 
-        listener = MailboxListener('INBOX', self.querier)
+        listener = MailboxIndexerListener('INBOX', self.querier)
         when(self.querier).idents_by_mailbox('INBOX').thenReturn({'ident1', 'ident2', 'missing_ident'})
         self.querier.used_arguments = []
         self.querier.mails = lambda x: self.querier.used_arguments.append(x)
diff --git a/service/test/unit/adapter/pixelated_mailbox_test.py b/service/test/unit/adapter/mailbox_test.py
index 0a007ba6..df46d02d 100644
--- a/service/test/unit/adapter/pixelated_mailbox_test.py
+++ b/service/test/unit/adapter/mailbox_test.py
@@ -16,7 +16,7 @@
 import unittest
 
 from pixelated.adapter.mail import PixelatedMail
-from pixelated.adapter.pixelated_mailbox import PixelatedMailbox
+from pixelated.adapter.mailbox import Mailbox
 from mockito import *
 from test.support import test_helper
 
@@ -25,7 +25,7 @@ class PixelatedMailboxTest(unittest.TestCase):
     def setUp(self):
         self.tag_service = mock()
         self.querier = mock()
-        self.mailbox = PixelatedMailbox('INBOX', self.querier)
+        self.mailbox = Mailbox('INBOX', self.querier)
 
     def test_remove_message_from_mailbox(self):
         mail = PixelatedMail.from_soledad(*test_helper.leap_mail(), soledad_querier=self.querier)
diff --git a/service/test/unit/adapter/pixelated_mailboxes_test.py b/service/test/unit/adapter/mailboxes_test.py
index 3ca8cc2f..cbed4577 100644
--- a/service/test/unit/adapter/pixelated_mailboxes_test.py
+++ b/service/test/unit/adapter/mailboxes_test.py
@@ -16,8 +16,8 @@
 import unittest
 
 from mockito import *
-from pixelated.adapter.pixelated_mailbox import PixelatedMailbox
-from pixelated.adapter.pixelated_mailboxes import PixelatedMailBoxes
+from pixelated.adapter.mailbox import Mailbox
+from pixelated.adapter.mailboxes import Mailboxes
 
 
 class PixelatedMailboxesTest(unittest.TestCase):
@@ -28,7 +28,7 @@ class PixelatedMailboxesTest(unittest.TestCase):
         self.account.mailboxes = []
         self.drafts_mailbox = mock()
         self.drafts_mailbox.mailbox_name = 'drafts'
-        self.mailboxes = PixelatedMailBoxes(self.account, self.querier)
+        self.mailboxes = Mailboxes(self.account, self.querier)
         self.mailboxes.drafts = lambda: self.drafts_mailbox
 
     def test_search_for_tags(self):
@@ -37,7 +37,7 @@ class PixelatedMailboxesTest(unittest.TestCase):
 
         tags_to_search_for = {'tags': ['inbox', 'custom_tag']}
 
-        when(PixelatedMailbox).create('INBOX', self.querier).thenReturn(mailbox)
+        when(Mailbox).create('INBOX', self.querier).thenReturn(mailbox)
         when(mailbox).mails_by_tags(any(list)).thenReturn(["mail"])
 
         mails = self.mailboxes.mails_by_tag(tags_to_search_for['tags'])
diff --git a/service/test/unit/user_agent_test.py b/service/test/unit/runserver_test.py
index bd875dcc..1e735bf7 100644
--- a/service/test/unit/user_agent_test.py
+++ b/service/test/unit/runserver_test.py
@@ -17,42 +17,43 @@
 import unittest
 import sys
 
-import pixelated.user_agent
+import pixelated.runserver
 from mockito import *
 import crochet
 import pixelated.config.reactor_manager as reactor_manager
-import pixelated.adapter.pixelated_mail
+import pixelated.adapter.mail
 import os
+import pixelated.config.app_factory as app_factory
 
 
-class UserAgentTest(unittest.TestCase):
+class RunserverTest(unittest.TestCase):
 
     def test_that_default_config_file_is_home_dot_pixelated(self):
-        orig_config = pixelated.user_agent.app.config
+        orig_config = pixelated.runserver.app.config
         try:
             when(crochet).setup().thenReturn(None)
             when(reactor_manager).start_reactor().thenReturn(None)
-            when(pixelated.user_agent).start_user_agent().thenReturn(None)
-            pixelated.user_agent.app.config = mock()
+            when(app_factory).create_app().thenReturn(None)
+            pixelated.runserver.app.config = mock()
 
             sys.argv = ['/tmp/does_not_exist']
-            pixelated.user_agent.setup()
+            pixelated.runserver.setup()
 
-            verify(pixelated.user_agent.app.config).from_pyfile(os.path.join(os.environ['HOME'], '.pixelated'))
+            verify(pixelated.runserver.app.config).from_pyfile(os.path.join(os.environ['HOME'], '.pixelated'))
         finally:
-            pixelated.user_agent.app.config = orig_config
+            pixelated.runserver.app.config = orig_config
 
     def test_that_config_file_can_be_specified_on_command_line(self):
-        orig_config = pixelated.user_agent.app.config
+        orig_config = pixelated.runserver.app.config
         try:
             when(crochet).setup().thenReturn(None)
             when(reactor_manager).start_reactor().thenReturn(None)
-            when(pixelated.user_agent).start_user_agent().thenReturn(None)
-            pixelated.user_agent.app.config = mock()
+            when(app_factory).create_app().thenReturn(None)
+            pixelated.runserver.app.config = mock()
 
             sys.argv = ['/tmp/does_not_exist', '--config', '/tmp/some/config/file']
-            pixelated.user_agent.setup()
+            pixelated.runserver.setup()
 
-            verify(pixelated.user_agent.app.config).from_pyfile('/tmp/some/config/file')
+            verify(pixelated.runserver.app.config).from_pyfile('/tmp/some/config/file')
         finally:
-            pixelated.user_agent.app.config = orig_config
+            pixelated.runserver.app.config = orig_config