Skip to content

Commit 2c784a7

Browse files
committed
Accept java test result changes
1 parent 7951e61 commit 2c784a7

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

java/ql/test/library-tests/dataflow/external-models/srcs.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ invalidModelRow
77
| A.java:7:9:7:16 | src1(...) | qltest-alt |
88
| A.java:10:9:10:18 | src2(...) | qltest |
99
| A.java:10:9:10:18 | src2(...) | qltest-w-subtypes |
10+
| A.java:11:9:11:18 | src3(...) | qltest |
1011
| A.java:11:9:11:18 | src3(...) | qltest-w-subtypes |
1112
| A.java:13:5:13:13 | this <.method> [post update] | qltest-argany |
1213
| A.java:13:12:13:12 | x [post update] | qltest-argany |

java/ql/test/query-tests/security/CWE-094/GroovyInjection/GroovyInjectionTest.expected

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
| GroovyCompilationUnitTest.java:72:13:72:14 | cu | GroovyCompilationUnitTest.java:70:55:70:84 | getParameter(...) : String | GroovyCompilationUnitTest.java:72:13:72:14 | cu | Groovy script depends on a $@. | GroovyCompilationUnitTest.java:70:55:70:84 | getParameter(...) | user-provided value |
1515
| GroovyCompilationUnitTest.java:78:13:78:14 | cu | GroovyCompilationUnitTest.java:76:55:76:84 | getParameter(...) : String | GroovyCompilationUnitTest.java:78:13:78:14 | cu | Groovy script depends on a $@. | GroovyCompilationUnitTest.java:76:55:76:84 | getParameter(...) | user-provided value |
1616
| GroovyCompilationUnitTest.java:89:13:89:14 | cu | GroovyCompilationUnitTest.java:88:34:88:63 | getParameter(...) : String | GroovyCompilationUnitTest.java:89:13:89:14 | cu | Groovy script depends on a $@. | GroovyCompilationUnitTest.java:88:34:88:63 | getParameter(...) | user-provided value |
17+
| GroovyCompilationUnitTest.java:94:13:94:14 | cu | GroovyCompilationUnitTest.java:93:34:93:63 | getParameter(...) : String | GroovyCompilationUnitTest.java:94:13:94:14 | cu | Groovy script depends on a $@. | GroovyCompilationUnitTest.java:93:34:93:63 | getParameter(...) | user-provided value |
1718
| GroovyEvalTest.java:15:21:15:26 | script | GroovyEvalTest.java:14:29:14:58 | getParameter(...) : String | GroovyEvalTest.java:15:21:15:26 | script | Groovy script depends on a $@. | GroovyEvalTest.java:14:29:14:58 | getParameter(...) | user-provided value |
1819
| GroovyEvalTest.java:20:39:20:44 | script | GroovyEvalTest.java:19:29:19:58 | getParameter(...) : String | GroovyEvalTest.java:20:39:20:44 | script | Groovy script depends on a $@. | GroovyEvalTest.java:19:29:19:58 | getParameter(...) | user-provided value |
1920
| GroovyEvalTest.java:25:31:25:36 | script | GroovyEvalTest.java:24:29:24:58 | getParameter(...) : String | GroovyEvalTest.java:25:31:25:36 | script | Groovy script depends on a $@. | GroovyEvalTest.java:24:29:24:58 | getParameter(...) | user-provided value |
@@ -93,6 +94,8 @@ edges
9394
| GroovyCompilationUnitTest.java:77:26:77:27 | su : SourceUnit | GroovyCompilationUnitTest.java:77:13:77:14 | cu [post update] : CompilationUnit | provenance | Config |
9495
| GroovyCompilationUnitTest.java:88:13:88:14 | cu [post update] : JavaAwareCompilationUnit | GroovyCompilationUnitTest.java:89:13:89:14 | cu | provenance | Sink:MaD:32 |
9596
| GroovyCompilationUnitTest.java:88:34:88:63 | getParameter(...) : String | GroovyCompilationUnitTest.java:88:13:88:14 | cu [post update] : JavaAwareCompilationUnit | provenance | Src:MaD:33 Config |
97+
| GroovyCompilationUnitTest.java:93:13:93:14 | cu [post update] : JavaStubCompilationUnit | GroovyCompilationUnitTest.java:94:13:94:14 | cu | provenance | Sink:MaD:32 |
98+
| GroovyCompilationUnitTest.java:93:34:93:63 | getParameter(...) : String | GroovyCompilationUnitTest.java:93:13:93:14 | cu [post update] : JavaStubCompilationUnit | provenance | Src:MaD:33 Config |
9699
| GroovyEvalTest.java:14:29:14:58 | getParameter(...) : String | GroovyEvalTest.java:15:21:15:26 | script | provenance | Src:MaD:33 Sink:MaD:27 |
97100
| GroovyEvalTest.java:19:29:19:58 | getParameter(...) : String | GroovyEvalTest.java:20:39:20:44 | script | provenance | Src:MaD:33 Sink:MaD:28 |
98101
| GroovyEvalTest.java:24:29:24:58 | getParameter(...) : String | GroovyEvalTest.java:25:31:25:36 | script | provenance | Src:MaD:33 Sink:MaD:29 |
@@ -246,6 +249,9 @@ nodes
246249
| GroovyCompilationUnitTest.java:88:13:88:14 | cu [post update] : JavaAwareCompilationUnit | semmle.label | cu [post update] : JavaAwareCompilationUnit |
247250
| GroovyCompilationUnitTest.java:88:34:88:63 | getParameter(...) : String | semmle.label | getParameter(...) : String |
248251
| GroovyCompilationUnitTest.java:89:13:89:14 | cu | semmle.label | cu |
252+
| GroovyCompilationUnitTest.java:93:13:93:14 | cu [post update] : JavaStubCompilationUnit | semmle.label | cu [post update] : JavaStubCompilationUnit |
253+
| GroovyCompilationUnitTest.java:93:34:93:63 | getParameter(...) : String | semmle.label | getParameter(...) : String |
254+
| GroovyCompilationUnitTest.java:94:13:94:14 | cu | semmle.label | cu |
249255
| GroovyEvalTest.java:14:29:14:58 | getParameter(...) : String | semmle.label | getParameter(...) : String |
250256
| GroovyEvalTest.java:15:21:15:26 | script | semmle.label | script |
251257
| GroovyEvalTest.java:19:29:19:58 | getParameter(...) : String | semmle.label | getParameter(...) : String |
@@ -325,3 +331,6 @@ nodes
325331
| TemplateEngineTest.java:24:35:24:49 | (...)... | semmle.label | (...)... |
326332
| TemplateEngineTest.java:25:35:25:46 | (...)... | semmle.label | (...)... |
327333
subpaths
334+
testFailures
335+
| GroovyCompilationUnitTest.java:93:34:93:63 | getParameter(...) : String | Unexpected result: Source |
336+
| GroovyCompilationUnitTest.java:94:13:94:14 | cu | Unexpected result: Alert |

