Skip to content

Commit b3e5b86

Browse files
michaelnebelmichaelnebel
committed
Java: Cleanup threat models tests.
1 parent 33f10d8 commit b3e5b86

12 files changed

+95
-39
lines changed

‎java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.ext.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
extensions:
22

33
- addsTo:
4-
pack: codeql/java-all
5-
extensible: supportedThreatModels
4+
pack: codeql/threat-models
5+
extensible: threatModelConfiguration
66
data:
7-
- ["database"]
7+
- ["database", true, 0]
88

99
- addsTo:
1010
pack: codeql/java-all

‎java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.ext.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
extensions:
22

33
- addsTo:
4-
pack: codeql/java-all
5-
extensible: supportedThreatModels
4+
pack: codeql/threat-models
5+
extensible: threatModelConfiguration
66
data:
7-
- ["local"]
7+
- ["local", true, 0]
88

99
- addsTo:
1010
pack: codeql/java-all

‎java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.ext.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
extensions:
22

33
- addsTo:
4-
pack: codeql/java-all
5-
extensible: supportedThreatModels
4+
pack: codeql/threat-models
5+
extensible: threatModelConfiguration
66
data:
7-
- ["all"]
7+
- ["all", true, 0]
88

99
- addsTo:
1010
pack: codeql/java-all

‎java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ext.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
extensions:
22

33
- addsTo:
4-
pack: codeql/java-all
5-
extensible: supportedThreatModels
4+
pack: codeql/threat-models
5+
extensible: threatModelConfiguration
66
data:
7-
- ["environment"]
8-
- ["commandargs"]
7+
- ["environment", true, 0]
8+
- ["commandargs", true, 0]
99

1010
- addsTo:
1111
pack: codeql/java-all

‎java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
edges
2+
| Test.java:10:31:10:41 | data : byte[] | Test.java:11:23:11:26 | data : byte[] |
3+
| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String |
4+
| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] |
5+
| Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:22:49:22:52 | data : byte[] |
6+
| Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:25:69:25:72 | data : byte[] |
7+
| Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
8+
| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) |
9+
| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... |
10+
| Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
11+
| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String |
12+
| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... |
13+
| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result |
14+
| Test.java:64:5:64:13 | System.in : InputStream | Test.java:64:20:64:23 | data [post update] : byte[] |
15+
| Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:67:69:67:72 | data : byte[] |
16+
| Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:70:49:70:52 | data : byte[] |
17+
| Test.java:67:56:67:73 | byteToString(...) : String | Test.java:67:26:67:80 | ... + ... |
18+
| Test.java:67:69:67:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
19+
| Test.java:67:69:67:72 | data : byte[] | Test.java:67:56:67:73 | byteToString(...) : String |
20+
| Test.java:70:49:70:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
21+
| Test.java:70:49:70:52 | data : byte[] | Test.java:70:36:70:53 | byteToString(...) |
22+
nodes
23+
| Test.java:10:31:10:41 | data : byte[] | semmle.label | data : byte[] |
24+
| Test.java:11:12:11:51 | new String(...) : String | semmle.label | new String(...) : String |
25+
| Test.java:11:23:11:26 | data : byte[] | semmle.label | data : byte[] |
26+
| Test.java:19:5:19:25 | getInputStream(...) : InputStream | semmle.label | getInputStream(...) : InputStream |
27+
| Test.java:19:32:19:35 | data [post update] : byte[] | semmle.label | data [post update] : byte[] |
28+
| Test.java:22:36:22:53 | byteToString(...) | semmle.label | byteToString(...) |
29+
| Test.java:22:49:22:52 | data : byte[] | semmle.label | data : byte[] |
30+
| Test.java:25:26:25:80 | ... + ... | semmle.label | ... + ... |
31+
| Test.java:25:56:25:73 | byteToString(...) : String | semmle.label | byteToString(...) : String |
32+
| Test.java:25:69:25:72 | data : byte[] | semmle.label | data : byte[] |
33+
| Test.java:30:21:30:61 | executeQuery(...) : String | semmle.label | executeQuery(...) : String |
34+
| Test.java:33:26:33:68 | ... + ... | semmle.label | ... + ... |
35+
| Test.java:36:36:36:41 | result | semmle.label | result |
36+
| Test.java:64:5:64:13 | System.in : InputStream | semmle.label | System.in : InputStream |
37+
| Test.java:64:20:64:23 | data [post update] : byte[] | semmle.label | data [post update] : byte[] |
38+
| Test.java:67:26:67:80 | ... + ... | semmle.label | ... + ... |
39+
| Test.java:67:56:67:73 | byteToString(...) : String | semmle.label | byteToString(...) : String |
40+
| Test.java:67:69:67:72 | data : byte[] | semmle.label | data : byte[] |
41+
| Test.java:70:36:70:53 | byteToString(...) | semmle.label | byteToString(...) |
42+
| Test.java:70:49:70:52 | data : byte[] | semmle.label | data : byte[] |
43+
subpaths
44+
| Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:22:36:22:53 | byteToString(...) |
45+
| Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:25:56:25:73 | byteToString(...) : String |
46+
| Test.java:67:69:67:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:67:56:67:73 | byteToString(...) : String |
47+
| Test.java:70:49:70:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:70:36:70:53 | byteToString(...) |
48+
#select
49+
| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:22:36:22:53 | byteToString(...) |
50+
| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:25:26:25:80 | ... + ... |
51+
| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... |
52+
| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result |
53+
| Test.java:64:5:64:13 | System.in : InputStream | Test.java:67:26:67:80 | ... + ... |
54+
| Test.java:64:5:64:13 | System.in : InputStream | Test.java:70:36:70:53 | byteToString(...) |

‎java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.ext.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
extensions:
2+
3+
- addsTo:
4+
pack: codeql/threat-models
5+
extensible: threatModelConfiguration
6+
data:
7+
- ["local", true, 0]
8+
- ["environment", false, 1]
9+
10+
- addsTo:
11+
pack: codeql/java-all
12+
extensible: sourceModel
13+
data:
14+
- ["testlib", "TestSources", False, "executeQuery", "(String)", "", "ReturnValue", "database", "manual"]
15+
- ["testlib", "TestSources", False, "readEnv", "(String)", "", "ReturnValue", "environment", "manual"]
16+
- ["testlib", "TestSources", False, "getCustom", "(String)", "", "ReturnValue", "custom", "manual"]

‎java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.ql

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/**
2+
* This is a dataflow test using the "default" threat model with the
3+
* addition of the threat model group "local", but without the
4+
* "environment" threat model.
5+
*/
6+
7+
import Test
8+
import ThreatModel::PathGraph
9+
10+
from ThreatModel::PathNode source, ThreatModel::PathNode sink
11+
where ThreatModel::flowPath(source, sink)
12+
select source, sink

‎java/ql/test/library-tests/dataflow/threat-models/threat-models1.expected

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎java/ql/test/library-tests/dataflow/threat-models/threat-models1.ql

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎java/ql/test/library-tests/dataflow/threat-models/threat-models2.expected

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)