Skip to content

Commit 789ac79

Browse files
paldepindpaldepind
committed
Rust: Update tests and expected files
1 parent d4afc47 commit 789ac79

File tree

10 files changed

+250
-176
lines changed

10 files changed

+250
-176
lines changed

‎rust/ql/test/library-tests/dataflow/sources/database/InlineFlow.expected‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ edges
5050
| test.rs:42:20:42:21 | t1 [element] | test.rs:42:13:42:15 | row | provenance | |
5151
| test.rs:48:22:48:30 | query_map | test.rs:50:14:50:24 | ...: i64 | provenance | Src:MaD:3 |
5252
| test.rs:50:14:50:24 | ...: i64 | test.rs:51:22:51:27 | values | provenance | |
53+
| test.rs:55:22:55:30 | query_map | test.rs:57:14:57:39 | ...: ... | provenance | Src:MaD:3 |
54+
| test.rs:57:14:57:39 | ...: ... | test.rs:59:22:59:29 | values.1 | provenance | |
5355
| test.rs:64:13:64:17 | total | test.rs:68:14:68:18 | total | provenance | |
5456
| test.rs:64:21:67:10 | conn.query_fold(...) [Ok] | test.rs:64:21:67:11 | TryExpr | provenance | |
5557
| test.rs:64:21:67:11 | TryExpr | test.rs:64:13:64:17 | total | provenance | |
@@ -62,6 +64,9 @@ edges
6264
| test.rs:66:19:66:21 | row | test.rs:66:13:66:21 | ... + ... | provenance | MaD:11 |
6365
| test.rs:66:19:66:21 | row | test.rs:66:13:66:21 | ... + ... | provenance | MaD:12 |
6466
| test.rs:66:19:66:21 | row | test.rs:66:13:66:21 | ... + ... | provenance | MaD:15 |
67+
| test.rs:70:22:70:31 | query_fold | test.rs:70:83:70:105 | ...: ... | provenance | Src:MaD:2 |
68+
| test.rs:70:83:70:105 | ...: ... | test.rs:72:17:72:20 | name | provenance | |
69+
| test.rs:72:17:72:20 | name | test.rs:75:18:75:21 | name | provenance | |
6570
| test.rs:105:13:105:14 | v1 | test.rs:106:14:106:15 | v1 | provenance | |
6671
| test.rs:105:24:105:33 | row.get(...) [Some] | test.rs:105:24:105:42 | ... .unwrap() | provenance | MaD:16 |
6772
| test.rs:105:24:105:42 | ... .unwrap() | test.rs:105:13:105:14 | v1 | provenance | |
@@ -82,6 +87,8 @@ edges
8287
| test.rs:114:28:114:35 | take_opt | test.rs:114:24:114:38 | row.take_opt(...) [Some, Ok] | provenance | Src:MaD:10 |
8388
| test.rs:135:22:135:30 | query_map | test.rs:137:14:137:24 | ...: i64 | provenance | Src:MaD:5 |
8489
| test.rs:137:14:137:24 | ...: i64 | test.rs:138:22:138:27 | values | provenance | |
90+
| test.rs:142:22:142:30 | query_map | test.rs:144:14:144:39 | ...: ... | provenance | Src:MaD:5 |
91+
| test.rs:144:14:144:39 | ...: ... | test.rs:146:22:146:29 | values.1 | provenance | |
8592
| test.rs:151:13:151:17 | total | test.rs:155:14:155:18 | total | provenance | |
8693
| test.rs:151:21:154:10 | conn.query_fold(...) [future, Ok] | test.rs:151:21:154:16 | await ... [Ok] | provenance | |
8794
| test.rs:151:21:154:16 | await ... [Ok] | test.rs:151:21:154:17 | TryExpr | provenance | |
@@ -95,6 +102,9 @@ edges
95102
| test.rs:153:19:153:21 | row | test.rs:153:13:153:21 | ... + ... | provenance | MaD:11 |
96103
| test.rs:153:19:153:21 | row | test.rs:153:13:153:21 | ... + ... | provenance | MaD:12 |
97104
| test.rs:153:19:153:21 | row | test.rs:153:13:153:21 | ... + ... | provenance | MaD:15 |
105+
| test.rs:157:22:157:31 | query_fold | test.rs:157:83:157:105 | ...: ... | provenance | Src:MaD:4 |
106+
| test.rs:157:83:157:105 | ...: ... | test.rs:159:17:159:20 | name | provenance | |
107+
| test.rs:159:17:159:20 | name | test.rs:162:18:162:21 | name | provenance | |
98108
nodes
99109
| test.rs:18:13:18:14 | v1 | semmle.label | v1 |
100110
| test.rs:18:24:18:33 | row.get(...) [Some] | semmle.label | row.get(...) [Some] |
@@ -137,6 +147,9 @@ nodes
137147
| test.rs:48:22:48:30 | query_map | semmle.label | query_map |
138148
| test.rs:50:14:50:24 | ...: i64 | semmle.label | ...: i64 |
139149
| test.rs:51:22:51:27 | values | semmle.label | values |
150+
| test.rs:55:22:55:30 | query_map | semmle.label | query_map |
151+
| test.rs:57:14:57:39 | ...: ... | semmle.label | ...: ... |
152+
| test.rs:59:22:59:29 | values.1 | semmle.label | values.1 |
140153
| test.rs:64:13:64:17 | total | semmle.label | total |
141154
| test.rs:64:21:67:10 | conn.query_fold(...) [Ok] | semmle.label | conn.query_fold(...) [Ok] |
142155
| test.rs:64:21:67:11 | TryExpr | semmle.label | TryExpr |
@@ -147,6 +160,10 @@ nodes
147160
| test.rs:66:13:66:21 | ... + ... | semmle.label | ... + ... |
148161
| test.rs:66:19:66:21 | row | semmle.label | row |
149162
| test.rs:68:14:68:18 | total | semmle.label | total |
163+
| test.rs:70:22:70:31 | query_fold | semmle.label | query_fold |
164+
| test.rs:70:83:70:105 | ...: ... | semmle.label | ...: ... |
165+
| test.rs:72:17:72:20 | name | semmle.label | name |
166+
| test.rs:75:18:75:21 | name | semmle.label | name |
150167
| test.rs:105:13:105:14 | v1 | semmle.label | v1 |
151168
| test.rs:105:24:105:33 | row.get(...) [Some] | semmle.label | row.get(...) [Some] |
152169
| test.rs:105:24:105:42 | ... .unwrap() | semmle.label | ... .unwrap() |
@@ -172,6 +189,9 @@ nodes
172189
| test.rs:135:22:135:30 | query_map | semmle.label | query_map |
173190
| test.rs:137:14:137:24 | ...: i64 | semmle.label | ...: i64 |
174191
| test.rs:138:22:138:27 | values | semmle.label | values |
192+
| test.rs:142:22:142:30 | query_map | semmle.label | query_map |
193+
| test.rs:144:14:144:39 | ...: ... | semmle.label | ...: ... |
194+
| test.rs:146:22:146:29 | values.1 | semmle.label | values.1 |
175195
| test.rs:151:13:151:17 | total | semmle.label | total |
176196
| test.rs:151:21:154:10 | conn.query_fold(...) [future, Ok] | semmle.label | conn.query_fold(...) [future, Ok] |
177197
| test.rs:151:21:154:16 | await ... [Ok] | semmle.label | await ... [Ok] |
@@ -183,6 +203,10 @@ nodes
183203
| test.rs:153:13:153:21 | ... + ... | semmle.label | ... + ... |
184204
| test.rs:153:19:153:21 | row | semmle.label | row |
185205
| test.rs:155:14:155:18 | total | semmle.label | total |
206+
| test.rs:157:22:157:31 | query_fold | semmle.label | query_fold |
207+
| test.rs:157:83:157:105 | ...: ... | semmle.label | ...: ... |
208+
| test.rs:159:17:159:20 | name | semmle.label | name |
209+
| test.rs:162:18:162:21 | name | semmle.label | name |
186210
subpaths
187211
testFailures
188212
#select
@@ -194,12 +218,16 @@ testFailures
194218
| test.rs:41:14:41:70 | ... .unwrap() | test.rs:41:42:41:44 | get | test.rs:41:14:41:70 | ... .unwrap() | $@ | test.rs:41:42:41:44 | get | get |
195219
| test.rs:44:22:44:22 | v | test.rs:40:27:40:35 | exec_iter | test.rs:44:22:44:22 | v | $@ | test.rs:40:27:40:35 | exec_iter | exec_iter |
196220
| test.rs:51:22:51:27 | values | test.rs:48:22:48:30 | query_map | test.rs:51:22:51:27 | values | $@ | test.rs:48:22:48:30 | query_map | query_map |
221+
| test.rs:59:22:59:29 | values.1 | test.rs:55:22:55:30 | query_map | test.rs:59:22:59:29 | values.1 | $@ | test.rs:55:22:55:30 | query_map | query_map |
197222
| test.rs:65:18:65:20 | row | test.rs:64:26:64:35 | query_fold | test.rs:65:18:65:20 | row | $@ | test.rs:64:26:64:35 | query_fold | query_fold |
198223
| test.rs:68:14:68:18 | total | test.rs:64:26:64:35 | query_fold | test.rs:68:14:68:18 | total | $@ | test.rs:64:26:64:35 | query_fold | query_fold |
224+
| test.rs:75:18:75:21 | name | test.rs:70:22:70:31 | query_fold | test.rs:75:18:75:21 | name | $@ | test.rs:70:22:70:31 | query_fold | query_fold |
199225
| test.rs:106:14:106:15 | v1 | test.rs:105:28:105:30 | get | test.rs:106:14:106:15 | v1 | $@ | test.rs:105:28:105:30 | get | get |
200226
| test.rs:109:14:109:15 | v2 | test.rs:108:28:108:34 | get_opt | test.rs:109:14:109:15 | v2 | $@ | test.rs:108:28:108:34 | get_opt | get_opt |
201227
| test.rs:112:14:112:15 | v3 | test.rs:111:28:111:31 | take | test.rs:112:14:112:15 | v3 | $@ | test.rs:111:28:111:31 | take | take |
202228
| test.rs:115:14:115:15 | v4 | test.rs:114:28:114:35 | take_opt | test.rs:115:14:115:15 | v4 | $@ | test.rs:114:28:114:35 | take_opt | take_opt |
203229
| test.rs:138:22:138:27 | values | test.rs:135:22:135:30 | query_map | test.rs:138:22:138:27 | values | $@ | test.rs:135:22:135:30 | query_map | query_map |
230+
| test.rs:146:22:146:29 | values.1 | test.rs:142:22:142:30 | query_map | test.rs:146:22:146:29 | values.1 | $@ | test.rs:142:22:142:30 | query_map | query_map |
204231
| test.rs:152:18:152:20 | row | test.rs:151:26:151:35 | query_fold | test.rs:152:18:152:20 | row | $@ | test.rs:151:26:151:35 | query_fold | query_fold |
205232
| test.rs:155:14:155:18 | total | test.rs:151:26:151:35 | query_fold | test.rs:155:14:155:18 | total | $@ | test.rs:151:26:151:35 | query_fold | query_fold |
233+
| test.rs:162:18:162:21 | name | test.rs:157:22:157:31 | query_fold | test.rs:162:18:162:21 | name | $@ | test.rs:157:22:157:31 | query_fold | query_fold |

