10000 Add query suite integration tests for swift, actions, csharp, go, javascript, ruby, rust by tamasvajk · Pull Request #19355 · github/codeql · GitHub
[go: up one dir, main page]
Skip to content

Add query suite integration tests for swift, actions, csharp, go, javascript, ruby, rust #19355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 25, 2025
Merged

Add query suite integration tests for swift, actions, csharp, go, javascript, ruby, rust #19355

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c9aee2
Add query suite tests for swift with shared logic
tamasvajk Apr 23, 2025
522dd51
Improve query suite test based on feedback
tamasvajk Apr 24, 2025
a4a2447
Add query suite inclusion tests for actions, csharp, go, javascript, …
tamasvajk Apr 24, 2025
c54b684
Apply suggestions from code review - code quality improvements
tamasvajk Apr 24, 2025
998e64b
Fix failing C# test
tamasvajk Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve query suite test based on feedback
  • Loading branch information
@tamasvajk
tamasvajk committed Apr 25, 2025
commit 522dd51416ec33b5be635a864d1c84e287c6fed3
19 changes: 5 additions & 14 deletions java/ql/integration-tests/java/query-suite/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
23 changes: 0 additions & 23 deletions misc/pytest/lib/query-suite-test.py
View file
Open in desktop

This file was deleted.

30 changes: 30 additions & 0 deletions misc/pytest/lib/query_suites.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

import os
import pytest

@pytest.fixture
def check_query_suite(codeql, cwd, expected_files, semmle_code_dir):
def ret(query_suite):
actual = codeql.resolve.queries(query_suite, _capture=True).strip()
actual = sorted(actual.splitlines())
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')
return ret

@pytest.fixture
def check_queries_not_included(codeql, cwd, expected_files, semmle_code_dir):
def ret(lang_folder_name, query_suites):
all_queries = codeql.resolve.queries(semmle_code_dir / 'ql' / lang_folder_name / 'ql' / 'src', _capture=True).strip().splitlines()

included_in_qls = set()
for query_suite in query_suites:
included_in_qls |= set(codeql.resolve.queries(query_suite, _capture=True).strip().splitlines())

not_included = sorted(set(all_queries) - included_in_qls)
not_included = [os.path.relpath(q, semmle_code_dir) for q in not_included]
not_included_file_name = 'not_included_in_qls.actual'
expected_files.add(not_included_file_name)
(cwd / not_included_file_name).write_text('\n'.join(not_included)+'\n')
return ret
19 changes: 5 additions & 14 deletions swift/ql/integration-tests/posix/query-suite/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = ['swift-code-quality.qls', 'swift-security-and-quality.qls', 'swift-security-extended.qls', 'swift-code-scanning.qls']

@runs_on.posix
@pytest.mark.parametrize("query_suite", well_known_query_suites)
def test(codeql, swift, 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, swift, check_query_suite, query_suite):
check_query_suite(query_suite)

@runs_on.posix
def test_not_included_queries(codeql, swift, cwd, expected_files, semmle_code_dir):
get_test_module(semmle_code_dir).test_not_included_queries(codeql, 'swift', cwd, expected_files, semmle_code_dir, well_known_query_suites)
def test_not_included_queries(codeql, swift, check_queries_not_included):
check_queries_not_included('swift', well_known_query_suites)
0