fix(validation): fix error generation in expression validator

Signed-off-by: Maximilian Huber <maximilian.huber@tngtech.com>
spdx · Sep 27, 2023 · c08a9fb · c08a9fb
1 parent e08e4d2
commit c08a9fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/spdx_tools/spdx/parser/jsonlikedict/license_expression_parser.py b/src/spdx_tools/spdx/parser/jsonlikedict/license_expression_parser.py
@@ -20,6 +20,9 @@ def parse_license_expression(license_expression_str: str) -> Union[LicenseExpres
         try:
             license_expression = Licensing().parse(license_expression_str)
         except ExpressionError as err:
-            raise SPDXParsingError([f"Error parsing LicenseExpression: {err.args[0]}: {license_expression_str}"])
+            err_msg = "Error parsing LicenseExpression: "
+            err_msg += err.args[0] if f"{err.args[0]}: " else ""
+            err_msg += f"\"{license_expression_str}\""
+            raise SPDXParsingError([err_msg])
 
         return license_expression
diff --git a/tests/spdx/parser/jsonlikedict/test_license_expression_parser.py b/tests/spdx/parser/jsonlikedict/test_license_expression_parser.py
@@ -31,6 +31,7 @@ def test_parse_license_expression(license_expression_str, expected_license):
     "invalid_license_expression,expected_message",
     [
         (56, ["Error parsing LicenseExpression: expression must be a string and not: <class 'int'>: 56"]),
+        ("LGPL-2.1, GPL-2.0, GPL-3.0",["Error parsing LicenseExpression: \"LGPL-2.1, GPL-2.0, GPL-3.0\""]),
     ],
 )
 def test_parse_invalid_license_expression(invalid_license_expression, expected_message):