Skip to content

Commit 8d10b1b

Browse files
smowtonsmowton
committed
Convert test to inline-expectation test
1 parent 4da480e commit 8d10b1b

File tree

4 files changed

+34
-88
lines changed

4 files changed

+34
-88
lines changed

‎java/ql/integration-tests/posix-only/kotlin/default-parameter-mad-flow/test.expected

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +0,0 @@
1-
edges
2-
| user.kt:7:32:7:39 | source(...) : Number | user.kt:7:8:7:43 | new ConstructorWithDefaults(...) |
3-
| user.kt:8:32:8:39 | source(...) : Number | user.kt:8:8:8:40 | new ConstructorWithDefaults(...) |
4-
| user.kt:10:29:10:36 | source(...) : Number | user.kt:10:8:10:40 | topLevelWithDefaults(...) |
5-
| user.kt:11:29:11:36 | source(...) : Number | user.kt:11:8:11:37 | topLevelWithDefaults$default(...) |
6-
| user.kt:13:44:13:51 | source(...) : Number | user.kt:13:22:13:55 | extensionWithDefaults(...) |
7-
| user.kt:14:44:14:51 | source(...) : Number | user.kt:14:22:14:52 | extensionWithDefaults$default(...) |
8-
| user.kt:16:29:16:36 | source(...) : Number | user.kt:16:10:16:40 | memberWithDefaults(...) |
9-
| user.kt:17:29:17:36 | source(...) : Number | user.kt:17:10:17:37 | memberWithDefaults$default(...) |
10-
| user.kt:20:52:20:59 | source(...) : Number | user.kt:20:24:20:63 | extensionMemberWithDefaults(...) |
11-
| user.kt:21:52:21:59 | source(...) : Number | user.kt:21:24:21:60 | extensionMemberWithDefaults$default(...) |
12-
| user.kt:26:23:26:24 | st [post update] : SomeToken | user.kt:27:10:27:11 | st |
13-
| user.kt:32:38:32:39 | st [post update] : SomeToken | user.kt:33:10:33:11 | st |
14-
| user.kt:38:29:38:30 | st [post update] : SomeToken | user.kt:39:10:39:11 | st |
15-
nodes
16-
| user.kt:7:8:7:43 | new ConstructorWithDefaults(...) | semmle.label | new ConstructorWithDefaults(...) |
17-
| user.kt:7:32:7:39 | source(...) : Number | semmle.label | source(...) : Number |
18-
| user.kt:8:8:8:40 | new ConstructorWithDefaults(...) | semmle.label | new ConstructorWithDefaults(...) |
19-
| user.kt:8:32:8:39 | source(...) : Number | semmle.label | source(...) : Number |
20-
| user.kt:10:8:10:40 | topLevelWithDefaults(...) | semmle.label | topLevelWithDefaults(...) |
21-
| user.kt:10:29:10:36 | source(...) : Number | semmle.label | source(...) : Number |
22-
| user.kt:11:8:11:37 | topLevelWithDefaults$default(...) | semmle.label | topLevelWithDefaults$default(...) |
23-
| user.kt:11:29:11:36 | source(...) : Number | semmle.label | source(...) : Number |
24-
| user.kt:13:22:13:55 | extensionWithDefaults(...) | semmle.label | extensionWithDefaults(...) |
25-
| user.kt:13:44:13:51 | source(...) : Number | semmle.label | source(...) : Number |
26-
| user.kt:14:22:14:52 | extensionWithDefaults$default(...) | semmle.label | extensionWithDefaults$default(...) |
27-
| user.kt:14:44:14:51 | source(...) : Number | semmle.label | source(...) : Number |
28-
| user.kt:16:10:16:40 | memberWithDefaults(...) | semmle.label | memberWithDefaults(...) |
29-
| user.kt:16:29:16:36 | source(...) : Number | semmle.label | source(...) : Number |
30-
| user.kt:17:10:17:37 | memberWithDefaults$default(...) | semmle.label | memberWithDefaults$default(...) |
31-
| user.kt:17:29:17:36 | source(...) : Number | semmle.label | source(...) : Number |
32-
| user.kt:20:24:20:63 | extensionMemberWithDefaults(...) | semmle.label | extensionMemberWithDefaults(...) |
33-
| user.kt:20:52:20:59 | source(...) : Number | semmle.label | source(...) : Number |
34-
| user.kt:21:24:21:60 | extensionMemberWithDefaults$default(...) | semmle.label | extensionMemberWithDefaults$default(...) |
35-
| user.kt:21:52:21:59 | source(...) : Number | semmle.label | source(...) : Number |
36-
| user.kt:26:23:26:24 | st [post update] : SomeToken | semmle.label | st [post update] : SomeToken |
37-
| user.kt:27:10:27:11 | st | semmle.label | st |
38-
| user.kt:32:38:32:39 | st [post update] : SomeToken | semmle.label | st [post update] : SomeToken |
39-
| user.kt:33:10:33:11 | st | semmle.label | st |
40-
| user.kt:38:29:38:30 | st [post update] : SomeToken | semmle.label | st [post update] : SomeToken |
41-
| user.kt:39:10:39:11 | st | semmle.label | st |
42-
| user.kt:42:13:42:20 | source(...) | semmle.label | source(...) |
43-
| user.kt:43:16:43:23 | source(...) | semmle.label | source(...) |
44-
| user.kt:44:31:44:38 | source(...) | semmle.label | source(...) |
45-
| user.kt:45:20:45:27 | source(...) | semmle.label | source(...) |
46-
| user.kt:47:39:47:46 | source(...) | semmle.label | source(...) |
47-
subpaths
48-
#select
49-
| user.kt:7:32:7:39 | source(...) : Number | user.kt:7:32:7:39 | source(...) : Number | user.kt:7:8:7:43 | new ConstructorWithDefaults(...) | flow path |
50-
| user.kt:8:32:8:39 | source(...) : Number | user.kt:8:32:8:39 | source(...) : Number | user.kt:8:8:8:40 | new ConstructorWithDefaults(...) | flow path |
51-
| user.kt:10:29:10:36 | source(...) : Number | user.kt:10:29:10:36 | source(...) : Number | user.kt:10:8:10:40 | topLevelWithDefaults(...) | flow path |
52-
| user.kt:11:29:11:36 | source(...) : Number | user.kt:11:29:11:36 | source(...) : Number | user.kt:11:8:11:37 | topLevelWithDefaults$default(...) | flow path |
53-
| user.kt:13:44:13:51 | source(...) : Number | user.kt:13:44:13:51 | source(...) : Number | user.kt:13:22:13:55 | extensionWithDefaults(...) | flow path |
54-
| user.kt:14:44:14:51 | source(...) : Number | user.kt:14:44:14:51 | source(...) : Number | user.kt:14:22:14:52 | extensionWithDefaults$default(...) | flow path |
55-
| user.kt:16:29:16:36 | source(...) : Number | user.kt:16:29:16:36 | source(...) : Number | user.kt:16:10:16:40 | memberWithDefaults(...) | flow path |
56-
| user.kt:17:29:17:36 | source(...) : Number | user.kt:17:29:17:36 | source(...) : Number | user.kt:17:10:17:37 | memberWithDefaults$default(...) | flow path |
57-
| user.kt:20:52:20:59 | source(...) : Number | user.kt:20:52:20:59 | source(...) : Number | user.kt:20:24:20:63 | extensionMemberWithDefaults(...) | flow path |
58-
| user.kt:21:52:21:59 | source(...) : Number | user.kt:21:52:21:59 | source(...) : Number | user.kt:21:24:21:60 | extensionMemberWithDefaults$default(...) | flow path |
59-
| user.kt:26:23:26:24 | st [post update] : SomeToken | user.kt:26:23:26:24 | st [post update] : SomeToken | user.kt:27:10:27:11 | st | flow path |
60-
| user.kt:32:38:32:39 | st [post update] : SomeToken | user.kt:32:38:32:39 | st [post update] : SomeToken | user.kt:33:10:33:11 | st | flow path |
61-
| user.kt:38:29:38:30 | st [post update] : SomeToken | user.kt:38:29:38:30 | st [post update] : SomeToken | user.kt:39:10:39:11 | st | flow path |
62-
| user.kt:42:13:42:20 | source(...) | user.kt:42:13:42:20 | source(...) | user.kt:42:13:42:20 | source(...) | flow path |
63-
| user.kt:43:16:43:23 | source(...) | user.kt:43:16:43:23 | source(...) | user.kt:43:16:43:23 | source(...) | flow path |
64-
| user.kt:44:31:44:38 | source(...) | user.kt:44:31:44:38 | source(...) | user.kt:44:31:44:38 | source(...) | flow path |
65-
| user.kt:45:20:45:27 | source(...) | user.kt:45:20:45:27 | source(...) | user.kt:45:20:45:27 | source(...) | flow path |
66-
| user.kt:47:39:47:46 | source(...) | user.kt:47:39:47:46 | source(...) | user.kt:47:39:47:46 | source(...) | flow path |

