Skip to content

Commit f94e467

Browse files
owen-mcowen-mc
committed
Fixes to models and tests
Running the test generator script again showed many missing tests.
1 parent 377403d commit f94e467

File tree

2 files changed

+436
-36
lines changed

2 files changed

+436
-36
lines changed

‎java/ql/src/semmle/code/java/frameworks/apache/Collections.qll

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private class ApacheCollectionsModel extends SummaryModelCsv {
7272
"org.apache.commons.collections4;FluentIterable;true;unmodifiable;;;Element of Argument[-1];Element of ReturnValue;value",
7373
"org.apache.commons.collections4;FluentIterable;true;zip;(Iterable);;Element of Argument[-1];Element of ReturnValue;value",
7474
"org.apache.commons.collections4;FluentIterable;true;zip;(Iterable);;Element of Argument[0];Element of ReturnValue;value",
75-
"org.apache.commons.collections4;FluentIterable;true;zip;(Iterable);;Element of Argument[-1];Element of ReturnValue;value",
75+
"org.apache.commons.collections4;FluentIterable;true;zip;(Iterable[]);;Element of Argument[-1];Element of ReturnValue;value",
7676
"org.apache.commons.collections4;FluentIterable;true;zip;(Iterable[]);;Element of ArrayElement of Argument[0];Element of ReturnValue;value",
7777
"org.apache.commons.collections4;Get;true;entrySet;;;MapKey of Argument[-1];MapKey of Element of ReturnValue;value",
7878
"org.apache.commons.collections4;Get;true;entrySet;;;MapValue of Argument[-1];MapValue of Element of ReturnValue;value",
@@ -113,6 +113,7 @@ private class ApacheCollectionsModel extends SummaryModelCsv {
113113
"org.apache.commons.collections4;MultiValuedMap;true;putAll;(Map);;MapValue of Argument[0];Element of MapValue of Argument[-1];value",
114114
"org.apache.commons.collections4;MultiValuedMap;true;putAll;(MultiValuedMap);;MapKey of Argument[0];MapKey of Argument[-1];value",
115115
"org.apache.commons.collections4;MultiValuedMap;true;putAll;(MultiValuedMap);;Element of MapValue of Argument[0];Element of MapValue of Argument[-1];value",
116+
"org.apache.commons.collections4;MultiValuedMap;true;remove;;;Element of MapValue of Argument[-1];Element of ReturnValue;value",
116117
"org.apache.commons.collections4;MultiValuedMap;true;values;;;Element of MapValue of Argument[-1];Element of ReturnValue;value",
117118
"org.apache.commons.collections4;OrderedIterator;true;previous;;;Element of Argument[-1];ReturnValue;value",
118119
"org.apache.commons.collections4;OrderedMap;true;firstKey;;;MapKey of Argument[-1];ReturnValue;value",
@@ -162,7 +163,7 @@ private class ApacheCollectionsModel extends SummaryModelCsv {
162163
"org.apache.commons.collections;FluentIterable;true;unmodifiable;;;Element of Argument[-1];Element of ReturnValue;value",
163164
"org.apache.commons.collections;FluentIterable;true;zip;(Iterable);;Element of Argument[-1];Element of ReturnValue;value",
164165
"org.apache.commons.collections;FluentIterable;true;zip;(Iterable);;Element of Argument[0];Element of ReturnValue;value",
165-
"org.apache.commons.collections;FluentIterable;true;zip;(Iterable);;Element of Argument[-1];Element of ReturnValue;value",
166+
"org.apache.commons.collections;FluentIterable;true;zip;(Iterable[]);;Element of Argument[-1];Element of ReturnValue;value",
166167
"org.apache.commons.collections;FluentIterable;true;zip;(Iterable[]);;Element of ArrayElement of Argument[0];Element of ReturnValue;value",
167168
"org.apache.commons.collections;Get;true;entrySet;;;MapKey of Argument[-1];MapKey of Element of ReturnValue;value",
168169
"org.apache.commons.collections;Get;true;entrySet;;;MapValue of Argument[-1];MapValue of Element of ReturnValue;value",
@@ -201,6 +202,7 @@ private class ApacheCollectionsModel extends SummaryModelCsv {
201202
"org.apache.commons.collections;MultiValuedMap;true;putAll;(Map);;MapValue of Argument[0];Element of MapValue of Argument[-1];value",
202203
"org.apache.commons.collections;MultiValuedMap;true;putAll;(MultiValuedMap);;MapKey of Argument[0];MapKey of Argument[-1];value",
203204
"org.apache.commons.collections;MultiValuedMap;true;putAll;(MultiValuedMap);;Element of MapValue of Argument[0];Element of MapValue of Argument[-1];value",
205+
"org.apache.commons.collections;MultiValuedMap;true;remove;;;Element of MapValue of Argument[-1];Element of ReturnValue;value",
204206
"org.apache.commons.collections;MultiValuedMap;true;values;;;Element of MapValue of Argument[-1];Element of ReturnValue;value",
205207
"org.apache.commons.collections;OrderedIterator;true;previous;;;Element of Argument[-1];ReturnValue;value",
206208
"org.apache.commons.collections;OrderedMap;true;firstKey;;;MapKey of Argument[-1];ReturnValue;value",
@@ -458,6 +460,7 @@ private class ApacheCollectionUtilsModel extends SummaryModelCsv {
458460
"org.apache.commons.collections4;CollectionUtils;true;extractSingleton;;;Element of Argument[0];ReturnValue;value",
459461
"org.apache.commons.collections4;CollectionUtils;true;find;;;Element of Argument[0];ReturnValue;value",
460462
"org.apache.commons.collections4;CollectionUtils;true;get;(Iterator,int);;Element of Argument[0];ReturnValue;value",
463+
"org.apache.commons.collections4;CollectionUtils;true;get;(Iterable,int);;Element of Argument[0];ReturnValue;value",
461464
"org.apache.commons.collections4;CollectionUtils;true;get;(Map,int);;MapKey of Argument[0];MapKey of ReturnValue;value",
462465
"org.apache.commons.collections4;CollectionUtils;true;get;(Map,int);;MapValue of Argument[0];MapValue of ReturnValue;value",
463466
"org.apache.commons.collections4;CollectionUtils;true;get;(Object,int);;ArrayElement of Argument[0];ReturnValue;value",
@@ -495,6 +498,7 @@ private class ApacheCollectionUtilsModel extends SummaryModelCsv {
495498
"org.apache.commons.collections;CollectionUtils;true;extractSingleton;;;Element of Argument[0];ReturnValue;value",
496499
"org.apache.commons.collections;CollectionUtils;true;find;;;Element of Argument[0];ReturnValue;value",
497500
"org.apache.commons.collections;CollectionUtils;true;get;(Iterator,int);;Element of Argument[0];ReturnValue;value",
501+
"org.apache.commons.collections;CollectionUtils;true;get;(Iterable,int);;Element of Argument[0];ReturnValue;value",
498502
"org.apache.commons.collections;CollectionUtils;true;get;(Map,int);;MapKey of Argument[0];MapKey of ReturnValue;value",
499503
"org.apache.commons.collections;CollectionUtils;true;get;(Map,int);;MapValue of Argument[0];MapValue of ReturnValue;value",
500504
"org.apache.commons.collections;CollectionUtils;true;get;(Object,int);;ArrayElement of Argument[0];ReturnValue;value",
@@ -530,9 +534,10 @@ private class ApacheListUtilsModel extends SummaryModelCsv {
530534
override predicate row(string row) {
531535
row =
532536
[
537+
"org.apache.commons.collections4;ListUtils;true;defaultIfNull;;;Argument[0];ReturnValue;value",
533538
"org.apache.commons.collections4;ListUtils;true;defaultIfNull;;;Argument[1];ReturnValue;value",
534539
"org.apache.commons.collections4;ListUtils;true;emptyIfNull;;;Argument[0];ReturnValue;value",
535-
"org.apache.commons.collections4;ListUtils;true;fixedSizeList;;;Element of Argument[1];Element of ReturnValue;value",
540+
"org.apache.commons.collections4;ListUtils;true;fixedSizeList;;;Element of Argument[0];Element of ReturnValue;value",
536541
"org.apache.commons.collections4;ListUtils;true;intersection;;;Element of Argument[0];Element of ReturnValue;value",
537542
"org.apache.commons.collections4;ListUtils;true;intersection;;;Element of Argument[1];Element of ReturnValue;value",
538543
"org.apache.commons.collections4;ListUtils;true;lazyList;;;Element of Argument[0];Element of ReturnValue;value",
@@ -556,9 +561,10 @@ private class ApacheListUtilsModel extends SummaryModelCsv {
556561
"org.apache.commons.collections4;ListUtils;true;union;;;Element of Argument[0];Element of ReturnValue;value",
557562
"org.apache.commons.collections4;ListUtils;true;union;;;Element of Argument[1];Element of ReturnValue;value",
558563
"org.apache.commons.collections4;ListUtils;true;unmodifiableList;;;Element of Argument[0];Element of ReturnValue;value",
564+
"org.apache.commons.collections;ListUtils;true;defaultIfNull;;;Argument[0];ReturnValue;value",
559565
"org.apache.commons.collections;ListUtils;true;defaultIfNull;;;Argument[1];ReturnValue;value",
560566
"org.apache.commons.collections;ListUtils;true;emptyIfNull;;;Argument[0];ReturnValue;value",
561-
"org.apache.commons.collections;ListUtils;true;fixedSizeList;;;Element of Argument[1];Element of ReturnValue;value",
567+
"org.apache.commons.collections;ListUtils;true;fixedSizeList;;;Element of Argument[0];Element of ReturnValue;value",
562568
"org.apache.commons.collections;ListUtils;true;intersection;;;Element of Argument[0];Element of ReturnValue;value",
563569
"org.apache.commons.collections;ListUtils;true;intersection;;;Element of Argument[1];Element of ReturnValue;value",
564570
"org.apache.commons.collections;ListUtils;true;lazyList;;;Element of Argument[0];Element of ReturnValue;value",
@@ -602,6 +608,7 @@ private class ApacheIteratorUtilsModel extends SummaryModelCsv {
602608
"org.apache.commons.collections4;IteratorUtils;true;asMultipleUseIterable;;;Element of Argument[0];Element of ReturnValue;value",
603609
"org.apache.commons.collections4;IteratorUtils;true;boundedIterator;;;Element of Argument[0];Element of ReturnValue;value",
604610
"org.apache.commons.collections4;IteratorUtils;true;chainedIterator;(Collection);;Element of Element of Argument[0];Element of ReturnValue;value",
611+
"org.apache.commons.collections4;IteratorUtils;true;chainedIterator;(Iterator[]);;Element of ArrayElement of Argument[0];Element of ReturnValue;value",
605612
"org.apache.commons.collections4;IteratorUtils;true;chainedIterator;(Iterator,Iterator);;Element of Argument[0];Element of ReturnValue;value",
606613
"org.apache.commons.collections4;IteratorUtils;true;chainedIterator;(Iterator,Iterator);;Element of Argument[1];Element of ReturnValue;value",
607614
"org.apache.commons.collections4;IteratorUtils;true;collatedIterator;(Comparator,Collection);;Element of Element of Argument[1];Element of ReturnValue;value",
@@ -625,9 +632,12 @@ private class ApacheIteratorUtilsModel extends SummaryModelCsv {
625632
"org.apache.commons.collections4;IteratorUtils;true;singletonListIterator;;;Argument[0];Element of ReturnValue;value",
626633
"org.apache.commons.collections4;IteratorUtils;true;skippingIterator;;;Element of Argument[0];Element of ReturnValue;value",
627634
"org.apache.commons.collections4;IteratorUtils;true;toArray;;;Element of Argument[0];ArrayElement of ReturnValue;value",
628-
"org.apache.commons.collections4;IteratorUtils;true;toList;;;Argument[0];Element of ReturnValue;value",
629-
"org.apache.commons.collections4;IteratorUtils;true;toListIterator;;;Argument[0];Element of ReturnValue;value",
635+
"org.apache.commons.collections4;IteratorUtils;true;toList;;;Element of Argument[0];Element of ReturnValue;value",
636+
"org.apache.commons.collections4;IteratorUtils;true;toListIterator;;;Element of Argument[0];Element of ReturnValue;value",
630637
"org.apache.commons.collections4;IteratorUtils;true;toString;;;Element of Argument[0];ReturnValue;taint",
638+
"org.apache.commons.collections4;IteratorUtils;true;toString;;;Argument[2];ReturnValue;taint",
639+
"org.apache.commons.collections4;IteratorUtils;true;toString;;;Argument[3];ReturnValue;taint",
640+
"org.apache.commons.collections4;IteratorUtils;true;toString;;;Argument[4];ReturnValue;taint",
631641
"org.apache.commons.collections4;IteratorUtils;true;unmodifiableIterator;;;Element of Argument[0];Element of ReturnValue;value",
632642
"org.apache.commons.collections4;IteratorUtils;true;unmodifiableListIterator;;;Element of Argument[0];Element of ReturnValue;value",
633643
"org.apache.commons.collections4;IteratorUtils;true;unmodifiableMapIterator;;;Element of Argument[0];Element of ReturnValue;value",
@@ -646,6 +656,7 @@ private class ApacheIteratorUtilsModel extends SummaryModelCsv {
646656
"org.apache.commons.collections;IteratorUtils;true;asMultipleUseIterable;;;Element of Argument[0];Element of ReturnValue;value",
647657
"org.apache.commons.collections;IteratorUtils;true;boundedIterator;;;Element of Argument[0];Element of ReturnValue;value",
648658
"org.apache.commons.collections;IteratorUtils;true;chainedIterator;(Collection);;Element of Element of Argument[0];Element of ReturnValue;value",
659+
"org.apache.commons.collections;IteratorUtils;true;chainedIterator;(Iterator[]);;Element of ArrayElement of Argument[0];Element of ReturnValue;value",
649660
"org.apache.commons.collections;IteratorUtils;true;chainedIterator;(Iterator,Iterator);;Element of Argument[0];Element of ReturnValue;value",
650661
"org.apache.commons.collections;IteratorUtils;true;chainedIterator;(Iterator,Iterator);;Element of Argument[1];Element of ReturnValue;value",
651662
"org.apache.commons.collections;IteratorUtils;true;collatedIterator;(Comparator,Collection);;Element of Element of Argument[1];Element of ReturnValue;value",
@@ -669,9 +680,12 @@ private class ApacheIteratorUtilsModel extends SummaryModelCsv {
669680
"org.apache.commons.collections;IteratorUtils;true;singletonListIterator;;;Argument[0];Element of ReturnValue;value",
670681
"org.apache.commons.collections;IteratorUtils;true;skippingIterator;;;Element of Argument[0];Element of ReturnValue;value",
671682
"org.apache.commons.collections;IteratorUtils;true;toArray;;;Element of Argument[0];ArrayElement of ReturnValue;value",
672-
"org.apache.commons.collections;IteratorUtils;true;toList;;;Argument[0];Element of ReturnValue;value",
673-
"org.apache.commons.collections;IteratorUtils;true;toListIterator;;;Argument[0];Element of ReturnValue;value",
683+
"org.apache.commons.collections;IteratorUtils;true;toList;;;Element of Argument[0];Element of ReturnValue;value",
684+
"org.apache.commons.collections;IteratorUtils;true;toListIterator;;;Element of Argument[0];Element of ReturnValue;value",
674685
"org.apache.commons.collections;IteratorUtils;true;toString;;;Element of Argument[0];ReturnValue;taint",
686+
"org.apache.commons.collections;IteratorUtils;true;toString;;;Argument[2];ReturnValue;taint",
687+
"org.apache.commons.collections;IteratorUtils;true;toString;;;Argument[3];ReturnValue;taint",
688+
"org.apache.commons.collections;IteratorUtils;true;toString;;;Argument[4];ReturnValue;taint",
675689
"org.apache.commons.collections;IteratorUtils;true;unmodifiableIterator;;;Element of Argument[0];Element of ReturnValue;value",
676690
"org.apache.commons.collections;IteratorUtils;true;unmodifiableListIterator;;;Element of Argument[0];Element of ReturnValue;value",
677691
"org.apache.commons.collections;IteratorUtils;true;unmodifiableMapIterator;;;Element of Argument[0];Element of ReturnValue;value",
@@ -720,6 +734,9 @@ private class ApacheIterableUtilsModel extends SummaryModelCsv {
720734
"org.apache.commons.collections4;IterableUtils;true;skippingIterable;;;Element of Argument[0];Element of ReturnValue;value",
721735
"org.apache.commons.collections4;IterableUtils;true;toList;;;Element of Argument[0];Element of ReturnValue;value",
722736
"org.apache.commons.collections4;IterableUtils;true;toString;;;Element of Argument[0];ReturnValue;taint",
737+
"org.apache.commons.collections4;IterableUtils;true;toString;;;Argument[2];ReturnValue;taint",
738+
"org.apache.commons.collections4;IterableUtils;true;toString;;;Argument[3];ReturnValue;taint",
739+
"org.apache.commons.collections4;IterableUtils;true;toString;;;Argument[4];ReturnValue;taint",
723740
"org.apache.commons.collections4;IterableUtils;true;uniqueIterable;;;Element of Argument[0];Element of ReturnValue;value",
724741
"org.apache.commons.collections4;IterableUtils;true;unmodifiableIterable;;;Element of Argument[0];Element of ReturnValue;value",
725742
"org.apache.commons.collections4;IterableUtils;true;zippingIterable;;;Element of Argument[0];Element of ReturnValue;value",
@@ -751,6 +768,9 @@ private class ApacheIterableUtilsModel extends SummaryModelCsv {
751768
"org.apache.commons.collections;IterableUtils;true;skippingIterable;;;Element of Argument[0];Element of ReturnValue;value",
752769
"org.apache.commons.collections;IterableUtils;true;toList;;;Element of Argument[0];Element of ReturnValue;value",
753770
"org.apache.commons.collections;IterableUtils;true;toString;;;Element of Argument[0];ReturnValue;taint",
771+
"org.apache.commons.collections;IterableUtils;true;toString;;;Argument[2];ReturnValue;taint",
772+
"org.apache.commons.collections;IterableUtils;true;toString;;;Argument[3];ReturnValue;taint",
773+
"org.apache.commons.collections;IterableUtils;true;toString;;;Argument[4];ReturnValue;taint",
754774
"org.apache.commons.collections;IterableUtils;true;uniqueIterable;;;Element of Argument[0];Element of ReturnValue;value",
755775
"org.apache.commons.collections;IterableUtils;true;unmodifiableIterable;;;Element of Argument[0];Element of ReturnValue;value",
756776
"org.apache.commons.collections;IterableUtils;true;zippingIterable;;;Element of Argument[0];Element of ReturnValue;value",
@@ -852,9 +872,10 @@ private class ApacheSetUtilsModel extends SummaryModelCsv {
852872
[
853873
"org.apache.commons.collections4;SetUtils$SetView;true;copyInto;;;Element of Argument[-1];Element of Argument[0];value",
854874
"org.apache.commons.collections4;SetUtils$SetView;true;createIterator;;;Element of Argument[-1];Element of ReturnValue;value",
855-
"org.apache.commons.collections4;SetUtils$SetView;true;toSet;;;Element of Argument[-1];Element of Argument[0];value",
875+
"org.apache.commons.collections4;SetUtils$SetView;true;toSet;;;Element of Argument[-1];Element of ReturnValue;value",
856876
"org.apache.commons.collections4;SetUtils;true;difference;;;Element of Argument[0];Element of ReturnValue;value",
857-
"org.apache.commons.collections4;SetUtils;true;difference;;;Element of Argument[1];Element of ReturnValue;value",
877+
"org.apache.commons.collections4;SetUtils;true;disjunction;;;Element of Argument[0];Element of ReturnValue;value",
878+
"org.apache.commons.collections4;SetUtils;true;disjunction;;;Element of Argument[1];Element of ReturnValue;value",
858879
"org.apache.commons.collections4;SetUtils;true;emptyIfNull;;;Argument[0];ReturnValue;value",
859880
"org.apache.commons.collections4;SetUtils;true;hashSet;;;ArrayElement of Argument[0];Element of ReturnValue;value",
860881
"org.apache.commons.collections4;SetUtils;true;intersection;;;Element of Argument[0];Element of ReturnValue;value",
@@ -876,9 +897,10 @@ private class ApacheSetUtilsModel extends SummaryModelCsv {
876897
"org.apache.commons.collections4;SetUtils;true;unmodifiableSortedSet;;;Element of Argument[0];Element of ReturnValue;value",
877898
"org.apache.commons.collections;SetUtils$SetView;true;copyInto;;;Element of Argument[-1];Element of Argument[0];value",
878899
"org.apache.commons.collections;SetUtils$SetView;true;createIterator;;;Element of Argument[-1];Element of ReturnValue;value",
879-
"org.apache.commons.collections;SetUtils$SetView;true;toSet;;;Element of Argument[-1];Element of Argument[0];value",
900+
"org.apache.commons.collections;SetUtils$SetView;true;toSet;;;Element of Argument[-1];Element of ReturnValue;value",
880901
"org.apache.commons.collections;SetUtils;true;difference;;;Element of Argument[0];Element of ReturnValue;value",
881-
"org.apache.commons.collections;SetUtils;true;difference;;;Element of Argument[1];Element of ReturnValue;value",
902+
"org.apache.commons.collections;SetUtils;true;disjunction;;;Element of Argument[0];Element of ReturnValue;value",
903+
"org.apache.commons.collections;SetUtils;true;disjunction;;;Element of Argument[1];Element of ReturnValue;value",
882904
"org.apache.commons.collections;SetUtils;true;emptyIfNull;;;Argument[0];ReturnValue;value",
883905
"org.apache.commons.collections;SetUtils;true;hashSet;;;Element of Argument[0];Element of ReturnValue;value",
884906
"org.apache.commons.collections;SetUtils;true;intersection;;;Element of Argument[0];Element of ReturnValue;value",

0 commit comments

Comments
 (0)