8000 [issue-305, refactor] delete duplicated check for error type · spdx/tools-python@e024400 · GitHub
[go: up one dir, main page]
Skip to content

Commit e024400

Browse files
meretpmeretp
committed
[issue-305, refactor] delete duplicated check for error type
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
1 parent d601ec2 commit e024400

11 files changed

+2
-22
lines changed

‎tests/parser/test_actor_parser.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,5 @@ def test_invalid_actor(actor_string, expected_message):
4343

4444
with pytest.raises(SPDXParsingError) as err:
4545
_ = actor_parser.parse_actor(actor_string)
46-
assert err.typename == 'SPDXParsingError'
47-
assert err.value.messages[
48-
0] == expected_message
46+
47+
assert err.value.messages[0] == expected_message

‎tests/parser/test_annotation_parser.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,5 @@ def test_parse_incomplete_annotation():
114114
with pytest.raises(SPDXParsingError) as err:
115115
_ = annotation_parser.parse_annotation(annotation_dict)
116116

117-
assert err.type == SPDXParsingError
118117
assert err.value.messages == ["Error while parsing Annotation: ['Invalid annotation type: None', 'Could not "
119118
"convert str to datetime, invalid type: NoneType']"]

‎tests/parser/test_checksum_parser.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ def test_invalid_checksum():
3838
with pytest.raises(SPDXParsingError) as err:
3939
_ = checksum_parser.parse_checksum(checksum_dict)
4040

41-
assert err.typename == 'SPDXParsingError'
4241
assert err.value.messages[0] == "Error while parsing Checksum: ['Algorithm SHA not valid for checksum.']"
4342

4443
def test_incomplete_checksum():
@@ -50,5 +49,4 @@ def test_incomplete_checksum():
5049
with pytest.raises(SPDXParsingError) as err:
5150
_ = checksum_parser.parse_checksum(checksum_dict)
5251

53-
assert err.type == SPDXParsingError
5452
assert err.value.messages == ["Error while constructing Checksum: ['SetterError Checksum: type of argument \"value\" must be str; got NoneType instead: None']"]

‎tests/parser/test_creation_info_parser.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ def test_parse_incomplete_creation_info():
7272
with pytest.raises(SPDXParsingError) as err:
7373
_ = creation_info_parser.parse_creation_info(doc_dict)
7474

75-
assert err.type == SPDXParsingError
7675
assert err.value.messages == ["Error while parsing doc Example Document: ['CreationInfo does not exist.']"]
7776

7877

@@ -92,7 +91,6 @@ def test_parse_invalid_creation_info():
9291
with pytest.raises(SPDXParsingError) as err:
9392
_ = creation_info_parser.parse_creation_info(doc_dict)
9493

