diff --git a/about_code_tool/tests/test_genattrib.py b/about_code_tool/tests/test_genattrib.py
index 53340a16..c469ce40 100644
--- a/about_code_tool/tests/test_genattrib.py
+++ b/about_code_tool/tests/test_genattrib.py
@@ -90,6 +90,32 @@ def test_genattrib_basic(self):
for ex in expected:
self.assertTrue(ex in result)
+ def test_genattrib_basic_with_filter(self):
+ self.maxDiff = None
+ # note: this contains an about_files subdir that is the root of all ABOUT files in the "project"
+ about_dir = 'about_code_tool/tests/testdata/genattrib/project'
+ generated_attrib = get_temp_file('generated.html')
+ # note: all the about_fioles columns are paths starting with /about_files
+ filter_csv = 'about_code_tool/tests/testdata/genattrib/project_filter.csv'
+ args = [about_dir, generated_attrib, filter_csv]
+ options = None
+ genattrib_command_tester(args, options)
+ result = open(generated_attrib).read()
+ expected = [
+ 'ElasticSearch 1.6.0',
+ 'bootstrap 2.3.2',
+ ]
+ for ex in expected:
+ self.assertTrue(ex in result, ex)
+
+ not_expected = [
+ 'Annotator 1.2.10',
+ 'component_4',
+ 'djangosnippets.org_2413 2011-04-12',
+ ]
+ for ex in not_expected:
+ self.assertFalse(ex in result, ex)
+
def test_genattrib_from_zipped_dir(self):
self.maxDiff = None
about_dir = 'about_code_tool/tests/testdata/genattrib/zipped_about.zip'
@@ -108,23 +134,34 @@ def test_genattrib_from_zipped_dir(self):
'Groovy 2.4.0',
]
for ex in expected:
- self.assertTrue(ex in result)
+ self.assertTrue(ex in result, ex)
+
- def test_genattrib_from_zipped_dir_with_filter_list(self):
+ def test_genattrib_zip_with_filter(self):
self.maxDiff = None
- about_dir = 'about_code_tool/tests/testdata/genattrib/test.zip'
+ # note: this contains an about_files subdir that is the root of all ABOUT files in the "project"
+ about_dir = 'about_code_tool/tests/testdata/genattrib/about_files.zip'
generated_attrib = get_temp_file('generated.html')
- filter_list = 'about_code_tool/tests/testdata/genattrib/filter_list.csv'
- args = [about_dir, generated_attrib, filter_list]
+ # note: all the about_fioles columns are paths starting with /about_files
+ filter_csv = 'about_code_tool/tests/testdata/genattrib/project_filter.csv'
+ args = [about_dir, generated_attrib, filter_csv]
options = None
genattrib_command_tester(args, options)
result = open(generated_attrib).read()
expected = [
+ 'ElasticSearch 1.6.0',
'bootstrap 2.3.2',
- 'Annotator 1.2.10',
]
for ex in expected:
- self.assertTrue(ex in result)
+ self.assertTrue(ex in result, ex)
+
+ not_expected = [
+ 'Annotator 1.2.10',
+ 'component_4',
+ 'djangosnippets.org_2413 2011-04-12',
+ ]
+ for ex in not_expected:
+ self.assertFalse(ex in result, ex)
def genattrib_command_tester(args, options):
parser = genattrib.get_parser()
diff --git a/about_code_tool/tests/testdata/genattrib/about_files.zip b/about_code_tool/tests/testdata/genattrib/about_files.zip
new file mode 100644
index 00000000..802d0f8c
Binary files /dev/null and b/about_code_tool/tests/testdata/genattrib/about_files.zip differ
diff --git a/about_code_tool/tests/testdata/genattrib/project/about_files/bootstrap.ABOUT b/about_code_tool/tests/testdata/genattrib/project/about_files/bootstrap.ABOUT
new file mode 100644
index 00000000..a298cf5d
--- /dev/null
+++ b/about_code_tool/tests/testdata/genattrib/project/about_files/bootstrap.ABOUT
@@ -0,0 +1,16 @@
+about_resource: bootstrap-2.3.2.zip
+download_url: https://github.com/twbs/bootstrap/archive/v2.3.2.zip
+version: 2.3.2
+
+name: bootstrap
+home_url: http://twitter.github.com/bootstrap/
+owner: Twitter, Inc.
+
+description: Sleek, intuitive, and powerful front-end framework for faster and easier web development.
+dje_license: apache-2.0
+license_text_file: bootstrap.LICENSE
+copyright: Copyright 2012 Twitter, Inc.
+
+vcs_tool: git
+vcs_repository: https://github.com/twitter/bootstrap.git
+vcs_branch: /tree/v2.3.2
diff --git a/about_code_tool/tests/testdata/genattrib/project/about_files/bootstrap.LICENSE b/about_code_tool/tests/testdata/genattrib/project/about_files/bootstrap.LICENSE
new file mode 100644
index 00000000..1b5ec8b7
--- /dev/null
+++ b/about_code_tool/tests/testdata/genattrib/project/about_files/bootstrap.LICENSE
@@ -0,0 +1,176 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
diff --git a/about_code_tool/tests/testdata/genattrib/project/about_files/django_snippets.LICENSE b/about_code_tool/tests/testdata/genattrib/project/about_files/django_snippets.LICENSE
new file mode 100644
index 00000000..01b3fadf
--- /dev/null
+++ b/about_code_tool/tests/testdata/genattrib/project/about_files/django_snippets.LICENSE
@@ -0,0 +1,9 @@
+Terms of Service
+We hate legal-speak as much as anybody, but on a site which is geared toward sharing code there has to be at least a little bit of it, so here goes:
+
+By creating an account here you agree to three things:
+
+That you will only post code which you wrote yourself and that you have the legal right to release under these terms.
+That you grant any third party who sees the code you post a royalty-free, non-exclusive license to copy and distribute that code and to make and distribute derivative works based on that code. You may include license terms in snippets you post, if you wish to use a particular license (such as the BSD license or GNU GPL), but that license must permit royalty-free copying, distribution and modification of the code to which it is applied.
+That if you post code of which you are not the author or for which you do not have the legal right to distribute according to these terms, you will indemnify and hold harmless the operators of this site and any third parties who are exposed to liability as a result of your actions.
+If you can't legally agree to these terms, or don't want to, you cannot create an account here.
\ No newline at end of file
diff --git a/about_code_tool/tests/testdata/genattrib/project/about_files/django_snippets_2413.ABOUT b/about_code_tool/tests/testdata/genattrib/project/about_files/django_snippets_2413.ABOUT
new file mode 100644
index 00000000..f1018a04
--- /dev/null
+++ b/about_code_tool/tests/testdata/genattrib/project/about_files/django_snippets_2413.ABOUT
@@ -0,0 +1,14 @@
+about_resource: django_snippets_2413.py
+version: 2011-04-12
+download_url: http://djangosnippets.org/snippets/2413/download/
+
+name: djangosnippets.org_2413
+home_url: http://djangosnippets.org/snippets/2413/
+
+license_url: http://djangosnippets.org/about/tos/
+license_text_file: django_snippets.LICENSE
+dje_license: mit
+notes: The http://djangosnippets.org/ notice gives us permission to use the
+ stuff under just about any open source license, we assert MIT for them.
+ This file was modified to include the line "register = Library()"
+ without which the template tag is not registered.
\ No newline at end of file
diff --git a/about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch-sources.ABOUT b/about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch-sources.ABOUT
new file mode 100644
index 00000000..1ede24c4
--- /dev/null
+++ b/about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch-sources.ABOUT
@@ -0,0 +1,19 @@
+about_resource: elasticsearch-1.6.0-src.tar.xz
+download_url: https://github.com/elasticsearch/elasticsearch/archive/v1.6.0.tar.gz
+version: 1.6.0
+
+owner: ElasticSearch and Shay Banon
+name: ElasticSearch
+
+home_url: http://www.elasticsearch.org/
+
+vcs_tool: git
+vcs_repository: https://github.com/elasticsearch/elasticsearch.git
+
+dje_license: apache-2.0
+notice_file: elasticsearch.NOTICE
+license_text_file: elasticsearch.LICENSE
+copyright: Copyright 2009-2014 Elasticsearch
+
+notes: Source code for the pre-built binaries we use, pruned from docs and
+ tests to keep the size small enough.
diff --git a/about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch.ABOUT b/about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch.ABOUT
new file mode 100644
index 00000000..8e94018a
--- /dev/null
+++ b/about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch.ABOUT
@@ -0,0 +1,22 @@
+about_resource: elasticsearch-1.6.0.zip
+download_url: https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.6.0.zip
+version: 1.6.0
+
+owner: ElasticSearch and Shay Banon
+name: ElasticSearch
+
+home_url: http://www.elasticsearch.org/
+
+vcs_tool: git
+vcs_repository: https://github.com/elasticsearch/elasticsearch.git
+
+dje_license: apache-2.0
+notice_file: elasticsearch.NOTICE
+license_text_file: elasticsearch.LICENSE
+copyright: Copyright 2009-2015 Elasticsearch
+
+notes: This a prebuilt version working on all OSes.
+ The tar.gz works only with POSIX OSses and not Windows while the zip works on
+ all OS. See https://github.com/elasticsearch/elasticsearch/pull/2793
+ ES contains a prebuilt binary of Apache-licensed Hyperic Sigar, Apache Lucene
+ and Apache Log4J as well as JNA which is LGPL-licensed.
diff --git a/about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch.LICENSE b/about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch.LICENSE
new file mode 100644
index 00000000..d6456956
--- /dev/null
+++ b/about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch.LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch.NOTICE b/about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch.NOTICE
new file mode 100644
index 00000000..23cae9e2
--- /dev/null
+++ b/about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch.NOTICE
@@ -0,0 +1,5 @@
+Elasticsearch
+Copyright 2009-2015 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
diff --git a/about_code_tool/tests/testdata/genattrib/project/about_files/subdir/annotator.ABOUT b/about_code_tool/tests/testdata/genattrib/project/about_files/subdir/annotator.ABOUT
new file mode 100644
index 00000000..0a08ed9f
--- /dev/null
+++ b/about_code_tool/tests/testdata/genattrib/project/about_files/subdir/annotator.ABOUT
@@ -0,0 +1,14 @@
+about_resource: annotator-full.1.2.10.zip
+download_url: https://github.com/openannotation/annotator/releases/download/v1.2.10/annotator-full.1.2.10.zip
+version: 1.2.10
+
+home_url: http://okfnlabs.org/projects/annotator/
+name: Annotator
+owner: Open Knowledge
+
+license_text_file: annotator.LICENSE
+license_url: https://okfn.org/ip-policy/
+dje_license: mit
+
+vcs_tool: git
+vcs_repository: https://github.com/openannotation/annotator.git
diff --git a/about_code_tool/tests/testdata/genattrib/project/about_files/subdir/annotator.LICENSE b/about_code_tool/tests/testdata/genattrib/project/about_files/subdir/annotator.LICENSE
new file mode 100644
index 00000000..05ce546a
--- /dev/null
+++ b/about_code_tool/tests/testdata/genattrib/project/about_files/subdir/annotator.LICENSE
@@ -0,0 +1,25 @@
+# Annotator licensing terms
+
+Annotator is free software, and you may use it under the terms of either the
+MIT or the GNU GPL licenses:
+
+## GNU GPLv3
+
+You can redistribute this program and/or modify it under the terms of the
+GNU General Public License as published by the Free Software Foundation,
+either version 3 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. See LICENSE-GPL, or, if this file is missing,
+.
+
+## MIT
+
+You may use the software under the terms of the MIT license, which can be
+found in LICENSE-MIT, or, if this file is missing,
+.
diff --git a/about_code_tool/tests/testdata/genattrib/project_filter.csv b/about_code_tool/tests/testdata/genattrib/project_filter.csv
new file mode 100644
index 00000000..fb5a1cd6
--- /dev/null
+++ b/about_code_tool/tests/testdata/genattrib/project_filter.csv
@@ -0,0 +1,9 @@
+"about_file","name","version","about_resource","spec_version","date","description","description_file","home_url","download_url","readme","readme_file","install","install_file","changelog","changelog_file","news","news_file","news_url","notes","notes_file","contact","owner","author","author_file","copyright","copyright_file","notice_file","notice_url","license_text_file","license_url","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_key","dje_organization","dje_license_name","dje_license","warnings","errors"
+"/about_files/elasticsearch-sources.ABOUT","ElasticSearch","1.6.0","elasticsearch-1.6.0-src.tar.xz",,,,,"http://www.elasticsearch.org/","https://github.com/elasticsearch/elasticsearch/archive/v1.6.0.tar.gz",,,,,,,,,,"Source code for the pre-built binaries we use, pruned from docs and
+tests to keep the size small enough.",,,"ElasticSearch and Shay Banon",,,"Copyright 2009-2014 Elasticsearch",,"elasticsearch.NOTICE",,"elasticsearch.LICENSE",,,,,,"git","https://github.com/elasticsearch/elasticsearch.git",,,,,,,,,,,,"apache-2.0",,"Field: about_resource, Value: elasticsearch-1.6.0-src.tar.xz, Message: File does not exist."
+"/about_files/bootstrap.ABOUT","bootstrap","2.3.2","bootstrap-2.3.2.zip",,,"Sleek, intuitive, and powerful front-end framework for faster and easier web development.",,"http://twitter.github.com/bootstrap/","https://github.com/twbs/bootstrap/archive/v2.3.2.zip",,,,,,,,,,,,,"Twitter, Inc.",,,"Copyright 2012 Twitter, Inc.",,,,"bootstrap.LICENSE",,,,,,"git","https://github.com/twitter/bootstrap.git",,,"/tree/v2.3.2",,,,,,,,,"apache-2.0",,"Field: about_resource, Value: bootstrap-2.3.2.zip, Message: File does not exist."
+"/about_files/elasticsearch.ABOUT","ElasticSearch","1.6.0","elasticsearch-1.6.0.zip",,,,,"http://www.elasticsearch.org/","https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.6.0.zip",,,,,,,,,,"This a prebuilt version working on all OSes.
+The tar.gz works only with POSIX OSses and not Windows while the zip works on
+all OS. See https://github.com/elasticsearch/elasticsearch/pull/2793
+ES contains a prebuilt binary of Apache-licensed Hyperic Sigar, Apache Lucene
+and Apache Log4J as well as JNA which is LGPL-licensed.",,,"ElasticSearch and Shay Banon",,,"Copyright 2009-2015 Elasticsearch",,"elasticsearch.NOTICE",,"elasticsearch.LICENSE",,,,,,"git","https://github.com/elasticsearch/elasticsearch.git",,,,,,,,,,,,"apache-2.0",,"Field: about_resource, Value: elasticsearch-1.6.0.zip, Message: File does not exist."
diff --git a/about_code_tool/tests/testdata/genattrib/test.zip b/about_code_tool/tests/testdata/genattrib/test.zip
deleted file mode 100644
index 86b0428a..00000000
Binary files a/about_code_tool/tests/testdata/genattrib/test.zip and /dev/null differ