From ccfeedf96725bbf4b5be2cc727f9d8abd3c83384 Mon Sep 17 00:00:00 2001
From: Nicholas Jones <nj762h@att.com>
Date: Tue, 19 Sep 2017 11:28:30 -0500
Subject: [PATCH] Move uuidgen tests to top level directory

Move uuidgen unit tests to orm/tests/ directory

Change-Id: I61bb2b44a73e9c211a3b8f50e9f3dfa4287b151c
---
 .../tests => tests/functional/uuidgen}/test_functional.py   | 6 ++++--
 .../uuidgen/tests => tests/unit/uuidgen}/__init__.py        | 0
 .../uuidgen/tests => tests/unit/uuidgen}/config.py          | 4 ++--
 .../tests => tests/unit/uuidgen}/test_configuration.py      | 4 ++--
 .../uuidgen/tests => tests/unit/uuidgen}/test_logs.py       | 5 ++---
 5 files changed, 10 insertions(+), 9 deletions(-)
 rename orm/{services/id_generator/uuidgen/tests => tests/functional/uuidgen}/test_functional.py (97%)
 rename orm/{services/id_generator/uuidgen/tests => tests/unit/uuidgen}/__init__.py (100%)
 rename orm/{services/id_generator/uuidgen/tests => tests/unit/uuidgen}/config.py (91%)
 rename orm/{services/id_generator/uuidgen/tests => tests/unit/uuidgen}/test_configuration.py (77%)
 rename orm/{services/id_generator/uuidgen/tests => tests/unit/uuidgen}/test_logs.py (78%)

diff --git a/orm/services/id_generator/uuidgen/tests/test_functional.py b/orm/tests/functional/uuidgen/test_functional.py
similarity index 97%
rename from orm/services/id_generator/uuidgen/tests/test_functional.py
rename to orm/tests/functional/uuidgen/test_functional.py
index 1e847f37..399c9363 100755
--- a/orm/services/id_generator/uuidgen/tests/test_functional.py
+++ b/orm/tests/functional/uuidgen/test_functional.py
@@ -1,9 +1,11 @@
 import json
 import re
 
+import orm.services.id_generator.uuidgen as uuidgen
+import orm.services.id_generator.uuidgen.controllers.v1.uuid_controller as uuid_controller
+from orm.tests.unit.uuidgen import FunctionalTest
+
 import mock
-import uuidgen.controllers.v1.uuid_controller as uuid_controller
-from uuidgen.tests import FunctionalTest
 
 
 class MyException(Exception):
diff --git a/orm/services/id_generator/uuidgen/tests/__init__.py b/orm/tests/unit/uuidgen/__init__.py
similarity index 100%
rename from orm/services/id_generator/uuidgen/tests/__init__.py
rename to orm/tests/unit/uuidgen/__init__.py
diff --git a/orm/services/id_generator/uuidgen/tests/config.py b/orm/tests/unit/uuidgen/config.py
similarity index 91%
rename from orm/services/id_generator/uuidgen/tests/config.py
rename to orm/tests/unit/uuidgen/config.py
index 760c00c6..0a300a9a 100755
--- a/orm/services/id_generator/uuidgen/tests/config.py
+++ b/orm/tests/unit/uuidgen/config.py
@@ -36,8 +36,8 @@ logging = {
 }
 # Pecan Application Configurations
 app = {
-    'root': 'uuidgen.controllers.root.RootController',
-    'modules': ['uuidgen'],
+    'root': 'orm.services.id_generator.uuidgen.controllers.root.RootController',
+    'modules': ['orm.services.id_generator.uuidgen'],
     'static_root': '%(confdir)s/../../public',
     'template_path': '%(confdir)s/../templates',
     'debug': True,
diff --git a/orm/services/id_generator/uuidgen/tests/test_configuration.py b/orm/tests/unit/uuidgen/test_configuration.py
similarity index 77%
rename from orm/services/id_generator/uuidgen/tests/test_configuration.py
rename to orm/tests/unit/uuidgen/test_configuration.py
index 232fd91b..2b0f2a01 100755
--- a/orm/services/id_generator/uuidgen/tests/test_configuration.py
+++ b/orm/tests/unit/uuidgen/test_configuration.py
@@ -1,7 +1,7 @@
 """Get configuration module unittests."""
 from mock import patch
-from uuidgen.controllers.v1 import configuration as root
-from uuidgen.tests import FunctionalTest
+from orm.services.id_generator.uuidgen.controllers.v1 import configuration as root
+from orm.tests.unit.uuidgen import FunctionalTest
 
 
 class TestGetConfiguration(FunctionalTest):
diff --git a/orm/services/id_generator/uuidgen/tests/test_logs.py b/orm/tests/unit/uuidgen/test_logs.py
similarity index 78%
rename from orm/services/id_generator/uuidgen/tests/test_logs.py
rename to orm/tests/unit/uuidgen/test_logs.py
index 22d6baff..299e8d0b 100755
--- a/orm/services/id_generator/uuidgen/tests/test_logs.py
+++ b/orm/tests/unit/uuidgen/test_logs.py
@@ -2,9 +2,8 @@
 
 # import mock
 # from mock import patch
-from uuidgen.controllers.v1 import logs
-# import logging
-from uuidgen.tests import FunctionalTest
+from orm.services.id_generator.uuidgen.controllers.v1 import logs
+from orm.tests.unit.uuidgen import FunctionalTest
 
 
 class TestLogs(FunctionalTest):