Add fieldFlowBranchLimit to the tests

joefarebrother · joefarebrother · commit c8e2b027ee85 · 2021-09-16T15:23:00.000+01:00
diff --git a/java/ql/test/library-tests/frameworks/guava/TestCollect.java b/java/ql/test/library-tests/frameworks/guava/TestCollect.java
@@ -114,7 +114,7 @@ void test4(Table<String, String, String> t1, Table<String, String, String> t2, T
         sink(tableValue(t3));  // $ MISSING:numValueFlow=1 // depends on aliasing
     }
 
-    void test4(Multimap<String, String> m1, Multimap<String, String> m2, Multimap<String, String> m3, 
+    void test5(Multimap<String, String> m1, Multimap<String, String> m2, Multimap<String, String> m3, 
            Multimap<String, String> m4, Multimap<String, String> m5){
         String x = taint();
         m1.put("k", x);
@@ -136,7 +136,7 @@ void test4(Multimap<String, String> m1, Multimap<String, String> m2, Multimap<St
         sink(multimapValue(m5));  // $ MISSING:numValueFlow=1 // depends on aliasing
     }
 
-    void test5(Comparator<String> comp, SortedSet<String> sorS, SortedMap<String, String> sorM) {
+    void test6(Comparator<String> comp, SortedSet<String> sorS, SortedMap<String, String> sorM) {
         ImmutableSortedSet<String> s = ImmutableSortedSet.of(taint());
 
         sink(element(s)); // $numValueFlow=1
diff --git a/java/ql/test/library-tests/frameworks/guava/flow.ql b/java/ql/test/library-tests/frameworks/guava/flow.ql
@@ -24,6 +24,8 @@ class ValueFlowConf extends DataFlow::Configuration {
   override predicate isSink(DataFlow::Node n) {
     exists(MethodAccess ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
   }
+
+  override int fieldFlowBranchLimit() { result = 100 }
 }
 
 class HasFlowTest extends InlineExpectationsTest {

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ void test4(Table<String, String, String> t1, Table<String, String, String> t2, T`
`114`	`114`	`sink(tableValue(t3)); // $ MISSING:numValueFlow=1 // depends on aliasing`
`115`	`115`	`}`
`116`	`116`
`117`		`- void test4(Multimap<String, String> m1, Multimap<String, String> m2, Multimap<String, String> m3,`
	`117`	`+ void test5(Multimap<String, String> m1, Multimap<String, String> m2, Multimap<String, String> m3,`
`118`	`118`	`Multimap<String, String> m4, Multimap<String, String> m5){`
`119`	`119`	`String x = taint();`
`120`	`120`	`m1.put("k", x);`
`@@ -136,7 +136,7 @@ void test4(Multimap<String, String> m1, Multimap<String, String> m2, Multimap<St`
`136`	`136`	`sink(multimapValue(m5)); // $ MISSING:numValueFlow=1 // depends on aliasing`
`137`	`137`	`}`
`138`	`138`
`139`		`- void test5(Comparator<String> comp, SortedSet<String> sorS, SortedMap<String, String> sorM) {`
	`139`	`+ void test6(Comparator<String> comp, SortedSet<String> sorS, SortedMap<String, String> sorM) {`
`140`	`140`	`ImmutableSortedSet<String> s = ImmutableSortedSet.of(taint());`
`141`	`141`
`142`	`142`	`sink(element(s)); // $numValueFlow=1`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ class ValueFlowConf extends DataFlow::Configuration {`
`24`	`24`	`override predicate isSink(DataFlow::Node n) {`
`25`	`25`	`exists(MethodAccess ma \| ma.getMethod().hasName("sink") \| n.asExpr() = ma.getAnArgument())`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+ override int fieldFlowBranchLimit() { result = 100 }`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`class HasFlowTest extends InlineExpectationsTest {`