updates unit tests

ckanext/odsh/collection/helpers.py

 from string import lower
 
-from ckan.lib.helpers import check_access, url_for
+import ckan.lib.helpers as helpers
 import ckan.model as model
 
 
@@ -29,7 +29,7 @@ def get_latest_dataset(collection_name):
     latest_issued = latest_name = None
     for item in collection_list_relationships:
         item_pkt_dict =  get_package_dict(item)
-        if check_access('package_show', item_pkt_dict):
+        if helpers.check_access('package_show', item_pkt_dict):
             item_issued = item_pkt_dict.get('extras').get('issued')
             if latest_issued < item_issued or (latest_issued == item_issued and latest_name < item):
                 latest_name=item
@@ -79,7 +79,7 @@ def _get_siblings_dicts_with_access(pkg_dict):
     n_siblings = len(list_of_siblings)
     if n_siblings>0:
         siblings_dicts = [get_package_dict(name) for name in list_of_siblings]
-        user_has_access = lambda pkg_dict:check_access('package_show', pkg_dict)
+        user_has_access = lambda pkg_dict:helpers.check_access('package_show', pkg_dict)
         siblings_dicts_with_access = filter(user_has_access, siblings_dicts)
         return siblings_dicts_with_access
     return None
@@ -117,7 +117,7 @@ def get_successor_and_predecessor_dataset(pkg_dict):
 def get_successor_and_predecessor_urls(pkg_dict):
     successor_name, predecessor_name = get_successor_and_predecessor_dataset(pkg_dict)
     successor_url, predecessor_url = (
-        url_for(controller='package', action='read', id=name)
+        helpers.url_for(controller='package', action='read', id=name)
         if name is not None
         else None
         for name in (successor_name, predecessor_name)
@@ -140,7 +140,7 @@ def latest_collection_member_persistent_link(pkg_dict):
     )
     if not collection_name:
         return None
