Fixed the test code

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

src/attributecode/attrib.py

@@ -48,6 +48,7 @@ def generate(abouts, template_string=None):
     try:
         captured_license = []
         license_key_and_context = {}
+        sorted_license_key_and_context = {}
         license_text_name_and_key = {}
         for about in abouts:
             # about.license_file.value is a OrderDict with license_text_name as

src/attributecode/model.py

@@ -1251,8 +1251,8 @@ def by_license(abouts):
     grouped[''] = []
     no_license = grouped['']
     for about in abouts:
-        if about.license.value:
-            special_char_in_expression, lic_list = parse_license_expression(about.license.value)
+        if about.license_expression.value:
+            special_char_in_expression, lic_list = parse_license_expression(about.license_expression.value)
             if not special_char_in_expression:
                 for lic in lic_list:
                     if lic in grouped:

tests/test_model.py

@@ -584,6 +584,7 @@ def test_About_dumps_does_not_transform_strings_in_lists(self):
 home_url: http://dejacode.org
 notes:
 license: apache-2.0 public-domain
+license_expression:
 license_name:
 license_file: apache-2.0.LICENSE
 license_url:
@@ -656,6 +657,7 @@ def test_field_names(self):
             'home_url',
             'notes',
             'license',
+            'license_expression',
             'license_name',
             'license_file',
             'license_url',
@@ -754,6 +756,7 @@ def test_About_dumps_all_fields_if_not_present_with_absent_True(self):
 home_url:
 notes:
 license:
+license_expression:
 license_name:
 license_file:
 license_url:
@@ -864,6 +867,7 @@ def test_About_as_dict_with_present(self):
                     'download_url': u'',
                     'home_url': u'',
                     'license': u'apache-2.0',
+                    'license_expression': u'',
                     'license_file': u'',
                     'license_name': u'',
                     'license_url': u'',
@@ -1143,7 +1147,7 @@ def test_collect_inventory_with_license_expression(self):
         errors, abouts = model.collect_inventory(test_loc)
         assert [] == errors
         expected_lic = u'mit or apache-2.0'
-        returned_lic = abouts[0].license.value
+        returned_lic = abouts[0].license_expression.value
         assert expected_lic == returned_lic
 
     def test_parse_license_expression(self):
@@ -1246,13 +1250,13 @@ def test_unique(self):
     def test_by_license(self):
         base_dir = 'some_dir'
         a = model.About()
-        a.load_dict({'license': u'apache-2.0 and cddl-1.0', }, base_dir)
+        a.load_dict({'license_expression': u'apache-2.0 and cddl-1.0', }, base_dir)
         b = model.About()
-        b.load_dict({'license': u'apache-2.0', }, base_dir)
+        b.load_dict({'license_expression': u'apache-2.0', }, base_dir)
         c = model.About()
         c.load_dict({}, base_dir)
         d = model.About()
-        d.load_dict({'license': u'bsd', }, base_dir)
+        d.load_dict({'license_expression': u'bsd', }, base_dir)
 
         abouts = [a, b, c, d]
         results = model.by_license(abouts)

tests/testdata/inventory/basic/expected.csv

@@ -1,2 +1,2 @@
-about_file_path,about_resource_path,about_resource,name,version,download_url,description,home_url,notes,license,license_name,license_file,license_url,copyright,notice_file,notice_url,redistribute,attribute,track_change,modified,changelog_file,owner,owner_url,contact,author,vcs_tool,vcs_repository,vcs_path,vcs_tag,vcs_branch,vcs_revision,checksum,spec_version
-/about/about.ABOUT,/about/,.,AboutCode,0.11.0,,AboutCode is a tool to process ABOUT files. An ABOUT file is a file.,http://dejacode.org,,apache-2.0,,apache-2.0.LICENSE,,Copyright (c) 2013-2014 nexB Inc.,NOTICE,,,,,,,nexB Inc.,,,"Jillian Daguil, Chin Yeung Li, Philippe Ombredanne, Thomas Druez",git,https://github.com/dejacode/about-code-tool.git,,,,,,
+about_file_path,about_resource_path,about_resource,name,version,download_url,description,home_url,notes,license,license_expression,license_name,license_file,license_url,copyright,notice_file,notice_url,redistribute,attribute,track_change,modified,changelog_file,owner,owner_url,contact,author,vcs_tool,vcs_repository,vcs_path,vcs_tag,vcs_branch,vcs_revision,checksum,spec_version
+/about/about.ABOUT,/about/,.,AboutCode,0.11.0,,AboutCode is a tool to process ABOUT files. An ABOUT file is a file.,http://dejacode.org,,apache-2.0,,,apache-2.0.LICENSE,,Copyright (c) 2013-2014 nexB Inc.,NOTICE,,,,,,,nexB Inc.,,,"Jillian Daguil, Chin Yeung Li, Philippe Ombredanne, Thomas Druez",git,https://github.com/dejacode/about-code-tool.git,,,,,,

tests/testdata/load/expected.csv

@@ -1,2 +1,2 @@
-about_file_path,about_resource_path,about_resource,name,version,download_url,description,home_url,notes,license,license_name,license_file,license_url,copyright,notice_file,notice_url,redistribute,attribute,track_change,modified,changelog_file,owner,owner_url,contact,author,vcs_tool,vcs_repository,vcs_path,vcs_tag,vcs_branch,vcs_revision,checksum,spec_version
-/load/this.ABOUT,/load/,.,AboutCode,0.11.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+about_file_path,about_resource_path,about_resource,name,version,download_url,description,home_url,notes,license,license_expression,license_name,license_file,license_url,copyright,notice_file,notice_url,redistribute,attribute,track_change,modified,changelog_file,owner,owner_url,contact,author,vcs_tool,vcs_repository,vcs_path,vcs_tag,vcs_branch,vcs_revision,checksum,spec_version
+/load/this.ABOUT,/load/,.,AboutCode,0.11.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

tests/testdata/parse/multi_line_license_expresion.ABOUT

@@ -1,6 +1,6 @@
 about_resource: .
 name: test
-license: mit or apache-2.0
+license_expression: mit or apache-2.0
 license_url: |
     https://enterprise.dejacode.com/urn/?urn=urn:dje:license:mit
     https://enterprise.dejacode.com/urn/?urn=urn:dje:license:apache-2.0