Skip to content

Commit 3efea26

Browse files
chinyeunglichinyeungli
committed
Merge pull request #222 from dejacode/218-root-dir-attrib
Tests for #218
2 parents 16e0835 + e632a46 commit 3efea26

File tree

14 files changed

+555
-7
lines changed

14 files changed

+555
-7
lines changed

‎about_code_tool/tests/test_genattrib.py‎

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,32 @@ def test_genattrib_basic(self):
9090
for ex in expected:
9191
self.assertTrue(ex in result)
9292

93+
def test_genattrib_basic_with_filter(self):
94+
self.maxDiff = None
95+
# note: this contains an about_files subdir that is the root of all ABOUT files in the "project"
96+
about_dir = 'about_code_tool/tests/testdata/genattrib/project'
97+
generated_attrib = get_temp_file('generated.html')
98+
# note: all the about_fioles columns are paths starting with /about_files
99+
filter_csv = 'about_code_tool/tests/testdata/genattrib/project_filter.csv'
100+
args = [about_dir, generated_attrib, filter_csv]
101+
options = None
102+
genattrib_command_tester(args, options)
103+
result = open(generated_attrib).read()
104+
expected = [
105+
'ElasticSearch 1.6.0',
106+
'bootstrap 2.3.2',
107+
]
108+
for ex in expected:
109+
self.assertTrue(ex in result, ex)
110+
111+
not_expected = [
112+
'Annotator 1.2.10',
113+
'component_4',
114+
'djangosnippets.org_2413 2011-04-12',
115+
]
116+
for ex in not_expected:
117+
self.assertFalse(ex in result, ex)
118+
93119
def test_genattrib_from_zipped_dir(self):
94120
self.maxDiff = None
95121
about_dir = 'about_code_tool/tests/testdata/genattrib/zipped_about.zip'
@@ -108,23 +134,34 @@ def test_genattrib_from_zipped_dir(self):
108134
'Groovy 2.4.0',
109135
]
110136
for ex in expected:
111-
self.assertTrue(ex in result)
137+
self.assertTrue(ex in result, ex)
138+
112139

113-
def test_genattrib_from_zipped_dir_with_filter_list(self):
140+
def test_genattrib_zip_with_filter(self):
114141
self.maxDiff = None
115-
about_dir = 'about_code_tool/tests/testdata/genattrib/test.zip'
142+
# note: this contains an about_files subdir that is the root of all ABOUT files in the "project"
143+
about_dir = 'about_code_tool/tests/testdata/genattrib/about_files.zip'
116144
generated_attrib = get_temp_file('generated.html')
117-
filter_list = 'about_code_tool/tests/testdata/genattrib/filter_list.csv'
118-
args = [about_dir, generated_attrib, filter_list]
145+
# note: all the about_fioles columns are paths starting with /about_files
146+
filter_csv = 'about_code_tool/tests/testdata/genattrib/project_filter.csv'
147+
args = [about_dir, generated_attrib, filter_csv]
119148
options = None
120149
genattrib_command_tester(args, options)
121150
result = open(generated_attrib).read()
122151
expected = [
152+
'ElasticSearch 1.6.0',
123153
'bootstrap 2.3.2',
124-
'Annotator 1.2.10',
125154
]
126155
for ex in expected:
127-
self.assertTrue(ex in result)
156+
self.assertTrue(ex in result, ex)
157+
158+
not_expected = [
159+
'Annotator 1.2.10',
160+
'component_4',
161+
'djangosnippets.org_2413 2011-04-12',
162+
]
163+
for ex in not_expected:
164+
self.assertFalse(ex in result, ex)
128165

129166
def genattrib_command_tester(args, options):
130167
parser = genattrib.get_parser()

‎about_code_tool/tests/testdata/genattrib/about_files.zip‎

11.4 KB
Binary file not shown.

