Apply suggestions from code review

Co-authored-by: Paolo Tranquilli <[email protected]>
Co-authored-by: Copilot <[email protected]>

Author: 3 people

java/ql/integration-tests/java/query-suite/test.py

@@ -1,15 +1,12 @@
 import runs_on
+import pytest
 
 @runs_on.linux
-def test(codeql, java, cwd, expected_files, semmle_code_dir):
-    query_suites = ['java-code-quality.qls', 'java-security-and-quality.qls', 'java-security-extended.qls', 'java-code-scanning.qls']
-
-    for query_suite in query_suites:
+@pytest.mark.parametrize("query_suite", ['java-code-quality.qls', 'java-security-and-quality.qls', 'java-security-extended.qls', 'java-code-scanning.qls'])
+def test(codeql, java, cwd, expected_files, semmle_code_dir, query_suite):
         actual = codeql.resolve.queries(query_suite, _capture=True).strip()
         actual = sorted(actual.split('\n'))
-        print(semmle_code_dir)
-        index = len(str(semmle_code_dir))
-        actual = [line[index:] for line in actual]
+        actual = [os.path.relpath(q, semmle_code_dir) for q in actual]
         actual_file_name = query_suite + '.actual'
         expected_files.add(actual_file_name)
         (cwd / actual_file_name).write_text('\n'.join(actual)+'\n')