‎java/ql/integration-tests/posix-only/kotlin/default-parameter-mad-flow/test.ql

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import java
22
import semmle.code.java.dataflow.TaintTracking
3-
import DataFlow::PathGraph
3+
import TestUtilities.InlineExpectationsTest
44
private import semmle.code.java.dataflow.ExternalFlow
55

66
private class Models extends SummaryModelCsv {
@@ -56,6 +56,17 @@ class Config extends TaintTracking::Configuration {
5656
}
5757
}
5858

59-
from DataFlow::PathNode source, DataFlow::PathNode sink, Config c
60-
where c.hasFlowPath(source, sink)
61-
select source, source, sink, "flow path"
59+
class InlineFlowTest extends InlineExpectationsTest {
60+
InlineFlowTest() { this = "HasFlowTest" }
61+
62+
override string getARelevantTag() { result = "flow" }
63+
64+
override predicate hasActualResult(Location location, string element, string tag, string value) {
65+
tag = "flow" and
66+
exists(DataFlow::Node src, DataFlow::Node sink, Config c | c.hasFlow(src, sink) |
67+
sink.getLocation() = location and
68+
element = sink.toString() and
69+
value = ""
70+
)
71+
}
72+
}

‎java/ql/integration-tests/posix-only/kotlin/default-parameter-mad-flow/user.kt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,47 @@ fun sink(x: Any) { }
44

