mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #3760 from d10c/d10c/bigint-quick-eval-fix

Browse Source 
Add a version-check to BigInt quick-eval test
This commit is contained in:
Nora Dimitrijević
2024-10-15 13:23:20 +02:00
committed by GitHub
parent f20476f61d 3c0de3517e
commit 7e4180be5d
4 changed files with 67 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
extensions/ql-vscode/test/data/debugger/QuickEvalBigIntQuery.ql Normal file
View File

@@ -0,0 +1,31 @@
import QuickEvalLib
class InterestingBigInt instanceof InterestingNumber
{
QlBuiltins::BigInt getBigIntValue() {
result = super.getValue().toBigInt().pow(10)
}
string toString() {
result = super.toString()
}
}
class PrimeNumber extends InterestingNumber {
PrimeNumber() {
exists(int n | this = MkNumber(n) |
n in [
2,
3,
5,
7,
11,
13,
17,
19
])
}
}
from InterestingNumber n
select n.toString()

4
extensions/ql-vscode/test/data/debugger/QuickEvalLib.qll
View File

@@ -17,8 +17,4 @@ abstract class InterestingNumber extends TNumber
final int getValue() {
result = value
}
QlBuiltins::BigInt getBigIntValue() {
result = value.toBigInt()
}
}

44
extensions/ql-vscode/test/unit-tests/common/files.test.ts
View File

@@ -66,18 +66,19 @@ describe("files", () => {
it("should scan a directory", async () => {
const file1 = join(dataDir, "compute-default-strings.ql");
const file2 = join(dataDir, "debugger", "QuickEvalQuery.ql");
const file3 = join(dataDir, "debugger", "simple-query.ql");
const file4 = join(dataDir, "multiple-result-sets.ql");
const file5 = join(dataDir, "query.ql");
const file2 = join(dataDir, "debugger", "QuickEvalBigIntQuery.ql");
const file3 = join(dataDir, "debugger", "QuickEvalQuery.ql");
const file4 = join(dataDir, "debugger", "simple-query.ql");
const file5 = join(dataDir, "multiple-result-sets.ql");
const file6 = join(dataDir, "query.ql");
const vaDir = join(dataDir, "variant-analysis-query-packs");
const file6 = join(vaDir, "workspace1", "dir1", "query1.ql");
const file7 = join(vaDir, "workspace1", "pack1", "query1.ql");
const file8 = join(vaDir, "workspace1", "pack1", "query2.ql");
const file9 = join(vaDir, "workspace1", "pack2", "query1.ql");
const file10 = join(vaDir, "workspace1", "query1.ql");
const file11 = join(vaDir, "workspace2", "query1.ql");
const file7 = join(vaDir, "workspace1", "dir1", "query1.ql");
const file8 = join(vaDir, "workspace1", "pack1", "query1.ql");
const file9 = join(vaDir, "workspace1", "pack1", "query2.ql");
const file10 = join(vaDir, "workspace1", "pack2", "query1.ql");
const file11 = join(vaDir, "workspace1", "query1.ql");
const file12 = join(vaDir, "workspace2", "query1.ql");
const result = await gatherQlFiles([dataDir]);
expect(result.sort()).toEqual([
@@ -93,6 +94,7 @@ describe("files", () => {
file9,
file10,
file11,
file12,
],
true,
]);
@@ -112,18 +114,19 @@ describe("files", () => {
it("should avoid duplicates", async () => {
const file1 = join(dataDir, "compute-default-strings.ql");
const file2 = join(dataDir, "debugger", "QuickEvalQuery.ql");
const file3 = join(dataDir, "debugger", "simple-query.ql");
const file4 = join(dataDir, "multiple-result-sets.ql");
const file5 = join(dataDir, "query.ql");
const file2 = join(dataDir, "debugger", "QuickEvalBigIntQuery.ql");
const file3 = join(dataDir, "debugger", "QuickEvalQuery.ql");
const file4 = join(dataDir, "debugger", "simple-query.ql");
const file5 = join(dataDir, "multiple-result-sets.ql");
const file6 = join(dataDir, "query.ql");
const vaDir = join(dataDir, "variant-analysis-query-packs");
const file6 = join(vaDir, "workspace1", "dir1", "query1.ql");
const file7 = join(vaDir, "workspace1", "pack1", "query1.ql");
const file8 = join(vaDir, "workspace1", "pack1", "query2.ql");
const file9 = join(vaDir, "workspace1", "pack2", "query1.ql");
const file10 = join(vaDir, "workspace1", "query1.ql");
const file11 = join(vaDir, "workspace2", "query1.ql");
const file7 = join(vaDir, "workspace1", "dir1", "query1.ql");
const file8 = join(vaDir, "workspace1", "pack1", "query1.ql");
const file9 = join(vaDir, "workspace1", "pack1", "query2.ql");
const file10 = join(vaDir, "workspace1", "pack2", "query1.ql");
const file11 = join(vaDir, "workspace1", "query1.ql");
const file12 = join(vaDir, "workspace2", "query1.ql");
const result = await gatherQlFiles([file1, dataDir, file3, file4, file5]);
result[0].sort();
@@ -140,6 +143,7 @@ describe("files", () => {
file9,
file10,
file11,
file12,
],
true,
]);

16
extensions/ql-vscode/test/vscode-tests/cli-integration/debugger/debugger.test.ts
View File

@@ -49,6 +49,9 @@ describeWithCodeQL()("Debugger", () => {
const quickEvalQueryPath = getDataFolderFilePath(
"debugger/QuickEvalQuery.ql",
);
const quickEvalBigIntQueryPath = getDataFolderFilePath(
"debugger/QuickEvalBigIntQuery.ql",
);
const quickEvalLibPath = getDataFolderFilePath("debugger/QuickEvalLib.qll");
beforeEach(async () => {
@@ -146,11 +149,16 @@ describeWithCodeQL()("Debugger", () => {
it("should run a quick evaluation with a bigint-valued result column", async () => {
await withDebugController(appCommands, async (controller) => {
await selectForQuickEval(quickEvalLibPath, 20, 23, 20, 37);
const semver = await cli.getVersion();
if (semver.compare("2.18.4") < 0) {
// Skip this test if the CLI version is too old to support BigInt
return;
}
await controller.startDebuggingSelection({
query: quickEvalQueryPath, // The query context. This query extends the abstract class.
});
await selectForQuickEval(quickEvalBigIntQueryPath, 4, 23, 4, 37);
// Don't specify a query path, so we'll default to the active document ("QuickEvalBigIntQuery.ql")
await controller.startDebuggingSelection({});
await controller.expectLaunched();
const result = await controller.expectSucceeded();
expect(result.started.quickEvalContext).toBeDefined();