Skip to content

Commit 9a4de20

Browse files
committed
Java: Fix qltests.
1 parent d1a616a commit 9a4de20

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

java/ql/src/Metrics/Summaries/TopJdkApis.qll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@ class TopJdkApi extends SummarizedCallableBase {
307307
predicate hasManualMadModel() { this.hasManualSummary() or this.hasManualNeutral() }
308308
/*
309309
* Note: the following top JDK APIs are not modeled with MaD:
310+
* `java.lang.Runnable#run()`: specialised lambda flow
310311
* `java.lang.String#valueOf(Object)`: a complex case; an alias for `Object.toString`, except the dispatch is hidden
311312
* `java.lang.System#getProperty(String)`: needs to be modeled by regular CodeQL matching the get and set keys to reduce FPs
312313
* `java.lang.System#setProperty(String,String)`: needs to be modeled by regular CodeQL matching the get and set keys to reduce FPs

java/ql/test/ext/TopJdkApis/TopJdkApisTest.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
| java.lang.Runnable#run() | no manual model |
12
| java.lang.String#valueOf(Object) | no manual model |
23
| java.lang.System#getProperty(String) | no manual model |
34
| java.lang.System#setProperty(String,String) | no manual model |

java/ql/test/library-tests/frameworks/ratpack/resources/IntegrationTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@ void test5(Context ctx) {
107107
filterAndMerge_2(pojoForm, mergedParams, name -> false);
108108
return mergedParams;
109109
}).then(pojoMap -> {
110-
sink(pojoMap.keySet().iterator().next()); //TODO:$hasTaintFlow
111-
sink(pojoMap.get("value")); //TODO:$hasTaintFlow
110+
sink(pojoMap.keySet().iterator().next()); //$hasTaintFlow
111+
sink(pojoMap.get("value")); //$hasTaintFlow
112112
pojoMap.forEach((key, value) -> {
113-
sink(key); //TODO:$hasTaintFlow
114-
sink(value); //TODO:$hasTaintFlow
113+
sink(key); //$hasTaintFlow
114+
sink(value); //$hasTaintFlow
115115
List<Object> values = (List<Object>) value;
116-
sink(values.get(0)); //TODO:$hasTaintFlow
116+
sink(values.get(0)); //$hasTaintFlow
117117
});
118118
});
119119
}

java/ql/test/library-tests/frameworks/ratpack/resources/Resource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,13 +361,13 @@ void test15() {
361361
Promise
362362
.value(tainted)
363363
.nextOp(value -> Operation.of(() -> {
364-
sink(value); //$hasTaintFlow
364+
sink(value); // MISSING: $hasTaintFlow
365365
}))
366366
.nextOpIf(value -> {
367367
sink(value); //$hasTaintFlow
368368
return true;
369369
}, value -> Operation.of(() -> {
370-
sink(value); //$hasTaintFlow
370+
sink(value); // MISSING: $hasTaintFlow
371371
}))
372372
.then(value -> {
373373
sink(value); //$hasTaintFlow
@@ -379,7 +379,7 @@ void test16() {
379379
Promise
380380
.value(tainted)
381381
.flatOp(value -> Operation.of(() -> {
382-
sink(value); //$hasTaintFlow
382+
sink(value); // MISSING: $hasTaintFlow
383383
}));
384384
}
385385

0 commit comments

Comments
 (0)