Improve query suite test based on feedback

This commit is contained in:
Tamas Vajk
2025-04-24 08:35:48 +02:00
parent 4c9aee2cc7
commit 522dd51416
4 changed files with 40 additions and 51 deletions

View File

@@ -1,23 +1,14 @@
import runs_on
import pytest
import sys
def get_test_module(semmle_code_dir):
import importlib.util
spec = importlib.util.spec_from_file_location('test-module', semmle_code_dir / 'ql' / 'misc' / 'pytest' / 'lib' / 'query-suite-test.py')
mod = importlib.util.module_from_spec(spec)
sys.modules["test-module"] = mod
spec.loader.exec_module(mod)
return mod
from query_suites import *
well_known_query_suites = ['java-code-quality.qls', 'java-security-and-quality.qls', 'java-security-extended.qls', 'java-code-scanning.qls']
@runs_on.posix
@pytest.mark.parametrize("query_suite", well_known_query_suites)
def test(codeql, java, cwd, expected_files, semmle_code_dir, query_suite):
get_test_module(semmle_code_dir).test(codeql, cwd, expected_files, semmle_code_dir, query_suite)
def test(codeql, java, check_query_suite, query_suite):
check_query_suite(query_suite)
@runs_on.posix
def test_not_included_queries(codeql, java, cwd, expected_files, semmle_code_dir):
get_test_module(semmle_code_dir).test_not_included_queries(codeql, 'java', cwd, expected_files, semmle_code_dir, well_known_query_suites)
def test_not_included_queries(codeql, java, check_queries_not_included):
check_queries_not_included('java', well_known_query_suites)