55
fun test(c: LibClass, sourcec: SourceClass, sinkc: SinkClass) {
66

7-
sink(ConstructorWithDefaults(source(), 0))
8-
sink(ConstructorWithDefaults(source()))
7+
sink(ConstructorWithDefaults(source(), 0)) // $ flow
8+
sink(ConstructorWithDefaults(source())) // $ flow
99

10-
sink(topLevelWithDefaults(source(), 0))
11-
sink(topLevelWithDefaults(source()))
10+
sink(topLevelWithDefaults(source(), 0)) // $ flow
11+
sink(topLevelWithDefaults(source())) // $ flow
1212

13-
sink("Hello world".extensionWithDefaults(source(), 0))
14-
sink("Hello world".extensionWithDefaults(source()))
13+
sink("Hello world".extensionWithDefaults(source(), 0)) // $ flow
14+
sink("Hello world".extensionWithDefaults(source())) // $ flow
1515

16-
sink(c.memberWithDefaults(source(), 0))
17-
sink(c.memberWithDefaults(source()))
16+
sink(c.memberWithDefaults(source(), 0)) // $ flow
17+
sink(c.memberWithDefaults(source())) // $ flow
1818

1919
with(c) {
20-
sink("Hello world".extensionMemberWithDefaults(source(), 0))
21-
sink("Hello world".extensionMemberWithDefaults(source()))
20+
sink("Hello world".extensionMemberWithDefaults(source(), 0)) // $ flow
21+
sink("Hello world".extensionMemberWithDefaults(source())) // $ flow
2222
};
2323

2424
run {
2525
val st = SomeToken()
2626
topLevelArgSource(st)
27-
sink(st)
27+
sink(st) // $ flow
2828
}
2929

3030
run {
3131
val st = SomeToken()
3232
"Hello world".extensionArgSource(st)
33-
sink(st)
33+
sink(st) // $ flow
3434
}
3535

3636
run {
3737
val st = SomeToken()
3838
sourcec.memberArgSource(st)
39-
sink(st)
39+
sink(st) // $ flow
4040
}
4141

42-
SinkClass(source())
43-
topLevelSink(source())
44-
"Hello world".extensionSink(source())
45-
sinkc.memberSink(source())
42+
SinkClass(source()) // $ flow
43+
topLevelSink(source()) // $ flow
44+
"Hello world".extensionSink(source()) // $ flow
45+
sinkc.memberSink(source()) // $ flow
4646
with(sinkc) {
47-
"Hello world".extensionMemberSink(source())
47+
"Hello world".extensionMemberSink(source()) // $ flow
4848
}
4949

5050
}

‎java/ql/integration-tests/posix-only/kotlin/qlpack.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
libraryPathDependencies:
22
- codeql-java
3+
- codeql/java-tests

0 commit comments

Comments
 (0)