[#1753] Move legacy tests to ckan/tests/legacy.

ckan/tests/__init__.py

@@ -1,9 +1,6 @@
-import warnings
+# Import provides (temporarily) backward compatibility for extensions that
+# pre-date the move of tests from ckan.tests to ckan.test.legacy.
+#from ckan.tests.legacy import *
 
-warnings.warn(
-    "ckan.tests has been renamed to ckan.tests_legacy. "
-    "In the next release it is planned to remove ckan.tests, and possibly "
-    "rename ckan.new_tests to ckan.tests.",
-    FutureWarning)
-
-from ckan.tests_legacy import *
+# (Not showing a deprecation warning as it would show whenever you import
+# anything in ckan.tests.)

ckan/tests/functional/__init__.py

@@ -1,10 +1,9 @@
 import warnings
 
 warnings.warn(
-    "ckan.tests has been renamed to ckan.tests_legacy. "
+    "ckan.tests has been renamed to ckan.tests.legacy. "
     "In the next release it is planned to remove ckan.tests, and possibly "
     "rename ckan.new_tests to ckan.tests.",
     FutureWarning)
 
-from ckan.tests_legacy.functional import *
-
+#from ckan.tests.legacy.functional import *

ckan/tests/functional/api/base.py

@@ -1,11 +1,9 @@
 import warnings
 
 warnings.warn(
-    "ckan.tests has been renamed to ckan.tests_legacy. "
+    "ckan.tests has been renamed to ckan.tests.legacy. "
     "In the next release it is planned to remove ckan.tests, and possibly "
     "rename ckan.new_tests to ckan.tests.",
     FutureWarning)
 
-from ckan.tests_legacy.functional.api.base import *
-
-
+#from ckan.tests.legacy.functional.api.base import *

ckan/tests/functional/base.py

@@ -1,9 +1,9 @@
 import warnings
 
 warnings.warn(
-    "ckan.tests has been renamed to ckan.tests_legacy. "
+    "ckan.tests has been renamed to ckan.tests.legacy. "
     "In the next release it is planned to remove ckan.tests, and possibly "
     "rename ckan.new_tests to ckan.tests.",
     FutureWarning)
 
-from ckan.tests_legacy.functional.base import *
+#from ckan.tests.legacy.functional.base import *

ckan/tests_legacy/ckantestplugins.py → ckan/tests/legacy/ckantestplugins.py

@@ -1,7 +1,7 @@
 from collections import defaultdict
 
 import ckan.plugins as p
-import ckan.tests_legacy.mock_plugin as mock_plugin
+import ckan.tests.legacy.mock_plugin as mock_plugin
 
 
 class MapperPlugin(p.SingletonPlugin):

ckan/tests_legacy/functional/api/base.py → ckan/tests/legacy/functional/api/base.py

@@ -12,10 +12,10 @@
 from paste.fixture import TestRequest
 from webhelpers.html import url_escape
 
-from ckan.tests_legacy import *
+from ckan.tests.legacy import *
 import ckan.model as model
 from ckan.lib.create_test_data import CreateTestData
-from ckan.tests_legacy import TestController as ControllerTestCase
+from ckan.tests.legacy import TestController as ControllerTestCase
 from ckan.common import json
 
 ACCESS_DENIED = [403]

ckan/tests_legacy/functional/api/model/test_group.py → ckan/tests/legacy/functional/api/model/test_group.py

@@ -5,9 +5,9 @@
 
 from nose.tools import assert_equal
 
-from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase
-from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase
-from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase
+from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase
+from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase
+from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase
 
 
 class GroupsTestCase(BaseModelApiTestCase):

ckan/tests_legacy/functional/api/model/test_group_and_organization_purge.py → ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py

@@ -2,7 +2,7 @@
 
 '''
 import ckan.model as model
-import ckan.tests_legacy as tests
+import ckan.tests.legacy as tests
 
 import paste
 import pylons.test

ckan/tests_legacy/functional/api/model/test_licenses.py → ckan/tests/legacy/functional/api/model/test_licenses.py

@@ -3,9 +3,9 @@
 from ckan import model
 from ckan.lib.create_test_data import CreateTestData
 
-from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase
-from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase
-from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase
+from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase
+from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase
+from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase
 
 class LicensesTestCase(BaseModelApiTestCase):
 

ckan/tests_legacy/functional/api/model/test_package.py → ckan/tests/legacy/functional/api/model/test_package.py

@@ -6,11 +6,11 @@
 import ckan.lib.search as search
 from ckan.lib.search.common import SolrSettings
 
-from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase
-from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase
-from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase
+from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase
+from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase
+from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase
 
-import ckan.tests_legacy as tests
+import ckan.tests.legacy as tests
 
 # Todo: Remove this ckan.model stuff.
 import ckan.model as model

ckan/tests_legacy/functional/api/model/test_ratings.py → ckan/tests/legacy/functional/api/model/test_ratings.py

@@ -4,9 +4,9 @@
 from ckan import model
 from ckan.lib.create_test_data import CreateTestData
 
-from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase
-from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase 
-from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase 
+from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase
+from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase 
+from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase 
 
 class RatingsTestCase(BaseModelApiTestCase):
 

ckan/tests_legacy/functional/api/model/test_relationships.py → ckan/tests/legacy/functional/api/model/test_relationships.py

@@ -4,9 +4,9 @@
 from ckan import model
 from ckan.lib.create_test_data import CreateTestData
 
-from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase
-from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase 
-from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase 
+from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase
+from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase 
+from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase 
 
 class RelationshipsTestCase(BaseModelApiTestCase):
 

ckan/tests_legacy/functional/api/model/test_revisions.py → ckan/tests/legacy/functional/api/model/test_revisions.py

@@ -3,9 +3,9 @@
 from ckan import model
 from ckan.lib.create_test_data import CreateTestData
 
-from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase
-from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase 
-from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase 
+from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase
+from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase 
+from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase 
 
 class RevisionsTestCase(BaseModelApiTestCase):
 

ckan/tests_legacy/functional/api/model/test_tag.py → ckan/tests/legacy/functional/api/model/test_tag.py

@@ -6,9 +6,9 @@
 from ckan.lib.create_test_data import CreateTestData
 import ckan.lib.search as search
 
-from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase
-from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase 
-from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase 
+from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase
+from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase 
+from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase 
 
 class TagsTestCase(BaseModelApiTestCase):
 

ckan/tests_legacy/functional/api/model/test_vocabulary.py → ckan/tests/legacy/functional/api/model/test_vocabulary.py

@@ -803,7 +803,7 @@ def test_add_vocab_tag_to_dataset(self):
 
         ckan.model.repo.rebuild_db()
         self.setup()
-        ckan.tests_legacy.CreateTestData.create()
+        ckan.tests.legacy.CreateTestData.create()
         # First add a tag to the vocab.
         vocab = self.genre_vocab
         tag = self._create_tag(self.sysadmin_user, 'noise', vocab)
@@ -870,7 +870,7 @@ def test_delete_tag_from_vocab(self):
 
         ckan.model.repo.rebuild_db()
         self.setup()
-        ckan.tests_legacy.CreateTestData.create()
+        ckan.tests.legacy.CreateTestData.create()
         vocab = self.genre_vocab
 
         # First add some tags to the vocab.
@@ -935,7 +935,7 @@ def test_delete_free_tag(self):
         '''
         ckan.model.repo.rebuild_db()
         self.setup()
-        ckan.tests_legacy.CreateTestData.create()
+        ckan.tests.legacy.CreateTestData.create()
         # Get a package from the API.
         package = (self._post('/api/action/package_show',
             {'id': self._post('/api/action/package_list')['result'][0]})

ckan/tests_legacy/functional/api/test_activity.py → ckan/tests/legacy/functional/api/test_activity.py

@@ -18,7 +18,7 @@
 import paste.fixture
 from nose import SkipTest
 from ckan.common import json
-import ckan.tests_legacy as tests
+import ckan.tests.legacy as tests
 
 
 ##def package_update(context, data_dict):

ckan/tests_legacy/functional/api/test_api.py → ckan/tests/legacy/functional/api/test_api.py

@@ -1,9 +1,9 @@
 import json
 
-from ckan.tests_legacy.functional.api.base import *
+from ckan.tests.legacy.functional.api.base import *
 
-import ckan.tests_legacy
-assert_in = ckan.tests_legacy.assert_in
+import ckan.tests.legacy
+assert_in = ckan.tests.legacy.assert_in
 
 class ApiTestCase(ApiTestCase, ControllerTestCase): 
 

ckan/tests_legacy/functional/api/test_dashboard.py → ckan/tests/legacy/functional/api/test_dashboard.py

@@ -9,7 +9,7 @@
 from ckan.common import json
 import paste
 import pylons.test
-from ckan.tests_legacy import CreateTestData
+from ckan.tests.legacy import CreateTestData
 
 class TestDashboard(object):
     '''Tests for the logic action functions related to the user's dashboard.'''

ckan/tests_legacy/functional/api/test_email_notifications.py → ckan/tests/legacy/functional/api/test_email_notifications.py

@@ -3,9 +3,9 @@
 import ckan.model as model
 import ckan.lib.base
 import ckan.lib.mailer
-import ckan.tests_legacy as tests
-import ckan.tests_legacy.mock_mail_server as mock_mail_server
-import ckan.tests_legacy.pylons_controller as pylons_controller
+import ckan.tests.legacy as tests
+import ckan.tests.legacy.mock_mail_server as mock_mail_server
+import ckan.tests.legacy.pylons_controller as pylons_controller
 import ckan.config.middleware
 
 import paste

ckan/tests_legacy/functional/api/test_follow.py → ckan/tests/legacy/functional/api/test_follow.py

@@ -14,7 +14,7 @@
 import paste
 import pylons.test
 import ckan
-from ckan.tests_legacy import are_foreign_keys_supported, SkipTest, CreateTestData, call_action_api
+from ckan.tests.legacy import are_foreign_keys_supported, SkipTest, CreateTestData, call_action_api
 
 
 def datetime_from_string(s):

ckan/tests_legacy/functional/api/test_misc.py → ckan/tests/legacy/functional/api/test_misc.py

@@ -1,7 +1,7 @@
 from paste.deploy.converters import asbool
-from ckan.tests_legacy.functional.api.base import *
+from ckan.tests.legacy.functional.api.base import *
 from ckan.lib.create_test_data import CreateTestData
-from ckan.tests_legacy import TestController as ControllerTestCase
+from ckan.tests.legacy import TestController as ControllerTestCase
 
 class MiscApiTestCase(ApiTestCase, ControllerTestCase):
 

ckan/tests_legacy/functional/api/test_package_search.py → ckan/tests/legacy/functional/api/test_package_search.py

@@ -5,9 +5,9 @@
 
 from ckan import plugins
 import ckan.lib.search as search
-from ckan.tests_legacy import setup_test_search_index
-from ckan.tests_legacy.functional.api.base import *
-from ckan.tests_legacy import TestController as ControllerTestCase
+from ckan.tests.legacy import setup_test_search_index
+from ckan.tests.legacy.functional.api.base import *
+from ckan.tests.legacy import TestController as ControllerTestCase
 from ckan.controllers.api import ApiController
 from webob.multidict import UnicodeMultiDict
 

ckan/tests_legacy/functional/api/test_resource.py → ckan/tests/legacy/functional/api/test_resource.py

@@ -1,5 +1,5 @@
-from ckan.tests_legacy.functional.api.base import ApiTestCase, CreateTestData
-from ckan.tests_legacy import TestController as ControllerTestCase
+from ckan.tests.legacy.functional.api.base import ApiTestCase, CreateTestData
+from ckan.tests.legacy import TestController as ControllerTestCase
 from ckan import model
 
 class TestResourceApi(ApiTestCase, ControllerTestCase):

ckan/tests_legacy/functional/api/test_resource_search.py → ckan/tests/legacy/functional/api/test_resource_search.py

@@ -1,5 +1,5 @@
-from ckan.tests_legacy.functional.api.base import *
-from ckan.tests_legacy import TestController as ControllerTestCase
+from ckan.tests.legacy.functional.api.base import *
+from ckan.tests.legacy import TestController as ControllerTestCase
 
 class ResourceSearchApiTestCase(ApiTestCase, ControllerTestCase):
 

ckan/tests_legacy/functional/api/test_revision_search.py → ckan/tests/legacy/functional/api/test_revision_search.py

@@ -1,5 +1,5 @@
-from ckan.tests_legacy.functional.api.base import *
-from ckan.tests_legacy import TestController as ControllerTestCase
+from ckan.tests.legacy.functional.api.base import *
+from ckan.tests.legacy import TestController as ControllerTestCase
 
 class RevisionSearchApiTestCase(ApiTestCase, ControllerTestCase):
 

ckan/tests_legacy/functional/api/test_user.py → ckan/tests/legacy/functional/api/test_user.py

@@ -6,9 +6,9 @@
 import ckan.new_authz as new_authz
 from ckan import model
 from ckan.lib.create_test_data import CreateTestData
-from ckan.tests_legacy import TestController as ControllerTestCase
-from ckan.tests_legacy.pylons_controller import PylonsTestCase
-from ckan.tests_legacy import url_for
+from ckan.tests.legacy import TestController as ControllerTestCase
+from ckan.tests.legacy.pylons_controller import PylonsTestCase
+from ckan.tests.legacy import url_for
 import ckan.config.middleware
 from ckan.common import json
 

ckan/tests_legacy/functional/api/test_util.py → ckan/tests/legacy/functional/api/test_util.py

@@ -2,8 +2,8 @@
 
 from ckan import model, __version__
 from ckan.lib.create_test_data import CreateTestData
-from ckan.tests_legacy import TestController as ControllerTestCase
-from ckan.tests_legacy import url_for
+from ckan.tests.legacy import TestController as ControllerTestCase
+from ckan.tests.legacy import url_for
 from ckan.common import json
 
 class TestUtil(ControllerTestCase):

ckan/tests/legacy/functional/base.py

@@ -0,0 +1,5 @@
+from ckan.tests.legacy.html_check import HtmlCheckMethods
+from ckan.tests.legacy import TestController as ControllerTestCase
+
+class FunctionalTestCase(ControllerTestCase, HtmlCheckMethods):
+    pass

ckan/tests_legacy/functional/test_activity.py → ckan/tests/legacy/functional/test_activity.py

@@ -11,8 +11,8 @@
 from ckan.logic.action.update import package_update, resource_update
 from ckan.logic.action.update import user_update, group_update
 from ckan.logic.action.delete import package_delete
-from ckan.tests_legacy.html_check import HtmlCheckMethods
-from ckan.tests_legacy import CreateTestData
+from ckan.tests.legacy.html_check import HtmlCheckMethods
+from ckan.tests.legacy import CreateTestData
 
 class TestActivity(HtmlCheckMethods):
     """Test the rendering of activity streams into HTML pages.

ckan/tests_legacy/functional/test_admin.py → ckan/tests/legacy/functional/test_admin.py

@@ -1,5 +1,5 @@
 import ckan.model as model
-from ckan.tests_legacy import url_for, CreateTestData, WsgiAppCase
+from ckan.tests.legacy import url_for, CreateTestData, WsgiAppCase
 
 class TestAdminController(WsgiAppCase):
     @classmethod

ckan/tests_legacy/functional/test_group.py → ckan/tests/legacy/functional/test_group.py

@@ -6,13 +6,13 @@
 import ckan.model as model
 import ckan.lib.search as search
 
-from ckan.tests_legacy import setup_test_search_index
+from ckan.tests.legacy import setup_test_search_index
 from ckan import plugins
 from ckan.lib.create_test_data import CreateTestData
 from ckan.logic import get_action
-from ckan.tests_legacy import *
+from ckan.tests.legacy import *
 from base import FunctionalTestCase
-from ckan.tests_legacy import is_search_supported
+from ckan.tests.legacy import is_search_supported
 
 
 class TestGroup(FunctionalTestCase):

ckan/tests_legacy/functional/test_home.py → ckan/tests/legacy/functional/test_home.py

@@ -4,10 +4,10 @@
 from ckan.controllers.home import HomeController
 import ckan.model as model
 
-from ckan.tests_legacy import *
-from ckan.tests_legacy.html_check import HtmlCheckMethods
-from ckan.tests_legacy.pylons_controller import PylonsTestCase
-from ckan.tests_legacy import search_related, setup_test_search_index
+from ckan.tests.legacy import *
+from ckan.tests.legacy.html_check import HtmlCheckMethods
+from ckan.tests.legacy.pylons_controller import PylonsTestCase
+from ckan.tests.legacy import search_related, setup_test_search_index
 
 from ckan.common import c, session