‎rust/ql/test/library-tests/dataflow/sources/database/test.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ mod test_mysql {
5656
"SELECT id, name, age FROM person",
5757
|values: (i64, String, i32)| -> () {
5858
sink(values.0); // $ MISSING: hasTaintFlow
59-
sink(values.1); // $ MISSING: hasTaintFlow
59+
sink(values.1); // $ hasTaintFlow
6060
sink(values.2); // $ MISSING: hasTaintFlow
6161
}
6262
)?;
@@ -72,7 +72,7 @@ mod test_mysql {
7272
let name: String = row.1;
7373
let age: i32 = row.2;
7474
sink(id); // $ MISSING: hasTaintFlow
75-
sink(name); // $ MISSING: hasTaintFlow
75+
sink(name); // $ hasTaintFlow
7676
sink(age); // $ MISSING: hasTaintFlow
7777
acc + 1
7878
})?;
@@ -143,7 +143,7 @@ mod test_mysql_async {
143143
"SELECT id, name, age FROM person",
144144
|values: (i64, String, i32)| -> () {
145145
sink(values.0); // $ MISSING: hasTaintFlow
146-
sink(values.1); // $ MISSING: hasTaintFlow
146+
sink(values.1); // $ hasTaintFlow
147147
sink(values.2); // $ MISSING: hasTaintFlow
148148
}
149149
).await?;
@@ -159,7 +159,7 @@ mod test_mysql_async {
159159
let name: String = row.1;
160160
let age: i32 = row.2;
161161
sink(id); // $ MISSING: hasTaintFlow
162-
sink(name); // $ MISSING: hasTaintFlow
162+
sink(name); // $ hasTaintFlow
163163
sink(age); // $ MISSING: hasTaintFlow
164164
acc + 1
165165
}).await?;

0 commit comments

Comments
 (0)