Changeset 861:f556a52ce160

Timestamp:

03/10/10 16:45:08 (6 months ago)

Author:

johnbywater

Branch:

default

Message:

Fixed license test fixtures.

Location:

ckan

Files:

• getdata/cospread.py (modified) (2 diffs)
• getdata/data4nr.py (modified) (1 diff)
• getdata/ons_import.py (modified) (1 diff)
• lib/create_test_data.py (modified) (4 diffs)
• tests/forms/test_package_gov.py (modified) (1 diff)
• tests/functional/test_rest.py (modified) (2 diffs)

ckan/getdata/cospread.py

@@ -140 +140 @@
                            _dict['%s - standard' % field] == 'Other (specify)' else \
                            _dict['%s - standard' % field]
-        #if 'HESA' in _dict['licence']:
-        #    license_title = u'OKD Compliant::Higher Education Statistics Agency Copyright with data.gov.uk rights'
-        #else:
-        #    license_title = u'OKD Compliant::UK Crown Copyright with data.gov.uk rights'
+        if 'HESA' in _dict['licence']:
+            license_id = u'hesa-withrights'
+        else:
+            license_id = u'ukcrown-withrights'
 
         # extras
@@ -240 +240 @@
             pkg.add_resource(resource['url'], format=format, description=resource['description'])
         pkg.notes=notes
-        pkg.license_id = u'dsl' # Todo: Fix this. model.License.by_name(license_str)
+        pkg.license_id = license_id
         assert pkg.license
         if not existing_pkg:

ckan/getdata/data4nr.py

@@ -123 +123 @@
         pkg.add_resource(res_url, description=res_description)
         pkg.notes=notes
-        pkg.license_id = u'dsl' # Todo: Fix this.
+        pkg.license_id = u'ukcrown-withrights'
         if not existing_pkg:
             user = model.User.by_name(self._username)

ckan/getdata/ons_import.py

@@ -190 +190 @@
         self._item_count = 0
         self._new_package_count = 0
-        self._crown_license_id = u'dsl' # Todo: Fix this.
+        self._crown_license_id = u'ukcrown-withrights'
 
 

ckan/lib/create_test_data.py

@@ -202 +202 @@
         pkg2.tags = [ tag1 ]
         self.tag_names = [u'russian', u'tolstoy']
-        pkg1.license_id = u'agpl-v3'
+        pkg1.license_id = u'other-open'
         pkg2.title = u'A Wonderful Story'
         genre_extra = model.PackageExtra(key=u'genre', value='romantic novel')
@@ -294 +294 @@
               'tags':'images  graphics  photographs  photos  pictures  us  usa  america  history  wildlife  nature  war  military  todo-split  gov',
               'groups':'ukgov test1 penguin',
-              'license':'agpl-v3',
+              'license':'other-open',
               'notes':'''## About
 
@@ -376 +376 @@
      'author':'DCSF Data Services Group',
      'author_email':'statistics@dcsf.gsi.gov.uk',
-     'license':'dsl',
+     'license':'ukcrown',
      'tags':'children fostering',
      'extras':{
@@ -403 +403 @@
      'author':'DECC Energy Statistics Team',
      'author_email':'energy.stats@decc.gsi.gov.uk',
-     'license':'dsl',
+     'license':'ukcrown',
      'tags':'fuel prices',
      'extras':{

ckan/tests/forms/test_package_gov.py

@@ -58 +58 @@
             (fs.maintainer, '', ''),
             (fs.maintainer_email, '', ''),
-            (fs.license_id, u'dsl'), # Todo: Fix this.
+            (fs.license_id, u'ukcrown'),
             ]
         for vals in expected_values:

ckan/tests/functional/test_rest.py

@@ -121 +121 @@
 #        assert '"license_id": 9' in res, res
         assert 'license_id' not in res, res
-        expected_license = '"license": "%s"' % 'agpl-v3'
-        assert expected_license in res, repr(res) + repr(expected_license)
+        assert '"license": "other-open"' in res, str(res)
         assert 'russian' in res, res
         assert 'tolstoy' in res, res
@@ -768 +767 @@
         assert anna_rec['name'] == 'annakarenina', res_dict['results']
         assert anna_rec['title'] == 'A Novel By Tolstoy', anna_rec['title']
-        assert anna_rec['license'] == u'agpl-v3', anna_rec['license']
+        assert anna_rec['license'] == u'other-open', anna_rec['license']
         assert len(anna_rec['tags']) == 2, anna_rec['tags']
         for expected_tag in ['russian', 'tolstoy']: