Skip to content

Commit 3925157

Browse files
committed
Fixed #404
* Add test code
1 parent 4572ffe commit 3925157

File tree

4 files changed

+24
-1
lines changed

4 files changed

+24
-1
lines changed

docs/CHANGELOG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
Release 4.0.0.pre1
44

5-
* Support filenames/path with special characters #310 #378 #392
65
* Update ABOUT file format to match the specification
76
* Log version of which AbcTK was used #397
87
* Fix the licenses (key, name, file) not in sync issue #406
98
* Correct invalid msg for boolean fields #403
109
* Remove the `about_file_path` key/column from input/output #364
10+
* Use ',' to support multiple files #404
1111

1212
2018-11-15
1313

tests/test_model.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,17 @@ def test_write_output_csv(self):
918918
expected = get_test_loc('test_model/expected.csv')
919919
check_csv(expected, result)
920920

921+
def test_write_output_csv_with_multiple_files(self):
922+
path = 'test_model/multiple_files.ABOUT'
923+
test_file = get_test_loc(path)
924+
abouts = model.About(location=test_file, about_file_path=path)
925+
926+
result = get_temp_file()
927+
model.write_output([abouts], result, format='csv')
928+
929+
expected = get_test_loc('test_model/multiple_files_expected.csv')
930+
check_csv(expected, result)
931+
921932
def test_write_output_json(self):
922933
path = 'test_model/this.ABOUT'
923934
test_file = get_test_loc(path)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
about_resource: .
2+
name: multiple_files
3+
4+
notice_file: NOTICE, NOTICE1
5+
author_file: AUTHOR
6+
changelog_file:
7+
8+
licenses:
9+
- key: lgpl-2.1
10+
file: COPYING, COPYING.LESSER
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
about_resource,name,notice_file,author_file,changelog_file,license_key,license_file
2+
/test_model/,multiple_files,"NOTICE, NOTICE1",AUTHOR,,lgpl-2.1,"COPYING, COPYING.LESSER"

0 commit comments

Comments
 (0)