|
18 | 18 | test_data_path = Path(__file__).resolve().parent / "data"
|
19 | 19 |
|
20 | 20 |
|
21 |
| -def generate_valid_spdx_argument(filename: str = "SPDX.spdx") -> str: |
22 |
| - return "--spdx " + str(test_data_path / filename) |
| 21 | +def generate_valid_spdx_argument(filename: str = "SPDX.spdx") -> list[str]: |
| 22 | + return ["--spdx", str(test_data_path / filename)] |
23 | 23 |
|
24 | 24 |
|
25 |
| -def generate_valid_opossum_argument(filename: str = "opossum_input.opossum") -> str: |
26 |
| - return "--opossum " + str(test_data_path / filename) |
| 25 | +def generate_valid_opossum_argument( |
| 26 | + filename: str = "opossum_input.opossum", |
| 27 | +) -> list[str]: |
| 28 | + return ["--opossum", str(test_data_path / filename)] |
27 | 29 |
|
28 | 30 |
|
29 | 31 | def run_with_command_line_arguments(cmd_line_arguments: list[str]) -> Result:
|
@@ -89,7 +91,7 @@ def read_input_json_from_opossum(output_file_path: str) -> Any:
|
89 | 91 |
|
90 | 92 |
|
91 | 93 | def read_json_from_file(filename: str) -> Any:
|
92 |
| - with open(test_data_path / filename) as file: |
| 94 | + with open(test_data_path / filename, encoding="utf-8") as file: |
93 | 95 | expected_opossum_dict = json.load(file)
|
94 | 96 | return expected_opossum_dict
|
95 | 97 |
|
@@ -184,12 +186,13 @@ def test_cli_with_invalid_document(caplog: LogCaptureFixture) -> None:
|
184 | 186 | @pytest.mark.parametrize(
|
185 | 187 | "options",
|
186 | 188 | [
|
187 |
| - generate_valid_spdx_argument() + " " + generate_valid_spdx_argument(), |
188 |
| - generate_valid_spdx_argument() + " " + generate_valid_opossum_argument(), |
189 |
| - generate_valid_opossum_argument() + " " + generate_valid_opossum_argument(), |
| 189 | + generate_valid_spdx_argument() + generate_valid_spdx_argument(), |
| 190 | + generate_valid_spdx_argument() + generate_valid_opossum_argument(), |
| 191 | + generate_valid_opossum_argument() + generate_valid_opossum_argument(), |
190 | 192 | ],
|
191 | 193 | )
|
192 | 194 | def test_cli_with_multiple_files(caplog: LogCaptureFixture, options: list[str]) -> None:
|
| 195 | + print(options) |
193 | 196 | result = run_with_command_line_arguments(options)
|
194 | 197 | assert result.exit_code == 1
|
195 | 198 |
|
|
0 commit comments