Fixes to models and tests

Running the test generator script again showed many missing tests.
This commit is contained in:
Owen Mansel-Chan
2021-06-30 15:17:02 +01:00
parent 377403d525
commit f94e467076
2 changed files with 436 additions and 36 deletions

View File

@@ -72,7 +72,7 @@ private class ApacheCollectionsModel extends SummaryModelCsv {
"org.apache.commons.collections4;FluentIterable;true;unmodifiable;;;Element of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections4;FluentIterable;true;zip;(Iterable);;Element of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections4;FluentIterable;true;zip;(Iterable);;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;FluentIterable;true;zip;(Iterable);;Element of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections4;FluentIterable;true;zip;(Iterable[]);;Element of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections4;FluentIterable;true;zip;(Iterable[]);;Element of ArrayElement of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;Get;true;entrySet;;;MapKey of Argument[-1];MapKey of Element of ReturnValue;value",
"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 {
"org.apache.commons.collections4;MultiValuedMap;true;putAll;(Map);;MapValue of Argument[0];Element of MapValue of Argument[-1];value",
"org.apache.commons.collections4;MultiValuedMap;true;putAll;(MultiValuedMap);;MapKey of Argument[0];MapKey of Argument[-1];value",
"org.apache.commons.collections4;MultiValuedMap;true;putAll;(MultiValuedMap);;Element of MapValue of Argument[0];Element of MapValue of Argument[-1];value",
"org.apache.commons.collections4;MultiValuedMap;true;remove;;;Element of MapValue of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections4;MultiValuedMap;true;values;;;Element of MapValue of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections4;OrderedIterator;true;previous;;;Element of Argument[-1];ReturnValue;value",
"org.apache.commons.collections4;OrderedMap;true;firstKey;;;MapKey of Argument[-1];ReturnValue;value",
@@ -162,7 +163,7 @@ private class ApacheCollectionsModel extends SummaryModelCsv {
"org.apache.commons.collections;FluentIterable;true;unmodifiable;;;Element of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections;FluentIterable;true;zip;(Iterable);;Element of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections;FluentIterable;true;zip;(Iterable);;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;FluentIterable;true;zip;(Iterable);;Element of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections;FluentIterable;true;zip;(Iterable[]);;Element of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections;FluentIterable;true;zip;(Iterable[]);;Element of ArrayElement of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;Get;true;entrySet;;;MapKey of Argument[-1];MapKey of Element of ReturnValue;value",
"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 {
"org.apache.commons.collections;MultiValuedMap;true;putAll;(Map);;MapValue of Argument[0];Element of MapValue of Argument[-1];value",
"org.apache.commons.collections;MultiValuedMap;true;putAll;(MultiValuedMap);;MapKey of Argument[0];MapKey of Argument[-1];value",
"org.apache.commons.collections;MultiValuedMap;true;putAll;(MultiValuedMap);;Element of MapValue of Argument[0];Element of MapValue of Argument[-1];value",
"org.apache.commons.collections;MultiValuedMap;true;remove;;;Element of MapValue of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections;MultiValuedMap;true;values;;;Element of MapValue of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections;OrderedIterator;true;previous;;;Element of Argument[-1];ReturnValue;value",
"org.apache.commons.collections;OrderedMap;true;firstKey;;;MapKey of Argument[-1];ReturnValue;value",
@@ -458,6 +460,7 @@ private class ApacheCollectionUtilsModel extends SummaryModelCsv {
"org.apache.commons.collections4;CollectionUtils;true;extractSingleton;;;Element of Argument[0];ReturnValue;value",
"org.apache.commons.collections4;CollectionUtils;true;find;;;Element of Argument[0];ReturnValue;value",
"org.apache.commons.collections4;CollectionUtils;true;get;(Iterator,int);;Element of Argument[0];ReturnValue;value",
"org.apache.commons.collections4;CollectionUtils;true;get;(Iterable,int);;Element of Argument[0];ReturnValue;value",
"org.apache.commons.collections4;CollectionUtils;true;get;(Map,int);;MapKey of Argument[0];MapKey of ReturnValue;value",
"org.apache.commons.collections4;CollectionUtils;true;get;(Map,int);;MapValue of Argument[0];MapValue of ReturnValue;value",
"org.apache.commons.collections4;CollectionUtils;true;get;(Object,int);;ArrayElement of Argument[0];ReturnValue;value",
@@ -495,6 +498,7 @@ private class ApacheCollectionUtilsModel extends SummaryModelCsv {
"org.apache.commons.collections;CollectionUtils;true;extractSingleton;;;Element of Argument[0];ReturnValue;value",
"org.apache.commons.collections;CollectionUtils;true;find;;;Element of Argument[0];ReturnValue;value",
"org.apache.commons.collections;CollectionUtils;true;get;(Iterator,int);;Element of Argument[0];ReturnValue;value",
"org.apache.commons.collections;CollectionUtils;true;get;(Iterable,int);;Element of Argument[0];ReturnValue;value",
"org.apache.commons.collections;CollectionUtils;true;get;(Map,int);;MapKey of Argument[0];MapKey of ReturnValue;value",
"org.apache.commons.collections;CollectionUtils;true;get;(Map,int);;MapValue of Argument[0];MapValue of ReturnValue;value",
"org.apache.commons.collections;CollectionUtils;true;get;(Object,int);;ArrayElement of Argument[0];ReturnValue;value",
@@ -530,9 +534,10 @@ private class ApacheListUtilsModel extends SummaryModelCsv {
override predicate row(string row) {
row =
[
"org.apache.commons.collections4;ListUtils;true;defaultIfNull;;;Argument[0];ReturnValue;value",
"org.apache.commons.collections4;ListUtils;true;defaultIfNull;;;Argument[1];ReturnValue;value",
"org.apache.commons.collections4;ListUtils;true;emptyIfNull;;;Argument[0];ReturnValue;value",
"org.apache.commons.collections4;ListUtils;true;fixedSizeList;;;Element of Argument[1];Element of ReturnValue;value",
"org.apache.commons.collections4;ListUtils;true;fixedSizeList;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;ListUtils;true;intersection;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;ListUtils;true;intersection;;;Element of Argument[1];Element of ReturnValue;value",
"org.apache.commons.collections4;ListUtils;true;lazyList;;;Element of Argument[0];Element of ReturnValue;value",
@@ -556,9 +561,10 @@ private class ApacheListUtilsModel extends SummaryModelCsv {
"org.apache.commons.collections4;ListUtils;true;union;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;ListUtils;true;union;;;Element of Argument[1];Element of ReturnValue;value",
"org.apache.commons.collections4;ListUtils;true;unmodifiableList;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;ListUtils;true;defaultIfNull;;;Argument[0];ReturnValue;value",
"org.apache.commons.collections;ListUtils;true;defaultIfNull;;;Argument[1];ReturnValue;value",
"org.apache.commons.collections;ListUtils;true;emptyIfNull;;;Argument[0];ReturnValue;value",
"org.apache.commons.collections;ListUtils;true;fixedSizeList;;;Element of Argument[1];Element of ReturnValue;value",
"org.apache.commons.collections;ListUtils;true;fixedSizeList;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;ListUtils;true;intersection;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;ListUtils;true;intersection;;;Element of Argument[1];Element of ReturnValue;value",
"org.apache.commons.collections;ListUtils;true;lazyList;;;Element of Argument[0];Element of ReturnValue;value",
@@ -602,6 +608,7 @@ private class ApacheIteratorUtilsModel extends SummaryModelCsv {
"org.apache.commons.collections4;IteratorUtils;true;asMultipleUseIterable;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;boundedIterator;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;chainedIterator;(Collection);;Element of Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;chainedIterator;(Iterator[]);;Element of ArrayElement of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;chainedIterator;(Iterator,Iterator);;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;chainedIterator;(Iterator,Iterator);;Element of Argument[1];Element of ReturnValue;value",
"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 {
"org.apache.commons.collections4;IteratorUtils;true;singletonListIterator;;;Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;skippingIterator;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;toArray;;;Element of Argument[0];ArrayElement of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;toList;;;Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;toListIterator;;;Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;toList;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;toListIterator;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;toString;;;Element of Argument[0];ReturnValue;taint",
"org.apache.commons.collections4;IteratorUtils;true;toString;;;Argument[2];ReturnValue;taint",
"org.apache.commons.collections4;IteratorUtils;true;toString;;;Argument[3];ReturnValue;taint",
"org.apache.commons.collections4;IteratorUtils;true;toString;;;Argument[4];ReturnValue;taint",
"org.apache.commons.collections4;IteratorUtils;true;unmodifiableIterator;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;unmodifiableListIterator;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IteratorUtils;true;unmodifiableMapIterator;;;Element of Argument[0];Element of ReturnValue;value",
@@ -646,6 +656,7 @@ private class ApacheIteratorUtilsModel extends SummaryModelCsv {
"org.apache.commons.collections;IteratorUtils;true;asMultipleUseIterable;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;boundedIterator;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;chainedIterator;(Collection);;Element of Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;chainedIterator;(Iterator[]);;Element of ArrayElement of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;chainedIterator;(Iterator,Iterator);;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;chainedIterator;(Iterator,Iterator);;Element of Argument[1];Element of ReturnValue;value",
"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 {
"org.apache.commons.collections;IteratorUtils;true;singletonListIterator;;;Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;skippingIterator;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;toArray;;;Element of Argument[0];ArrayElement of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;toList;;;Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;toListIterator;;;Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;toList;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;toListIterator;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;toString;;;Element of Argument[0];ReturnValue;taint",
"org.apache.commons.collections;IteratorUtils;true;toString;;;Argument[2];ReturnValue;taint",
"org.apache.commons.collections;IteratorUtils;true;toString;;;Argument[3];ReturnValue;taint",
"org.apache.commons.collections;IteratorUtils;true;toString;;;Argument[4];ReturnValue;taint",
"org.apache.commons.collections;IteratorUtils;true;unmodifiableIterator;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;unmodifiableListIterator;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IteratorUtils;true;unmodifiableMapIterator;;;Element of Argument[0];Element of ReturnValue;value",
@@ -720,6 +734,9 @@ private class ApacheIterableUtilsModel extends SummaryModelCsv {
"org.apache.commons.collections4;IterableUtils;true;skippingIterable;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IterableUtils;true;toList;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IterableUtils;true;toString;;;Element of Argument[0];ReturnValue;taint",
"org.apache.commons.collections4;IterableUtils;true;toString;;;Argument[2];ReturnValue;taint",
"org.apache.commons.collections4;IterableUtils;true;toString;;;Argument[3];ReturnValue;taint",
"org.apache.commons.collections4;IterableUtils;true;toString;;;Argument[4];ReturnValue;taint",
"org.apache.commons.collections4;IterableUtils;true;uniqueIterable;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IterableUtils;true;unmodifiableIterable;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;IterableUtils;true;zippingIterable;;;Element of Argument[0];Element of ReturnValue;value",
@@ -751,6 +768,9 @@ private class ApacheIterableUtilsModel extends SummaryModelCsv {
"org.apache.commons.collections;IterableUtils;true;skippingIterable;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IterableUtils;true;toList;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IterableUtils;true;toString;;;Element of Argument[0];ReturnValue;taint",
"org.apache.commons.collections;IterableUtils;true;toString;;;Argument[2];ReturnValue;taint",
"org.apache.commons.collections;IterableUtils;true;toString;;;Argument[3];ReturnValue;taint",
"org.apache.commons.collections;IterableUtils;true;toString;;;Argument[4];ReturnValue;taint",
"org.apache.commons.collections;IterableUtils;true;uniqueIterable;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IterableUtils;true;unmodifiableIterable;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;IterableUtils;true;zippingIterable;;;Element of Argument[0];Element of ReturnValue;value",
@@ -852,9 +872,10 @@ private class ApacheSetUtilsModel extends SummaryModelCsv {
[
"org.apache.commons.collections4;SetUtils$SetView;true;copyInto;;;Element of Argument[-1];Element of Argument[0];value",
"org.apache.commons.collections4;SetUtils$SetView;true;createIterator;;;Element of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections4;SetUtils$SetView;true;toSet;;;Element of Argument[-1];Element of Argument[0];value",
"org.apache.commons.collections4;SetUtils$SetView;true;toSet;;;Element of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections4;SetUtils;true;difference;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;SetUtils;true;difference;;;Element of Argument[1];Element of ReturnValue;value",
"org.apache.commons.collections4;SetUtils;true;disjunction;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;SetUtils;true;disjunction;;;Element of Argument[1];Element of ReturnValue;value",
"org.apache.commons.collections4;SetUtils;true;emptyIfNull;;;Argument[0];ReturnValue;value",
"org.apache.commons.collections4;SetUtils;true;hashSet;;;ArrayElement of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections4;SetUtils;true;intersection;;;Element of Argument[0];Element of ReturnValue;value",
@@ -876,9 +897,10 @@ private class ApacheSetUtilsModel extends SummaryModelCsv {
"org.apache.commons.collections4;SetUtils;true;unmodifiableSortedSet;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;SetUtils$SetView;true;copyInto;;;Element of Argument[-1];Element of Argument[0];value",
"org.apache.commons.collections;SetUtils$SetView;true;createIterator;;;Element of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections;SetUtils$SetView;true;toSet;;;Element of Argument[-1];Element of Argument[0];value",
"org.apache.commons.collections;SetUtils$SetView;true;toSet;;;Element of Argument[-1];Element of ReturnValue;value",
"org.apache.commons.collections;SetUtils;true;difference;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;SetUtils;true;difference;;;Element of Argument[1];Element of ReturnValue;value",
"org.apache.commons.collections;SetUtils;true;disjunction;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;SetUtils;true;disjunction;;;Element of Argument[1];Element of ReturnValue;value",
"org.apache.commons.collections;SetUtils;true;emptyIfNull;;;Argument[0];ReturnValue;value",
"org.apache.commons.collections;SetUtils;true;hashSet;;;Element of Argument[0];Element of ReturnValue;value",
"org.apache.commons.collections;SetUtils;true;intersection;;;Element of Argument[0];Element of ReturnValue;value",