Skip to content

Commit 1e10e1f

Browse files
committed
Update bundled dist, accept C# test baselines for csharp-all 5.4.5
- Rebuild server/dist/ with v2.24.0 VERSION constant - Accept C# CallGraphFrom/CallGraphTo .expected: new <object initializer> call - Accept C# PrintAST .expected: member index renumbering (6->7, 7->8, etc.) - Accept C# PrintCFG .expected: reordered entry nodes, new <object initializer> - Update SARIF results with v2.24.0 CLI version All tests passing: - 583/583 unit tests - 53/53 integration tests - 34/34 QL query unit tests (all 9 languages including Swift)
1 parent 3bd135a commit 1e10e1f

File tree

7 files changed

+24
-16
lines changed

7 files changed

+24
-16
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"$schema":"https://json.schemastore.org/sarif-2.1.0.json","version":"2.1.0","runs":[{"tool":{"driver":{"name":"CodeQL","organization":"GitHub","semanticVersion":"2.23.9","rules":[{"id":"test/query","name":"test/query","shortDescription":{"text":"ExampleQuery1"},"fullDescription":{"text":"Example query for integration testing of the codeql_test_extract MCP server tool."},"defaultConfiguration":{"enabled":true,"level":"warning"},"help":{"text":"# Query Help for JavaScript ExampleQuery1\n\nTODO\n","markdown":"# Query Help for JavaScript ExampleQuery1\n\nTODO\n"},"properties":{"tags":["mcp-integration-tests"],"description":"Example query for integration testing of the codeql_test_extract MCP server tool.","id":"test/query","kind":"problem","name":"ExampleQuery1","precision":"medium","problem.severity":"warning"}}]},"extensions":[{"name":"mcp-client-integration-tests-static-javascript-src","semanticVersion":"0.0.1+fe0e7d2a7059ebb6c6075ff8eaea04f382747656","locations":[{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/src/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/src/codeql-pack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]},{"name":"codeql/javascript-all","semanticVersion":"2.6.11+ce9c8e6e9fd41ef0967b13849bb6ae2183caf9ad","locations":[{"uri":"file:///home/runner/.codeql/packages/codeql/javascript-all/2.6.11/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/.codeql/packages/codeql/javascript-all/2.6.11/qlpack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]},{"name":"codeql/threat-models","semanticVersion":"1.0.31+ce9c8e6e9fd41ef0967b13849bb6ae2183caf9ad","locations":[{"uri":"file:///home/runner/.codeql/packages/codeql/threat-models/1.0.31/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/.codeql/packages/codeql/threat-models/1.0.31/qlpack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]}]},"artifacts":[{"location":{"uri":"file:/home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/test/ExampleQuery1/ExampleQuery1.js","index":0}}],"results":[{"ruleId":"test/query","ruleIndex":0,"rule":{"id":"test/query","index":0},"message":{"text":"Example test code file found for codeql_test_extract example query."},"locations":[{"physicalLocation":{"artifactLocation":{"uri":"file:/home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/test/ExampleQuery1/ExampleQuery1.js","index":0}}}]}],"columnKind":"utf16CodeUnits","properties":{"semmle.formatSpecifier":"sarif-latest"}}]}
1+
{"$schema":"https://json.schemastore.org/sarif-2.1.0.json","version":"2.1.0","runs":[{"tool":{"driver":{"name":"CodeQL","organization":"GitHub","semanticVersion":"2.24.0","rules":[{"id":"test/query","name":"test/query","shortDescription":{"text":"ExampleQuery1"},"fullDescription":{"text":"Example query for integration testing of the codeql_test_extract MCP server tool."},"defaultConfiguration":{"enabled":true,"level":"warning"},"help":{"text":"# Query Help for JavaScript ExampleQuery1\n\nTODO\n","markdown":"# Query Help for JavaScript ExampleQuery1\n\nTODO\n"},"properties":{"tags":["mcp-integration-tests"],"description":"Example query for integration testing of the codeql_test_extract MCP server tool.","id":"test/query","kind":"problem","name":"ExampleQuery1","precision":"medium","problem.severity":"warning"}}]},"extensions":[{"name":"mcp-client-integration-tests-static-javascript-src","semanticVersion":"0.0.1+fe0e7d2a7059ebb6c6075ff8eaea04f382747656","locations":[{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/src/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/src/codeql-pack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]},{"name":"codeql/javascript-all","semanticVersion":"2.6.11+ce9c8e6e9fd41ef0967b13849bb6ae2183caf9ad","locations":[{"uri":"file:///home/runner/.codeql/packages/codeql/javascript-all/2.6.11/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/.codeql/packages/codeql/javascript-all/2.6.11/qlpack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]},{"name":"codeql/threat-models","semanticVersion":"1.0.31+ce9c8e6e9fd41ef0967b13849bb6ae2183caf9ad","locations":[{"uri":"file:///home/runner/.codeql/packages/codeql/threat-models/1.0.31/","description":{"text":"The QL pack root directory."},"properties":{"tags":["CodeQL/LocalPackRoot"]}},{"uri":"file:///home/runner/.codeql/packages/codeql/threat-models/1.0.31/qlpack.yml","description":{"text":"The QL pack definition file."},"properties":{"tags":["CodeQL/LocalPackDefinitionFile"]}}]}]},"artifacts":[{"location":{"uri":"file:/home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/test/ExampleQuery1/ExampleQuery1.js","index":0}}],"results":[{"ruleId":"test/query","ruleIndex":0,"rule":{"id":"test/query","index":0},"message":{"text":"Example test code file found for codeql_test_extract example query."},"locations":[{"physicalLocation":{"artifactLocation":{"uri":"file:/home/runner/work/codeql-development-mcp-server/codeql-development-mcp-server/client/integration-tests/static/javascript/test/ExampleQuery1/ExampleQuery1.js","index":0}}}]}],"columnKind":"utf16CodeUnits","properties":{"semmle.formatSpecifier":"sarif-latest"}}]}

server/dist/codeql-development-mcp-server.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/dist/codeql-development-mcp-server.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
| Example1.cs:2:7:2:14 | call to constructor Object | Call from `Example1` to `Object` |
2+
| Example1.cs:2:7:2:14 | call to method <object initializer> | Call from `Example1` to `<object initializer>` |
23
| Example1.cs:8:9:8:20 | call to method Unrelated1 | Call from `Unrelated2` to `Unrelated1` |
34
| Example1.cs:13:9:13:20 | call to method Unrelated1 | Call from `SourceFunc` to `Unrelated1` |
45
| Example1.cs:14:9:14:20 | call to method Unrelated2 | Call from `SourceFunc` to `Unrelated2` |
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
| Example1.cs:2:7:2:14 | call to method <object initializer> | Call to `<object initializer>` from `Example1` |
12
| Example1.cs:9:9:9:20 | call to method Unrelated1 | Call to `Unrelated1` from `TargetFunc` |
23
| Example1.cs:13:9:13:20 | call to method TargetFunc | Call to `TargetFunc` from `Caller1` |
34
| Example1.cs:17:9:17:20 | call to method TargetFunc | Call to `TargetFunc` from `Caller2` |

server/ql/csharp/tools/test/PrintAST/PrintAST.expected

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
Example1.cs:
22
# 4| [Class] Example1
3-
# 7| 6: [Field] Greetings
3+
# 7| 7: [Field] Greetings
44
# 7| -1: [TypeMention] String[]
55
# 7| 1: [TypeMention] string
66
# 7| 1: [ArrayCreation] array creation of type String[]
77
# 7| -1: [ArrayInitializer] { ..., ... }
88
# 7| 0: [StringLiteralUtf16] "Hello"
99
# 7| 1: [StringLiteralUtf16] "Hi"
10-
# 8| 7: [Field] counter
10+
# 8| 8: [Field] counter
1111
# 8| -1: [TypeMention] int
1212
# 8| 1: [IntLiteral] 0
13-
# 11| 8: [Property] Name
13+
# 11| 9: [Property] Name
1414
# 11| -1: [TypeMention] string
1515
# 11| 2: [StringLiteralUtf16] "World"
1616
# 11| 3: [Getter] get_Name
1717
# 11| 4: [Setter] set_Name
1818
#-----| 2: (Parameters)
1919
# 11| 0: [Parameter] value
20-
# 13| 9: [Method] Main
20+
# 13| 10: [Method] Main
2121
# 13| -1: [TypeMention] Void
2222
#-----| 2: (Parameters)
2323
# 13| 0: [Parameter] args
@@ -194,7 +194,7 @@ Example1.cs:
194194
# 75| 0: [StringLiteralUtf16] "Error: "
195195
# 75| 1: [PropertyCall] access to property Message
196196
# 75| -1: [LocalVariableAccess] access to local variable ex
197-
# 80| 10: [Method] DemoLoops
197+
# 80| 11: [Method] DemoLoops
198198
# 80| -1: [TypeMention] Void
199199
# 81| 4: [BlockStmt] {...}
200200
# 82| 0: [LocalVariableDeclStmt] ... ...;

server/ql/csharp/tools/test/PrintCFG/PrintCFG.expected

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
Example1.cs:
2+
# 6| enter Main
3+
#-----| -> {...}
4+
5+
# 27| enter ComplexMethod
6+
#-----| -> {...}
7+
8+
# 4| enter Example1
9+
#-----| -> this access
10+
211
# 7| {...}
312
#-----| -> ... ...;
413

@@ -194,18 +203,15 @@ Example1.cs:
194203
# 4| {...}
195204
#-----| -> exit Example1 (normal)
196205

197-
# 4| call to constructor Object
198-
#-----| -> {...}
206+
# 4| call to method <object initializer>
207+
#-----| -> call to constructor Object
199208

200-
# 6| enter Main
201-
#-----| -> {...}
209+
# 4| this access
210+
#-----| -> call to method <object initializer>
202211

203-
# 27| enter ComplexMethod
212+
# 4| call to constructor Object
204213
#-----| -> {...}
205214

206-
# 4| enter Example1
207-
#-----| -> call to constructor Object
208-
209215
# 6| exit Main (normal)
210216
#-----| -> exit Main
211217

0 commit comments

Comments
 (0)