-    url = url_for(
+    url = helpers.url_for(
         controller='ckanext.odsh.collection.controller:LatestDatasetController', 
         action='latest',
         id=collection_name

ckanext/odsh/tests_tpsh/test_helpers_tpsh.py

@@ -2,6 +2,7 @@ from collections import namedtuple
 import datetime
 import nose.tools as nt
 from mock import patch
+from ckan.common import config
 import ckan.logic.action.create as create
 
 
@@ -163,6 +164,12 @@ class Test_correct_missing_relationship(object):
 
     
 class Test_get_language_of_package(object):
+    def setUp(self):
+        config.update({'ckanext.odsh.language_mapping': '/usr/lib/ckan/default/src/ckanext-odsh/language_mapping.json'})
+    
+    def tearDown(self):
+        config.clear()
+
     def test_it_returns_Englisch(self):
         test_package = {
                 'id': u'language_test',

ckanext/odsh/tests_tpsh/test_odsh_helpers.py

@@ -6,6 +6,7 @@ import ckan.lib.helpers as helpers
 
 import ckanext.odsh.helpers as odsh_helpers
 from ckanext.odsh.helpers import is_within_last_month
+import ckanext.odsh.collection.helpers as helpers_collection
 import ckan.model as model
 
 
@@ -35,7 +36,7 @@ class Test_tpsh_get_successor_and_predecessor_dataset(object):
         self.pkg_dicts_collection_members = [
             {
                 u'name': name,
-                u'extras': [{u'key': u'issued', u'value': date}]
+                u'extras': {u'issued': date}
             }
             for (name, date) in zip(self.names_collection_members, self.dates_collection_members)
         ]
@@ -51,8 +52,8 @@ class Test_tpsh_get_successor_and_predecessor_dataset(object):
             return package_list[0]
 
         self.patch_get_datasets_belonging_to_collection_by_dataset = patch.object(
-            odsh_helpers,
-            'tpsh_get_all_datasets_belonging_to_collection_by_dataset',
+            helpers_collection,
+            'get_all_datasets_belonging_to_collection_by_dataset',
             return_value = self.names_collection_members)
         self.patch_get_datasets_belonging_to_collection_by_dataset.start()
 
@@ -64,7 +65,7 @@ class Test_tpsh_get_successor_and_predecessor_dataset(object):
         self.patch_check_access.start()
 
         self.patch_get_package_dict = patch.object(
-            odsh_helpers,
+            helpers_collection,
             'get_package_dict',
             new=fake_get_package_dict,
         )
@@ -76,7 +77,7 @@ class Test_tpsh_get_successor_and_predecessor_dataset(object):
         self.patch_get_package_dict.stop()
 
     def test_patch_get_datasets_belonging_to_collection_by_dataset(self):
-        return_value = odsh_helpers.tpsh_get_all_datasets_belonging_to_collection_by_dataset()
+        return_value = helpers_collection.get_all_datasets_belonging_to_collection_by_dataset()
         nt.assert_equal(return_value, self.names_collection_members)
     
     def test_patch_access_checker_returns_True(self):
@@ -90,41 +91,41 @@ class Test_tpsh_get_successor_and_predecessor_dataset(object):
         nt.assert_false(has_access)
     
     def test_patch_package_get(self):
-        pkg_dict = odsh_helpers.get_package_dict('public1')
+        pkg_dict = helpers_collection.get_package_dict('public1')
         nt.assert_equal(pkg_dict.get('name'), 'public1')
     
     def test_it_returns_correct_for_public2(self):
         pkg_dict = {u'name': u'public2'}
-        successor, predecessor = odsh_helpers.tpsh_get_successor_and_predecessor_dataset(None, pkg_dict)
+        successor, predecessor = helpers_collection.get_successor_and_predecessor_dataset(pkg_dict)
         nt.assert_equal(successor, 'public3')
         nt.assert_equal(predecessor, None)
     
     def test_it_returns_correct_for_public3(self):
         pkg_dict = {u'name': u'public3'}
-        successor, predecessor = odsh_helpers.tpsh_get_successor_and_predecessor_dataset(None, pkg_dict)
+        successor, predecessor = helpers_collection.get_successor_and_predecessor_dataset(pkg_dict)
         nt.assert_equal(successor, 'public4')
         nt.assert_equal(predecessor, 'public2')
 
     def test_it_returns_correct_for_public4(self):
         pkg_dict = {u'name': u'public4'}
-        successor, predecessor = odsh_helpers.tpsh_get_successor_and_predecessor_dataset(None, pkg_dict)
+        successor, predecessor = helpers_collection.get_successor_and_predecessor_dataset(pkg_dict)
         nt.assert_equal(successor, 'public1')
         nt.assert_equal(predecessor, 'public3')
 
     def test_it_returns_correct_for_public1(self):
         pkg_dict = {u'name': u'public1'}
-        successor, predecessor = odsh_helpers.tpsh_get_successor_and_predecessor_dataset(None, pkg_dict)
+        successor, predecessor = helpers_collection.get_successor_and_predecessor_dataset(pkg_dict)
         nt.assert_equal(successor, None)
         nt.assert_equal(predecessor, 'public4')
     
     def test_it_returns_None_if_no_siblings(self):
         with patch.object(
-            odsh_helpers,
-            'tpsh_get_all_datasets_belonging_to_collection_by_dataset',
+            helpers_collection,
+            'get_all_datasets_belonging_to_collection_by_dataset',
             return_value = list()
         ):
             pkg_dict = {u'name': u'some_name'}
-            successor, predecessor = odsh_helpers.tpsh_get_successor_and_predecessor_dataset(None, pkg_dict)
+            successor, predecessor = helpers_collection.get_successor_and_predecessor_dataset(pkg_dict)
             nt.assert_equal(successor, None)
             nt.assert_equal(predecessor, None)