Merge branch 'master' of https://github.com/dejacode/about-code-tool

Author: chinyeungli

about.py

@@ -559,6 +559,10 @@ def license_text(self):
         return ""
 
     def notice_text(self):
+        '''
+        Returns the text in a notice file if the notice_file field exists in a
+        .ABOUT file and the file that is in the notice_file: field exists
+        '''
         try:
             notice_text_path = self.file_fields_locations["notice_file"]
             with open(notice_text_path, 'rU') as f:

testdata/attrib/license_text.ABOUT

@@ -0,0 +1,7 @@
+about_resource:license_text_test
+name: license extraction
+version: beta
+notes: this is a test file to see if the license_test() correctly returns the
+ the text of the file in license_text_file field
+license_text_file: license_text.LICENSE
+notice_file: notice_text.NOTICE 

testdata/attrib/license_text.LICENSE

@@ -0,0 +1,4 @@
+Tester holds the copyright for test component. Tester relinquishes copyright of
+this software and releases the component to Public Domain.
+
+* Email [email protected] for any questions

testdata/attrib/missing_notice_license_files.ABOUT

@@ -0,0 +1,8 @@
+about_resource:license_text_test
+name: license extraction
+version: beta
+notes: this is a test file to see if the license_test() correctly returns an 
+ of empty string when the license_text_file and notice_file have file values
+ that do not exist
+license_text_file: test.LICENSE
+notice_file: test.NOTICE 

testdata/attrib/no_text_file_field.ABOUT

@@ -0,0 +1,5 @@
+about_resource: no_license_text_field_field
+name: license extraction
+version: beta
+notes: this is a test file to see if the license_test() correctly returns the
+ the text of the file in license_text_file field

testdata/attrib/notice_text.NOTICE

@@ -0,0 +1 @@
+Test component is released to Public Domain.

tests.py

@@ -472,5 +472,45 @@ def test_generate_attribution(self):
         result = about_collector.generate_attribution('testdata/attrib/test.template')
         self.assertEqual(result, expected)
 
+    def test_license_text_extracted_from_license_text_file(self):
+        expected ='''Tester holds the copyright for test component. Tester relinquishes copyright of
+this software and releases the component to Public Domain.
+
+* Email [email protected] for any questions'''
+
+        about_file = about.AboutFile('testdata/attrib/license_text.ABOUT')
+        license_text = about_file.license_text()
+        self.assertEqual(license_text, expected)
+
+    def test_notice_text_extacted_from_notice_text_file(self):
+        expected ='''Test component is released to Public Domain.'''
+        about_file = about.AboutFile('testdata/attrib/license_text.ABOUT')
+        notice_text = about_file.notice_text()
+        self.assertEqual(notice_text, expected)
+
+    def test_license_text_returns_empty_string_when_no_field_present(self):
+        expected = ''
+        about_file = about.AboutFile('testdata/attrib/no_text_file_field.ABOUT')
+        license_text = about_file.license_text()
+        self.assertEqual(license_text, expected)
+
+    def test_notice_text_returns_empty_string_when_no_field_present(self):
+        expected = ''
+        about_file = about.AboutFile('testdata/attrib/no_text_file_field.ABOUT')
+        notice_text = about_file.notice_text()
+        self.assertEqual(notice_text, expected)
+
+    def test_license_text_returns_empty_string_when_ref_file_doesnt_exist(self):
+        expected = ''
+        about_file = about.AboutFile('testdata/attrib/missing_notice_license_files.ABOUT')
+        license_text = about_file.license_text()
+        self.assertEqual(license_text, expected)
+
+    def test_notice_text_returns_empty_string_when_ref_file_doesnt_exist(self):
+        expected = ''
+        about_file = about.AboutFile('testdata/attrib/missing_notice_license_files.ABOUT')
+        notice_text = about_file.notice_text()
+        self.assertEqual(notice_text, expected)
+
 if __name__ == "__main__":
     unittest.main()