Changeset 863:709444969f11

Timestamp:

03/10/10 18:30:43 (6 months ago)

Author:

johnbywater

Branch:

default

Message:

Fixed up licenses checks in functional/test_package.py (all tests are passing again here).

Issues still outstanding:

- redo commented licenses asserts in functional/test_rest
- create mapper from old license names to new license ids
- make migration script switch license_id on all packages
- graceful degredation for missing licenses (package has a license_id which doesn't exist for some reason)
- make license_id revisioned?

Files:

• ckan/tests/functional/test_package.py (modified) (21 diffs)

ckan/tests/functional/test_package.py

@@ -27 +27 @@
             self.check_named_element(main_div, 'tr', *values)
         assert params['notes'] in main_div, main_div_str
-        license_str = str(params['license'])
-        assert license_str in main_div, main_div_str
+        license = model.Package.get_license_register()[params['license_id']]
+        assert license.title in main_div, (license.title, main_div_str)
         tag_names = [tag.lower() for tag in params['tags']]
         self.check_named_element(main_div, 'ul', *tag_names)
@@ -52 +52 @@
                 self.check_named_element(main_div, 'tr', '!' + value)
 
-        
     def _check_preview(self, res, **params):
         preview =  str(res)[str(res).find('<div id="preview"'):str(res).find('<div id="footer">')]
@@ -64 +63 @@
                 resource = [resource]
             self.check_named_element(preview, 'tr', resource[0], resource[1], resource[2], resource[3])
-        assert str(params['notes']) in preview, preview
-        #if isinstance(params['license'], model.License):
-        #    license_str = str(params['license'].name)
-        #elif isinstance(params['license'], (str, unicode)):
-        #    license_str = str(params['license'])
-        #assert license_str in preview, preview
+        preview_ascii = repr(preview)
+        assert str(params['notes']) in preview_ascii, preview_ascii
+        license = model.Package.get_license_register()[params['license_id']]
+        assert license.title in preview_ascii, (license.title, preview_ascii)
         tag_names = [str(tag.lower()) for tag in params['tags']]
         self.check_named_element(preview, 'ul', *tag_names)
@@ -106 +103 @@
                 yield(res_index, values)
 
-
     def check_form_filled_correctly(self, res, **params):
         if params.has_key('pkg'):
             for key, value in params['pkg'].as_dict().items():
+                if key == 'license':
+                    key = 'license_id'
                 params[key] = value
         prefix = 'Package-%s-' % params['id']
@@ -120 +118 @@
             self.check_tag(main_res, '%sresources-%i-%s' % (prefix, res_index, res_field), expected_value)
         self.check_tag_and_data(main_res, prefix+'notes', params['notes'])
-        #if isinstance(params['license'], model.License):
-        #    license_ = params['license'].name
-        #else:
-        #    license_ = params['license']
-        #self.check_tag_and_data(main_res, 'selected', license_)
+        self.check_tag_and_data(main_res, 'selected', params['license_id'])
         if isinstance(params['tags'], (str, unicode)):
             tags = params['tags'].split()
@@ -319 +313 @@
         newurl = u'http://www.editpkgnewurl.com'
         new_download_url = newurl + u'/download/'
-        #newlicense = u'Non-OKD Compliant::Other'
-        #newlicenseid = model.License.by_name(newlicense).id
+        newlicense_id = u'cc-by'
         newversion = u'0.9b'
         fv = self.res.forms[0]
@@ -328 +321 @@
         fv[prefix + 'url'] =  newurl
         fv[prefix + 'resources-0-url'] =  new_download_url
-        #fv[prefix + 'license_id'] =  newlicenseid
+        fv[prefix + 'license_id'] =  newlicense_id
         fv[prefix + 'version'] = newversion
         res = fv.submit('commit')
@@ -342 +335 @@
         assert pkg.resources[0].url == new_download_url
         assert pkg.version == newversion
-        #assert newlicense == pkg.license.name
+        assert newlicense_id == pkg.license.id
 
     def test_edit_2_not_groups(self):
@@ -448 +441 @@
         pkg.tags = [t1, t2]
         pkg.state = model.State.DELETED
-        #pkg.license = model.License.by_name(u'OKD Compliant::Other')
+        pkg.license_id = u'other-open'
         extras = {'key1':'value1', 'key2':'value2', 'key3':'value3'}
         for key, value in extras.items():
             pkg.extras[unicode(key)] = unicode(value)
-        for obj in [pkg, t1, t2, pr1, pr2]:            
+        for obj in [pkg, t1, t2, pr1, pr2]:
             model.Session.add(obj)
         model.repo.commit_and_remove()
@@ -477 +470 @@
         notes = u'Very important'
         license_id = u'agpl-v3'
-        #license = model.Session.query(model.License).get(license_id)
         state = model.State.ACTIVE
         tags = (u'tag1', u'tag2', u'tag3')
@@ -495 +487 @@
                 fv[prefix+'resources-%s-%s' % (res_index, res_field)] = resource[field_index]
         fv[prefix+'notes'] = notes
-        #fv[prefix+'license_id'] = license_id
+        fv[prefix+'license_id'] = license_id
         fv[prefix+'tags'] = tags_txt
         fv[prefix+'state'] = state
@@ -514 +506 @@
                             url=url,
                             download_url='',
-                            resources=resources, notes=notes, #license=license,
+                            resources=resources, notes=notes, license_id=license_id,
                             tags=tags, extras=current_extras,
                             deleted_extras=deleted_extras,
@@ -523 +515 @@
                                          title=title, version=version,
                                          url=url, resources=resources,
-                                         notes=notes, #license=license,
+                                         notes=notes, license_id=license_id,
                                          tags=tags, extras=current_extras,
                                          deleted_extras=deleted_extras,
@@ -539 +531 @@
                                  version=version, url=url,
                                  resources=resources, notes=notes,
-                                 #license=license, 
+                                 license_id=license_id, 
                                  tags=tags,
                                  extras=current_extras,
@@ -556 +548 @@
                 assert getattr(pkg.resources[res_index], res_field) == resource[field_index]
         assert pkg.notes == notes
-        #assert pkg.license_id == license_id
+        assert pkg.license.id == license_id
         saved_tagnames = [str(tag.name) for tag in pkg.tags]
         saved_tagnames.sort()
@@ -684 +676 @@
         download_url = u'http://something.com/somewhere-else.zip'
         notes = u'Very important'
-        #license_id = 4
-        #license = u'OKD Compliant::Creative Commons CCZero'
+        license_id = u'agpl-v3'
         tags = (u'tag1', u'tag2', u'tag3', u'SomeCaps')
         tags_txt = u' '.join(tags)
@@ -703 +694 @@
         fv[prefix+'resources-0-description'] = u'description escape: & umlaut: \xfc quote "'.encode('utf8')
         fv[prefix+'notes'] = notes
-        #fv[prefix+'license_id'] = license_id
+        fv[prefix+'license_id'] = license_id
         fv[prefix+'tags'] = tags_txt
         for i, extra in enumerate(extras.items()):
@@ -718 +709 @@
                             url=url,
                             resources=resources_escaped, notes=notes,
-                            #license=license,
+                            license_id=license_id,
                             tags=tags, extras=extras.items(),
                             )
@@ -726 +717 @@
                                          title=title, version=version,
                                          url=url, resources=[download_url],
-                                         notes=notes, #license=license,
+                                         notes=notes, license_id=license_id,
                                          tags=[tag.lower() for tag in tags],
                                          extras=extras,
@@ -744 +735 @@
                                  version=version, url=url,
                                  resources=[download_url], notes=notes,
-                                 #license=license, 
+                                 license_id=license_id, 
                                  tags=tags,
                                  extras=extras,
@@ -758 +749 @@
         assert pkg.resources[0].url == download_url
         assert pkg.notes == notes
-        #assert pkg.license_id == license_id
+        assert pkg.license.id == license_id
         saved_tagnames = [str(tag.name) for tag in pkg.tags]
         saved_tagnames.sort()