95-
assert err.type == SPDXParsingError
9694
assert err.value.messages == ["Error while constructing CreationInfo: ['SetterError CreationInfo: type of "
9795
'argument "document_namespace" must be str; got NoneType instead: None\', '
9896
'\'SetterError CreationInfo: type of argument "data_license" must be str; got '

‎tests/parser/test_extracted_licensing_info_parser.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def test_parse_invalid_extracted_licensing_info():
5353
with pytest.raises(SPDXParsingError) as err:
5454
_ = extracted_licensing_info_parser.parse_extracted_licensing_info(extracted_licensing_infos_dict)
5555

56-
assert err.type == SPDXParsingError
5756
assert err.value.messages == ["Error while constructing ExtractedLicensingInfo: ['SetterError "
5857
'ExtractedLicensingInfo: type of argument "comment" must be one of (str, '
5958
"NoneType); got int instead: 56']"]

‎tests/parser/test_file_parser.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ def test_parse_incomplete_file():
6868
with pytest.raises(SPDXParsingError) as err:
6969
_ = file_parser.parse_file(file_dict)
7070

71-
assert err.type == SPDXParsingError
7271
assert err.value.messages == ["Error while parsing file Incomplete File: ['No checksums provided, checksums are "
7372
"mandatory for files.']"]
7473

@@ -100,7 +99,6 @@ def test_parse_falsy_files():
10099
with pytest.raises(SPDXParsingError) as err:
101100
_ = file_parser.parse_files(files)
102101

103-
assert err.type == SPDXParsingError
104102
assert err.value.messages == ["Error while parsing file Incomplete File: ['No checksums provided, checksums "
105103
"are mandatory for files.']",
106104
'Error while constructing File: [\'SetterError File: type of argument "name" '
@@ -125,5 +123,4 @@ def test_parse_invalid_file_types():
125123
with pytest.raises(SPDXParsingError) as err:
126124
_ = file_parser.parse_file_types(file_types_list)
127125

128-
assert err.type == SPDXParsingError
129126
assert err.value.messages == ["Error while parsing file_types: ['FileType APPLICAON is not valid.']"]

‎tests/parser/test_json_parser.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ def test_json_parser_file_not_found():
2121
wrong_file_path = os.path.join(os.path.dirname(__file__), 'test.json')
2222
_ = JsonParser().parse(wrong_file_path)
2323

24-
assert err.type == FileNotFoundError
2524
assert err.value.args[1] == "No such file or directory"
2625

2726

‎tests/parser/test_license_expression_parser.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,5 @@ def test_invalid_license_expression():
5151
with pytest.raises(SPDXParsingError) as err:
5252
_ = license_expression_parser.parse_license_expression(invalid_license_expression)
5353

54-
assert err.type == SPDXParsingError
5554
assert err.value.messages == ["Error while constructing LicenseExpression: ['SetterError LicenseExpression: "
5655
'type of argument "expression_string" must be str; got int instead: 56\']']

‎tests/parser/test_package_parser.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ def test_incomplete_package():
131131
with pytest.raises(SPDXParsingError) as err:
132132
_ = package_parser.parse_package(package_dict)
133133

134-
assert err.type == SPDXParsingError
135134
assert err.value.get_messages() == ["Error while constructing Package: ['SetterError Package: type of "
136135
'argument "name" must be str; got NoneType instead: None\', \'SetterError '
137136
'Package: type of argument "download_location" must be one of (str, '
@@ -150,7 +149,6 @@ def test_package_with_setter_error():
150149
with pytest.raises(SPDXParsingError) as err:
151150
_ = package_parser.parse_package(package_dict)
152151

153-
assert err.type == SPDXParsingError
154152
assert err.value.get_messages() == ["Error while constructing Package: ['SetterError Package: type of argument "
155153
'"name" must be str; got int instead: 5\']']
156154

@@ -169,7 +167,6 @@ def test_package_with_falsy_values():
169167
with pytest.raises(SPDXParsingError) as err:
170168
_ = package_parser.parse_package(package_dict)
171169

172-
assert err.type == SPDXParsingError
173170
assert err.value.get_messages() == [
174171
'Error while parsing Package Example Package: ["Error while parsing Checksum: [\'Algorithm SHA not valid for checksum.\']"]']
175172

@@ -197,7 +194,6 @@ def test_parse_packages():
197194
with pytest.raises(SPDXParsingError) as err:
198195
_ = package_parser.parse_packages(packages_list)
199196

200-
assert err.type == SPDXParsingError
201197
assert err.value.messages == ['Error while parsing Package Example Package: ["Error while parsing Checksum: '
202198
'[\'Algorithm SHA not valid for checksum.\']"]',
203199
"Error while constructing Package: ['SetterError Package: type of argument "

‎tests/parser/test_relationship_parser.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ def test_parse_incomplete_relationship():
4444
with pytest.raises(SPDXParsingError) as err:
4545
_ = relationship_parser.parse_relationship(relationship_dict)
4646

47-
assert err.type == SPDXParsingError
4847
assert err.value.messages == ["Error while parsing relationship: ['RelationshipType must be str, not "
4948
"NoneType.']"]
5049
def test_parse_relationship_type():

0 commit comments

Comments
 (0)
0