update test code

Author: chinyeungli

about_code_tool/about.py

@@ -936,7 +936,7 @@ def get_dje_license_name(self):
         Return the dje_license value if the dje_license field exists
         """
         try:
-            return self.parsed['dje_license_name']
+            return self.parsed['dje_license']
         except Exception as e:
             pass
 

about_code_tool/tests/test_about.py

@@ -94,7 +94,7 @@ def test_header_row_in_csv_output(self):
         'license_spdx,redistribute,attribute,track_changes,vcs_tool,' \
         'vcs_repository,vcs_path,vcs_tag,vcs_branch,vcs_revision,' \
         'checksum_sha1,checksum_md5,checksum_sha256,dje_component,' \
-        'dje_license,dje_organization,warnings,errors'
+        'dje_license,dje_organization,dje_license_name,warnings,errors'
 
         input = "about_code_tool/tests/testdata/basic"
         temp_file = tempfile.NamedTemporaryFile(suffix='.csv', delete=True)

about_code_tool/tests/test_genabout.py

@@ -231,7 +231,7 @@ def test_get_dje_license_list_gen_license_with_dje_license_key_empty_license_tex
         gen_location = join(TESTDATA_PATH, "test_files_for_genabout/")
         input_list = [{'about_file': '/about.py.ABOUT', 'version': '0.8.1',
                         'about_resource': '.', 'name': 'ABOUT tool',
-                        'license_text_file': '', 'dje_license_key': 'apache-2.0'}]
+                        'license_text_file': '', 'dje_license': 'apache-2.0'}]
         expected_output_list = [('/', 'apache-2.0')]
         gen_license = True
         lic_output_list = gen.get_dje_license_list(gen_location, input_list, gen_license)
@@ -244,7 +244,7 @@ def test_get_dje_license_list_gen_license_with_empty_dje_license_key_empty_licen
         gen_location = join(TESTDATA_PATH, "test_files_for_genabout/")
         input_list = [{'about_file': '/about.py.ABOUT', 'version': '0.8.1',
                         'about_resource': '.', 'name': 'ABOUT tool',
-                        'license_text_file': '', 'dje_license_key': ''}]
+                        'license_text_file': '', 'dje_license': ''}]
         expected_output_list = []
         gen_license = True
         lic_output_list = gen.get_dje_license_list(gen_location, input_list, gen_license)
@@ -257,7 +257,7 @@ def test_get_dje_license_list_gen_license_with_dje_license_key_no_license_text_f
         gen_location = join(TESTDATA_PATH, "test_files_for_genabout/")
         input_list = [{'about_file': '/about.py.ABOUT', 'version': '0.8.1',
                         'about_resource': '.', 'name': 'ABOUT tool',
-                        'dje_license_key': 'apache-2.0'}]
+                        'dje_license': 'apache-2.0'}]
         expected_output_list = [('/', 'apache-2.0')]
         gen_license = True
         lic_output_list = gen.get_dje_license_list(gen_location, input_list, gen_license)
@@ -433,7 +433,7 @@ def test_verify_license_files_no_key(self):
     def test_gen_license_list_license_text_file_no_value(self):
         gen = genabout.GenAbout()
         input_list = {'about_file': '/tmp/3pp/opensans/', 'name': 'OpenSans Fonts',
-                       'version': '1', 'dje_license_key': 'apache-2.0',
+                       'version': '1', 'dje_license': 'apache-2.0',
                        'license_text_file': '', 'about_resource': 'opensans'}
         expected_list = ('/tmp/3pp', 'apache-2.0')
         output = gen.gen_license_list(input_list)
@@ -443,7 +443,7 @@ def test_gen_license_list_license_text_file_no_value(self):
     def test_gen_license_list_no_license_text_file_key(self):
         gen = genabout.GenAbout()
         input_list = {'about_file': '/tmp/3pp/opensans/', 'name': 'OpenSans Fonts',
-                       'version': '1', 'dje_license_key': 'apache-2.0',
+                       'version': '1', 'dje_license': 'apache-2.0',
                        'about_resource': 'opensans'}
         expected_list = ('/tmp/3pp', 'apache-2.0')
         output = gen.gen_license_list(input_list)