java/ql/test/query-tests/security/CWE-094/MvelInjection/MvelInjectionTest.expected

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ edges
2525
| MvelInjectionTest.java:41:37:41:44 | compiler : ExpressionCompiler | MvelInjectionTest.java:41:37:41:54 | compile(...) : CompiledExpression | provenance | Config |
2626
| MvelInjectionTest.java:41:37:41:54 | compile(...) : CompiledExpression | MvelInjectionTest.java:42:5:42:14 | expression | provenance | Sink:MaD:4 |
2727
| MvelInjectionTest.java:47:9:47:96 | new CompiledAccExpression(...) : CompiledAccExpression | MvelInjectionTest.java:48:5:48:14 | expression | provenance | Sink:MaD:3 |
28+
| MvelInjectionTest.java:47:9:47:96 | new CompiledAccExpression(...) : CompiledAccExpression | MvelInjectionTest.java:48:5:48:14 | expression | provenance | Sink:MaD:5 |
2829
| MvelInjectionTest.java:47:35:47:46 | read(...) : String | MvelInjectionTest.java:47:35:47:60 | toCharArray(...) : char[] | provenance | MaD:16 |
2930
| MvelInjectionTest.java:47:35:47:60 | toCharArray(...) : char[] | MvelInjectionTest.java:47:9:47:96 | new CompiledAccExpression(...) : CompiledAccExpression | provenance | Config |
3031
| MvelInjectionTest.java:52:20:52:31 | read(...) : String | MvelInjectionTest.java:55:52:55:56 | input : String | provenance | |
@@ -37,6 +38,7 @@ edges
3738
| MvelInjectionTest.java:64:58:64:69 | read(...) : String | MvelInjectionTest.java:64:35:64:70 | new ExpressionCompiler(...) : ExpressionCompiler | provenance | Config |
3839
| MvelInjectionTest.java:65:37:65:44 | compiler : ExpressionCompiler | MvelInjectionTest.java:65:37:65:54 | compile(...) : CompiledExpression | provenance | Config |
3940
| MvelInjectionTest.java:65:37:65:54 | compile(...) : CompiledExpression | MvelInjectionTest.java:66:64:66:72 | statement : CompiledExpression | provenance | |
41+
| MvelInjectionTest.java:66:33:66:73 | new MvelCompiledScript(...) : MvelCompiledScript | MvelInjectionTest.java:67:5:67:10 | script | provenance | Sink:MaD:1 |
4042
| MvelInjectionTest.java:66:33:66:73 | new MvelCompiledScript(...) : MvelCompiledScript | MvelInjectionTest.java:67:5:67:10 | script | provenance | Sink:MaD:6 |
4143
| MvelInjectionTest.java:66:64:66:72 | statement : CompiledExpression | MvelInjectionTest.java:66:33:66:73 | new MvelCompiledScript(...) : MvelCompiledScript | provenance | Config |
4244
| MvelInjectionTest.java:75:62:75:73 | read(...) : String | MvelInjectionTest.java:75:29:75:74 | compileTemplate(...) | provenance | Config Sink:MaD:9 |

0 commit comments

Comments
 (0)