‎about_code_tool/tests/testdata/genattrib/project/about_files/bootstrap.ABOUT‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
about_resource: bootstrap-2.3.2.zip
2+
download_url: https://github.com/twbs/bootstrap/archive/v2.3.2.zip
3+
version: 2.3.2
4+
5+
name: bootstrap
6+
home_url: http://twitter.github.com/bootstrap/
7+
owner: Twitter, Inc.
8+
9+
description: Sleek, intuitive, and powerful front-end framework for faster and easier web development.
10+
dje_license: apache-2.0
11+
license_text_file: bootstrap.LICENSE
12+
copyright: Copyright 2012 Twitter, Inc.
13+
14+
vcs_tool: git
15+
vcs_repository: https://github.com/twitter/bootstrap.git
16+
vcs_branch: /tree/v2.3.2

‎about_code_tool/tests/testdata/genattrib/project/about_files/bootstrap.LICENSE‎

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS

‎about_code_tool/tests/testdata/genattrib/project/about_files/django_snippets.LICENSE‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Terms of Service
2+
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:
3+
4+
By creating an account here you agree to three things:
5+
6+
That you will only post code which you wrote yourself and that you have the legal right to release under these terms.
7+
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.
8+
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.
9+
If you can't legally agree to these terms, or don't want to, you cannot create an account here.

‎about_code_tool/tests/testdata/genattrib/project/about_files/django_snippets_2413.ABOUT‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
about_resource: django_snippets_2413.py
2+
version: 2011-04-12
3+
download_url: http://djangosnippets.org/snippets/2413/download/
4+
5+
name: djangosnippets.org_2413
6+
home_url: http://djangosnippets.org/snippets/2413/
7+
8+
license_url: http://djangosnippets.org/about/tos/
9+
license_text_file: django_snippets.LICENSE
10+
dje_license: mit
11+
notes: The http://djangosnippets.org/ notice gives us permission to use the
12+
stuff under just about any open source license, we assert MIT for them.
13+
This file was modified to include the line "register = Library()"
14+
without which the template tag is not registered.

‎about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch-sources.ABOUT‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
about_resource: elasticsearch-1.6.0-src.tar.xz
2+
download_url: https://github.com/elasticsearch/elasticsearch/archive/v1.6.0.tar.gz
3+
version: 1.6.0
4+
5+
owner: ElasticSearch and Shay Banon
6+
name: ElasticSearch
7+
8+
home_url: http://www.elasticsearch.org/
9+
10+
vcs_tool: git
11+
vcs_repository: https://github.com/elasticsearch/elasticsearch.git
12+
13+
dje_license: apache-2.0
14+
notice_file: elasticsearch.NOTICE
15+
license_text_file: elasticsearch.LICENSE
16+
copyright: Copyright 2009-2014 Elasticsearch
17+
18+
notes: Source code for the pre-built binaries we use, pruned from docs and
19+
tests to keep the size small enough.

‎about_code_tool/tests/testdata/genattrib/project/about_files/elasticsearch.ABOUT‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
about_resource: elasticsearch-1.6.0.zip
2+
download_url: https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.6.0.zip
3+
version: 1.6.0
4+
5+
owner: ElasticSearch and Shay Banon
6+
name: ElasticSearch
7+
8+
home_url: http://www.elasticsearch.org/
9+
10+
vcs_tool: git
11+
vcs_repository: https://github.com/elasticsearch/elasticsearch.git
12+
13+
dje_license: apache-2.0
14+
notice_file: elasticsearch.NOTICE
15+
license_text_file: elasticsearch.LICENSE
16+
copyright: Copyright 2009-2015 Elasticsearch
17+
18+
notes: This a prebuilt version working on all OSes.
19+
The tar.gz works only with POSIX OSses and not Windows while the zip works on
20+
all OS. See https://github.com/elasticsearch/elasticsearch/pull/2793
21+
ES contains a prebuilt binary of Apache-licensed Hyperic Sigar, Apache Lucene
22+
and Apache Log4J as well as JNA which is LGPL-licensed.

0 commit comments

Comments
 (0)