From 66839f191708a0725c8d9841d5266ad13af8ee81 Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Mon, 22 Dec 2014 09:35:01 -0200 Subject: refactoring package structure --- service/test/integration/contacts_test.py | 15 +++++++++++++++ service/test/integration/mark_as_read_unread_test.py | 2 +- service/test/support/integration/app_test_client.py | 12 ++++++------ service/test/support/integration/model.py | 4 ++-- service/test/support/test_helper.py | 2 +- service/test/unit/adapter/draft_service_test.py | 4 ++-- service/test/unit/adapter/mail_service_test.py | 2 +- service/test/unit/adapter/mail_test.py | 2 +- .../test/unit/adapter/mailbox_indexer_listener_test.py | 2 +- service/test/unit/adapter/mailbox_test.py | 4 ++-- service/test/unit/adapter/mailboxes_test.py | 4 ++-- service/test/unit/adapter/soledad_querier_test.py | 2 +- service/test/unit/adapter/test_status.py | 2 +- service/test/unit/adapter/test_tag.py | 2 +- 14 files changed, 37 insertions(+), 22 deletions(-) (limited to 'service/test') diff --git a/service/test/integration/contacts_test.py b/service/test/integration/contacts_test.py index 85d6cd3d..925e5e02 100644 --- a/service/test/integration/contacts_test.py +++ b/service/test/integration/contacts_test.py @@ -1,3 +1,18 @@ +# +# 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 . from nose.twistedtools import deferred from test.support.integration import SoledadTestBase, MailBuilder diff --git a/service/test/integration/mark_as_read_unread_test.py b/service/test/integration/mark_as_read_unread_test.py index 03da404f..86a48e62 100644 --- a/service/test/integration/mark_as_read_unread_test.py +++ b/service/test/integration/mark_as_read_unread_test.py @@ -15,7 +15,7 @@ # along with Pixelated. If not, see . from test.support.integration import * -from pixelated.adapter.status import Status +from pixelated.adapter.model.status import Status class MarkAsReadUnreadTest(SoledadTestBase): diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index 82b34d69..4d444f8d 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -24,15 +24,15 @@ from leap.mail.imap.account import SoledadBackedAccount from leap.soledad.client import Soledad from mock import MagicMock, Mock import os -from pixelated.adapter.draft_service import DraftService -from pixelated.adapter.mail_service import MailService -from pixelated.adapter.mailboxes import Mailboxes -from pixelated.adapter.soledad_querier import SoledadQuerier -from pixelated.adapter.tag_service import TagService +from pixelated.adapter.services.draft_service import DraftService +from pixelated.adapter.services.mail_service import MailService +from pixelated.adapter.services.mailboxes import Mailboxes +from pixelated.adapter.soledad.soledad_querier import SoledadQuerier +from pixelated.adapter.services.tag_service import TagService from pixelated.controllers import FeaturesController, HomeController, MailsController, TagsController, \ SyncInfoController, AttachmentsController, ContactsController import pixelated.runserver -from pixelated.adapter.mail import PixelatedMail +from pixelated.adapter.model.mail import PixelatedMail from pixelated.adapter.search import SearchEngine from test.support.integration.model import MailBuilder diff --git a/service/test/support/integration/model.py b/service/test/support/integration/model.py index e05d74bb..ea5dcad0 100644 --- a/service/test/support/integration/model.py +++ b/service/test/support/integration/model.py @@ -15,8 +15,8 @@ # along with Pixelated. If not, see . import json -from pixelated.adapter.mail import InputMail -from pixelated.adapter.status import Status +from pixelated.adapter.model.mail import InputMail +from pixelated.adapter.model.status import Status class MailBuilder: diff --git a/service/test/support/test_helper.py b/service/test/support/test_helper.py index 881e1e5c..b2d3cf43 100644 --- a/service/test/support/test_helper.py +++ b/service/test/support/test_helper.py @@ -15,7 +15,7 @@ # along with Pixelated. If not, see . from datetime import datetime -from pixelated.adapter.mail import InputMail +from pixelated.adapter.model.mail import InputMail LEAP_FLAGS = ['\\Seen', diff --git a/service/test/unit/adapter/draft_service_test.py b/service/test/unit/adapter/draft_service_test.py index b9f1c267..baa07ce0 100644 --- a/service/test/unit/adapter/draft_service_test.py +++ b/service/test/unit/adapter/draft_service_test.py @@ -1,7 +1,7 @@ import unittest -from pixelated.adapter.mail import InputMail -from pixelated.adapter.draft_service import DraftService +from pixelated.adapter.model.mail import InputMail +from pixelated.adapter.services.draft_service import DraftService import test.support.test_helper as test_helper from mockito import * diff --git a/service/test/unit/adapter/mail_service_test.py b/service/test/unit/adapter/mail_service_test.py index e5085724..6f80c043 100644 --- a/service/test/unit/adapter/mail_service_test.py +++ b/service/test/unit/adapter/mail_service_test.py @@ -15,7 +15,7 @@ # along with Pixelated. If not, see . import unittest -from pixelated.adapter.mail_service import MailService +from pixelated.adapter.services.mail_service import MailService from mockito import * diff --git a/service/test/unit/adapter/mail_test.py b/service/test/unit/adapter/mail_test.py index 13eef91e..e8fd8755 100644 --- a/service/test/unit/adapter/mail_test.py +++ b/service/test/unit/adapter/mail_test.py @@ -16,7 +16,7 @@ import unittest import pixelated.support.date -from pixelated.adapter.mail import PixelatedMail, InputMail +from pixelated.adapter.model.mail import PixelatedMail, InputMail from mockito import * from test.support import test_helper import dateutil.parser as dateparser diff --git a/service/test/unit/adapter/mailbox_indexer_listener_test.py b/service/test/unit/adapter/mailbox_indexer_listener_test.py index 291739e0..65ba8966 100644 --- a/service/test/unit/adapter/mailbox_indexer_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.mailbox_indexer_listener import MailboxIndexerListener +from pixelated.adapter.listeners.mailbox_indexer_listener import MailboxIndexerListener class MailboxListenerTest(unittest.TestCase): diff --git a/service/test/unit/adapter/mailbox_test.py b/service/test/unit/adapter/mailbox_test.py index df46d02d..9725f418 100644 --- a/service/test/unit/adapter/mailbox_test.py +++ b/service/test/unit/adapter/mailbox_test.py @@ -15,8 +15,8 @@ # along with Pixelated. If not, see . import unittest -from pixelated.adapter.mail import PixelatedMail -from pixelated.adapter.mailbox import Mailbox +from pixelated.adapter.model.mail import PixelatedMail +from pixelated.adapter.services.mailbox import Mailbox from mockito import * from test.support import test_helper diff --git a/service/test/unit/adapter/mailboxes_test.py b/service/test/unit/adapter/mailboxes_test.py index cbed4577..542877d1 100644 --- a/service/test/unit/adapter/mailboxes_test.py +++ b/service/test/unit/adapter/mailboxes_test.py @@ -16,8 +16,8 @@ import unittest from mockito import * -from pixelated.adapter.mailbox import Mailbox -from pixelated.adapter.mailboxes import Mailboxes +from pixelated.adapter.services.mailbox import Mailbox +from pixelated.adapter.services.mailboxes import Mailboxes class PixelatedMailboxesTest(unittest.TestCase): diff --git a/service/test/unit/adapter/soledad_querier_test.py b/service/test/unit/adapter/soledad_querier_test.py index 561c4cb8..2cc23750 100644 --- a/service/test/unit/adapter/soledad_querier_test.py +++ b/service/test/unit/adapter/soledad_querier_test.py @@ -18,7 +18,7 @@ import json import base64 import quopri -from pixelated.adapter.soledad_querier import SoledadQuerier +from pixelated.adapter.soledad.soledad_querier import SoledadQuerier from mockito import mock, when, any import os diff --git a/service/test/unit/adapter/test_status.py b/service/test/unit/adapter/test_status.py index e9ead384..5cd0fa1e 100644 --- a/service/test/unit/adapter/test_status.py +++ b/service/test/unit/adapter/test_status.py @@ -15,7 +15,7 @@ # along with Pixelated. If not, see . import unittest -from pixelated.adapter.status import Status +from pixelated.adapter.model.status import Status class TestStatus(unittest.TestCase): diff --git a/service/test/unit/adapter/test_tag.py b/service/test/unit/adapter/test_tag.py index fc14ff49..a4fa819e 100644 --- a/service/test/unit/adapter/test_tag.py +++ b/service/test/unit/adapter/test_tag.py @@ -15,7 +15,7 @@ # along with Pixelated. If not, see . import unittest -from pixelated.adapter.tag import Tag +from pixelated.adapter.model.tag import Tag class TestTag(unittest.TestCase): -- cgit v1.2.3