diff --git a/orm/services/audit_trail_manager/audit_server/controllers/v1/transaction.py b/orm/services/audit_trail_manager/audit_server/controllers/v1/transaction.py index 40b27c97..11718acb 100755 --- a/orm/services/audit_trail_manager/audit_server/controllers/v1/transaction.py +++ b/orm/services/audit_trail_manager/audit_server/controllers/v1/transaction.py @@ -4,9 +4,9 @@ import base import logging import wsme -from audit_server.model.transaction import Model as TransactionModel -from audit_server.model.transaction_query import Model as QueryModel -from audit_server.services import transaction as transaction_service +from orm.services.audit_trail_manager.audit_server.model.transaction import Model as TransactionModel +from orm.services.audit_trail_manager.audit_server.model.transaction_query import Model as QueryModel +from orm.services.audit_trail_manager.audit_server.services import transaction as transaction_service from pecan import rest from wsme import types as wtypes from wsmeext.pecan import wsexpose diff --git a/orm/services/audit_trail_manager/audit_server/services/transaction.py b/orm/services/audit_trail_manager/audit_server/services/transaction.py index f96a56b2..c8534ef6 100644 --- a/orm/services/audit_trail_manager/audit_server/services/transaction.py +++ b/orm/services/audit_trail_manager/audit_server/services/transaction.py @@ -2,9 +2,9 @@ import logging -from audit_server.model.transaction_query_result import \ +from orm.services.audit_trail_manager.audit_server.model.transaction_query_result import \ Model as QueryResultModel -from audit_server.storage import factory +from orm.services.audit_trail_manager.audit_server.storage import factory logger = logging.getLogger(__name__) diff --git a/orm/services/audit_trail_manager/audit_server/storage/factory.py b/orm/services/audit_trail_manager/audit_server/storage/factory.py index cd4e2243..2fcddee0 100644 --- a/orm/services/audit_trail_manager/audit_server/storage/factory.py +++ b/orm/services/audit_trail_manager/audit_server/storage/factory.py @@ -1,7 +1,7 @@ """factory module.""" -from audit_server.storage.mysql.transaction import Connection as Transaction +from orm.services.audit_trail_manager.audit_server.storage.mysql.transaction import Connection as Transaction database_url = 'NA' echo_statements = False diff --git a/orm/services/audit_trail_manager/audit_server/storage/mysql/transaction.py b/orm/services/audit_trail_manager/audit_server/storage/mysql/transaction.py index b44960f3..49790901 100755 --- a/orm/services/audit_trail_manager/audit_server/storage/mysql/transaction.py +++ b/orm/services/audit_trail_manager/audit_server/storage/mysql/transaction.py @@ -2,8 +2,8 @@ import logging -from audit_server.model.transaction import Model -from audit_server.storage import transaction +from orm.services.audit_trail_manager.audit_server.model.transaction import Model +from orm.services.audit_trail_manager.audit_server.storage import transaction from sqlalchemy import BigInteger, Column, Integer, Text, asc, create_engine from sqlalchemy.exc import IntegrityError from sqlalchemy.ext.declarative.api import declarative_base diff --git a/orm/services/audit_trail_manager/audit_server/tests/controllers/v1/functional_test.py b/orm/services/audit_trail_manager/audit_server/tests/controllers/v1/functional_test.py deleted file mode 100644 index 0ad6b225..00000000 --- a/orm/services/audit_trail_manager/audit_server/tests/controllers/v1/functional_test.py +++ /dev/null @@ -1,10 +0,0 @@ -"""functional_test module.""" - - -from audit_server.tests.controllers.functional_test import FunctionalTest - - -class FunctionalTest(FunctionalTest): - """base functional test class.""" - - PATH_PREFIX = '/v1' diff --git a/orm/services/audit_trail_manager/audit_server/tests/controllers/functional_test.py b/orm/tests/functional/audit_server/functional_test.py similarity index 100% rename from orm/services/audit_trail_manager/audit_server/tests/controllers/functional_test.py rename to orm/tests/functional/audit_server/functional_test.py diff --git a/orm/services/audit_trail_manager/audit_server/tests/controllers/v1/test_configuration.py b/orm/tests/functional/audit_server/test_configuration.py similarity index 100% rename from orm/services/audit_trail_manager/audit_server/tests/controllers/v1/test_configuration.py rename to orm/tests/functional/audit_server/test_configuration.py diff --git a/orm/services/audit_trail_manager/audit_server/tests/controllers/v1/test_logs.py b/orm/tests/functional/audit_server/test_logs.py similarity index 100% rename from orm/services/audit_trail_manager/audit_server/tests/controllers/v1/test_logs.py rename to orm/tests/functional/audit_server/test_logs.py diff --git a/orm/services/audit_trail_manager/audit_server/tests/controllers/v1/test_transaction.py b/orm/tests/functional/audit_server/test_transaction.py similarity index 89% rename from orm/services/audit_trail_manager/audit_server/tests/controllers/v1/test_transaction.py rename to orm/tests/functional/audit_server/test_transaction.py index 878efa1d..9639b919 100755 --- a/orm/services/audit_trail_manager/audit_server/tests/controllers/v1/test_transaction.py +++ b/orm/tests/functional/audit_server/test_transaction.py @@ -1,14 +1,14 @@ """test_transaction module.""" - -from audit_server.controllers.v1.transaction import QueryResult -from audit_server.model.transaction import Model as TransactionModel -from audit_server.model.transaction_query_result import \ - Model as TransactionQueryResultModel -from audit_server.services import transaction as transaction_service -from audit_server.tests.controllers.v1.functional_test import FunctionalTest from mock import patch +from orm.services.audit_trail_manager.audit_server.controllers.v1.transaction import QueryResult +from orm.services.audit_trail_manager.audit_server.model.transaction import Model as TransactionModel +from orm.services.audit_trail_manager.audit_server.model.transaction_query_result import \ + Model as TransactionQueryResultModel +from orm.services.audit_trail_manager.audit_server.services import transaction as transaction_service +from orm.services.audit_trail_manager.audit_server.tests.controllers.v1.functional_test import FunctionalTest + class Test(FunctionalTest): """test transaction class.""" diff --git a/orm/services/audit_trail_manager/audit_server/tests/__init__.py b/orm/tests/unit/audit_server/__init__.py similarity index 100% rename from orm/services/audit_trail_manager/audit_server/tests/__init__.py rename to orm/tests/unit/audit_server/__init__.py diff --git a/orm/services/audit_trail_manager/audit_server/tests/controllers/__init__.py b/orm/tests/unit/audit_server/controllers/__init__.py similarity index 100% rename from orm/services/audit_trail_manager/audit_server/tests/controllers/__init__.py rename to orm/tests/unit/audit_server/controllers/__init__.py diff --git a/orm/services/audit_trail_manager/audit_server/tests/controllers/v1/__init__.py b/orm/tests/unit/audit_server/controllers/v1/__init__.py similarity index 100% rename from orm/services/audit_trail_manager/audit_server/tests/controllers/v1/__init__.py rename to orm/tests/unit/audit_server/controllers/v1/__init__.py diff --git a/orm/services/audit_trail_manager/audit_server/tests/controllers/v1/test_base.py b/orm/tests/unit/audit_server/controllers/v1/test_base.py similarity index 79% rename from orm/services/audit_trail_manager/audit_server/tests/controllers/v1/test_base.py rename to orm/tests/unit/audit_server/controllers/v1/test_base.py index 51fff921..813353b3 100644 --- a/orm/services/audit_trail_manager/audit_server/tests/controllers/v1/test_base.py +++ b/orm/tests/unit/audit_server/controllers/v1/test_base.py @@ -3,9 +3,9 @@ import unittest -from audit_server.controllers.v1.base import (ClientSideError, - EntityNotFoundError, - InputValueError) +from orm.services.audit_trail_manager.audit_server.controllers.v1.base import (ClientSideError, + EntityNotFoundError, + InputValueError) class Test(unittest.TestCase): diff --git a/orm/services/audit_trail_manager/audit_server/tests/model/__init__.py b/orm/tests/unit/audit_server/model/__init__.py similarity index 100% rename from orm/services/audit_trail_manager/audit_server/tests/model/__init__.py rename to orm/tests/unit/audit_server/model/__init__.py diff --git a/orm/services/audit_trail_manager/audit_server/tests/model/test_transaction_query_result.py b/orm/tests/unit/audit_server/model/test_transaction_query_result.py similarity index 84% rename from orm/services/audit_trail_manager/audit_server/tests/model/test_transaction_query_result.py rename to orm/tests/unit/audit_server/model/test_transaction_query_result.py index 718fda2f..63ede3bc 100644 --- a/orm/services/audit_trail_manager/audit_server/tests/model/test_transaction_query_result.py +++ b/orm/tests/unit/audit_server/model/test_transaction_query_result.py @@ -3,7 +3,7 @@ import unittest -from audit_server.model.transaction_query_result import \ +from orm.services.audit_trail_manager.audit_server.model.transaction_query_result import \ Model as TransactionQueryResultModel diff --git a/orm/services/audit_trail_manager/audit_server/tests/services/__init__.py b/orm/tests/unit/audit_server/services/__init__.py similarity index 100% rename from orm/services/audit_trail_manager/audit_server/tests/services/__init__.py rename to orm/tests/unit/audit_server/services/__init__.py diff --git a/orm/services/audit_trail_manager/audit_server/tests/services/test_base.py b/orm/tests/unit/audit_server/services/test_base.py similarity index 73% rename from orm/services/audit_trail_manager/audit_server/tests/services/test_base.py rename to orm/tests/unit/audit_server/services/test_base.py index 27810e60..85a377e8 100644 --- a/orm/services/audit_trail_manager/audit_server/tests/services/test_base.py +++ b/orm/tests/unit/audit_server/services/test_base.py @@ -3,7 +3,7 @@ import unittest -from audit_server.services.base import Error +from orm.services.audit_trail_manager.audit_server.services.base import Error class Test(unittest.TestCase): diff --git a/orm/services/audit_trail_manager/audit_server/tests/services/test_transaction.py b/orm/tests/unit/audit_server/services/test_transaction.py similarity index 84% rename from orm/services/audit_trail_manager/audit_server/tests/services/test_transaction.py rename to orm/tests/unit/audit_server/services/test_transaction.py index 25da2871..5a502b37 100755 --- a/orm/services/audit_trail_manager/audit_server/tests/services/test_transaction.py +++ b/orm/tests/unit/audit_server/services/test_transaction.py @@ -1,12 +1,12 @@ """test_transaction module.""" +from mock import patch import unittest -from audit_server.model.transaction import Model as TransactionModel -from audit_server.model.transaction_query import Model as TransactionQuery -from audit_server.services import transaction as TransactionService -from audit_server.storage import factory -from mock import patch +from orm.services.audit_trail_manager.audit_server.model.transaction import Model as TransactionModel +from orm.services.audit_trail_manager.audit_server.model.transaction_query import Model as TransactionQuery +from orm.services.audit_trail_manager.audit_server.services import transaction as TransactionService +from orm.services.audit_trail_manager.audit_server.storage import factory class Test(unittest.TestCase): diff --git a/orm/services/audit_trail_manager/audit_server/tests/storage/__init__.py b/orm/tests/unit/audit_server/storage/__init__.py similarity index 100% rename from orm/services/audit_trail_manager/audit_server/tests/storage/__init__.py rename to orm/tests/unit/audit_server/storage/__init__.py diff --git a/orm/services/audit_trail_manager/audit_server/tests/storage/mysql/__init__.py b/orm/tests/unit/audit_server/storage/mysql/__init__.py similarity index 100% rename from orm/services/audit_trail_manager/audit_server/tests/storage/mysql/__init__.py rename to orm/tests/unit/audit_server/storage/mysql/__init__.py diff --git a/orm/services/audit_trail_manager/audit_server/tests/storage/mysql/test_transaction.py b/orm/tests/unit/audit_server/storage/mysql/test_transaction.py similarity index 96% rename from orm/services/audit_trail_manager/audit_server/tests/storage/mysql/test_transaction.py rename to orm/tests/unit/audit_server/storage/mysql/test_transaction.py index 9105f1f9..a5f6c9fa 100755 --- a/orm/services/audit_trail_manager/audit_server/tests/storage/mysql/test_transaction.py +++ b/orm/tests/unit/audit_server/storage/mysql/test_transaction.py @@ -2,9 +2,9 @@ import unittest -from audit_server.model.transaction import Model as TransactionModel -from audit_server.model.transaction_query import Model as TransactionQueryModel -from audit_server.storage.mysql.transaction import Connection, Record +from orm.services.audit_trail_manager.audit_server.model.transaction import Model as TransactionModel +from orm.services.audit_trail_manager.audit_server.model.transaction_query import Model as TransactionQueryModel +from orm.services.audit_trail_manager.audit_server.storage.mysql.transaction import Connection, Record from mock import patch from sqlalchemy import create_engine from sqlalchemy.exc import IntegrityError diff --git a/orm/services/audit_trail_manager/audit_server/tests/storage/test_factory.py b/orm/tests/unit/audit_server/storage/test_factory.py similarity index 82% rename from orm/services/audit_trail_manager/audit_server/tests/storage/test_factory.py rename to orm/tests/unit/audit_server/storage/test_factory.py index 0ddc3fd6..689ddf95 100644 --- a/orm/services/audit_trail_manager/audit_server/tests/storage/test_factory.py +++ b/orm/tests/unit/audit_server/storage/test_factory.py @@ -1,11 +1,11 @@ """test_factory module.""" -import unittest - -from audit_server.storage import factory -from audit_server.storage.mysql.transaction import Connection from mock import patch from sqlalchemy import create_engine +import unittest + +from orm.services.audit_trail_manager.audit_server.storage import factory +from orm.services.audit_trail_manager.audit_server.storage.mysql.transaction import Connection class Test(unittest.TestCase): diff --git a/orm/services/audit_trail_manager/audit_server/tests/storage/test_transaction.py b/orm/tests/unit/audit_server/storage/test_transaction.py similarity index 88% rename from orm/services/audit_trail_manager/audit_server/tests/storage/test_transaction.py rename to orm/tests/unit/audit_server/storage/test_transaction.py index 45a5dc28..8d13b271 100644 --- a/orm/services/audit_trail_manager/audit_server/tests/storage/test_transaction.py +++ b/orm/tests/unit/audit_server/storage/test_transaction.py @@ -3,7 +3,7 @@ import unittest -from audit_server.storage.transaction import Base +from orm.services.audit_trail_manager.audit_server.storage.transaction import Base class Test(unittest.TestCase):