Fixed #396

 * Code enhancement
 * Added test code

Author: chinyeungli

src/attributecode/model.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf8 -*-
 # ============================================================================
-#  Copyright (c) 2013-2019 nexB Inc. http://www.nexb.com/ - All rights reserved.
+#  Copyright (c) 2013-2020 nexB Inc. http://www.nexb.com/ - All rights reserved.
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 #  You may obtain a copy of the License at
@@ -1106,12 +1106,12 @@ def android_module_license(self, about_parent_path):
         Create MODULE_LICENSE_XXX which the XXX is the value of license key.
         """
         for lic_key in self.license_key.value:
-                # Make uppercase and with dash and spaces and dots replaced by underscore
-                # just to look similar and consistent.
-                name = 'MODULE_LICENSE_' + lic_key.replace('.', '_').replace('-', '_').replace(' ', '_').upper()
-                module_lic_path = os.path.join(about_parent_path, name)
-                # Create an empty MODULE_LICESE_XXX file
-                open(module_lic_path, 'a').close()
+            # Make uppercase and with dash and spaces and dots replaced by underscore
+            # just to look similar and consistent.
+            name = 'MODULE_LICENSE_' + lic_key.replace('.', '_').replace('-', '_').replace(' ', '_').upper()
+            module_lic_path = os.path.join(about_parent_path, name)
+            # Create an empty MODULE_LICESE_XXX file
+            open(module_lic_path, 'a').close()
 
     def android_notice(self, about_parent_path):
         """
@@ -1128,12 +1128,14 @@ def android_notice(self, about_parent_path):
             notice_file_dict = self.notice_file.value
             notice_file_key = notice_file_dict.keys()
             for key in notice_file_key:
-                notice_context += '\n' + notice_file_dict[key] + '\n'
+                if notice_file_dict[key]:
+                    notice_context += '\n' + notice_file_dict[key] + '\n'
         if self.license_file.value:
             lic_file_dict = self.license_file.value
             lic_file_key = lic_file_dict.keys()
             for key in lic_file_key:
-                notice_context += '\n\n' + lic_file_dict[key] + '\n\n'
+                if lic_file_dict[key]:
+                    notice_context += '\n\n' + lic_file_dict[key] + '\n\n'
         return notice_path, notice_context
 
     def dump_lic(self, location, license_dict):

tests/test_model.py

@@ -2,7 +2,7 @@
 # -*- coding: utf8 -*-
 
 # ============================================================================
-#  Copyright (c) 2014-2019 nexB Inc. http://www.nexb.com/ - All rights reserved.
+#  Copyright (c) 2014-2020 nexB Inc. http://www.nexb.com/ - All rights reserved.
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 #  You may obtain a copy of the License at
@@ -21,6 +21,7 @@
 from collections import OrderedDict
 import io
 import json
+import os
 import posixpath
 import shutil
 import unittest
@@ -40,6 +41,7 @@
 from attributecode.util import replace_tab_with_spaces
 
 from testing_utils import extract_test_loc
+from testing_utils import get_temp_dir
 from testing_utils import get_temp_file
 from testing_utils import get_test_loc
 
@@ -940,6 +942,41 @@ def test_write_output_json(self):
         expected = get_test_loc('test_model/expected.json')
         check_json(expected, result)
 
+    def test_android_module_license(self):
+        path = 'test_model/android/single_license.c.ABOUT'
+        test_file = get_test_loc(path)
+        abouts = model.About(location=test_file, about_file_path=path)
+
+        parent_dir = get_temp_dir()
+        abouts.android_module_license(parent_dir)
+        assert os.path.exists(os.path.join(parent_dir, 'MODULE_LICENSE_PUBLIC_DOMAIN'))
+
+    def test_android_module_multi_licenses(self):
+        path = 'test_model/android/multi_license.c.ABOUT'
+        test_file = get_test_loc(path)
+        abouts = model.About(location=test_file, about_file_path=path)
+
+        parent_dir = get_temp_dir()
+        abouts.android_module_license(parent_dir)
+        assert os.path.exists(os.path.join(parent_dir, 'MODULE_LICENSE_BSD_NEW'))
+        assert os.path.exists(os.path.join(parent_dir, 'MODULE_LICENSE_BSD_SIMPLIFIED'))
+
+    def test_android_notice(self):
+        path = 'test_model/android/single_license.c.ABOUT'
+        test_file = get_test_loc(path)
+        abouts = model.About(location=test_file, about_file_path=path)
+
+        parent_dir = get_temp_dir()
+        notice_path, notice_context = abouts.android_notice(parent_dir)
+        expected_path = os.path.join(parent_dir, 'NOTICE')
+        assert os.path.normpath(notice_path) == expected_path
+
+        expected_notice = '''Copyright (c) xyz
+
+This component is released to the public domain by the author.
+
+'''
+        assert notice_context == expected_notice
 
 class CollectorTest(unittest.TestCase):
 

tests/testdata/test_model/android/expected_NOTICE

@@ -0,0 +1,3 @@
+Copyright (c) xyz
+
+This component is released to the public domain by the author.

tests/testdata/test_model/android/multi_license.c.ABOUT

@@ -0,0 +1,17 @@
+# Generated with AboutCode Toolkit Version 4.0.1 
+
+about_resource: multi_license.c
+name: multi_license.c
+license_expression: bsd-new OR bsd-simplified
+copyright: |
+  Copyright (c) xyz
+  Copyright (c) Blah blah BlAh
+licenses:
+  - key: bsd-new
+    name: BSD-3-Clause
+    file: bsd-new.LICENSE
+    url: https://enterprise.dejacode.com/urn/?urn=urn:dje:license:bsd-new
+  - key: bsd-simplified
+    name: BSD-2-Clause
+    file: bsd-simplified.LICENSE
+    url: https://enterprise.dejacode.com/urn/?urn=urn:dje:license:bsd-simplified

tests/testdata/test_model/android/public-domain.LICENSE

@@ -0,0 +1 @@
+This component is released to the public domain by the author.

tests/testdata/test_model/android/single_license.c.ABOUT

@@ -0,0 +1,11 @@
+# Generated with AboutCode Toolkit Version 4.0.1 
+
+about_resource: single_license.c
+name: single_license.c
+license_expression: public-domain
+copyright: Copyright (c) xyz
+licenses:
+  - key: public-domain
+    name: Public Domain
+    file: public-domain.LICENSE
+    url: https://enterprise.dejacode.com/urn/?urn=urn:dje:license:public-domain