Skip to content

Commit a583f00

Browse files
committed
Java: Fix tests.
1 parent 2af3598 commit a583f00

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

java/ql/src/Likely Bugs/Serialization/NonSerializableField.ql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ predicate serializableType(RefType t) {
3434
// Collection interfaces are not serializable, but their implementations are
3535
// likely to be.
3636
collectionOrMapType(t) and
37+
not t instanceof RawType and
3738
forall(RefType param | param = t.(ParameterizedType).getATypeArgument() | serializableType(param))
3839
or
3940
exists(BoundedType bt | bt = t | serializableType(bt.getUpperBoundType()))

java/ql/test/query-tests/ContainerSizeCmpZero/ContainerSizeCmpZero.expected

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@
1313
| Main.java:90:13:90:42 | ... >= ... | This expression is always true, since a string can never have negative size. |
1414
| Main.java:97:13:97:26 | ... >= ... | This expression is always true, since a map can never have negative size. |
1515
| Main.java:100:13:100:26 | ... <= ... | This expression is always true, since a map can never have negative size. |
16+
| Main.java:113:13:113:25 | ... >= ... | This expression is always true, since a collection can never have negative size. |
17+
| Main.java:114:13:114:25 | ... >= ... | This expression is always true, since a collection can never have negative size. |
18+
| Main.java:115:13:115:25 | ... <= ... | This expression is always true, since a map can never have negative size. |

java/ql/test/query-tests/ContainerSizeCmpZero/Main.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ public static void rawTypes(Set s, ArrayList a, HashMap m) {
110110
Boolean b;
111111

112112
// NOT OK
113-
// false negatives: raw collections and maps are not currently handled
114113
b = s.size() >= 0;
115114
b = a.size() >= 0;
116115
b = 0 <= m.size();

0 commit comments

Comments
 (0)