Java: Add test.

Author: aschackmull

java/ql/src/utils/flowtestcasegenerator/FlowTestCaseSupportMethods.qll

@@ -217,6 +217,22 @@ private class EnumerationGetMethod extends GetMethod {
   override string getCall(string arg) { result = "getElement(" + arg + ")" }
 }
 
+private class StreamGetMethod extends GetMethod {
+  StreamGetMethod() { this = "streamgetmethod" }
+
+  override predicate appliesTo(Type t, Content c) {
+    t.(RefType).getASourceSupertype*().hasQualifiedName("java.util.stream", "BaseStream") and
+    c instanceof CollectionContent
+  }
+
+  override string getDefinition() {
+    result = "<T> T getElement(BaseStream<T,?> s) { return s.iterator().next(); }"
+  }
+
+  bindingset[arg]
+  override string getCall(string arg) { result = "getElement(" + arg + ")" }
+}
+
 private class OptionalGetMethod extends GetMethod {
   OptionalGetMethod() { this = "optionalgetmethod" }
 
@@ -392,6 +408,20 @@ private class IteratorGenMethod extends GenMethod {
   override string getCall(string arg) { result = "List.of(" + arg + ").iterator()" }
 }
 
+private class StreamGenMethod extends GenMethod {
+  StreamGenMethod() { this = "streamgenmethod" }
+
+  override predicate appliesTo(Type t, Content c) {
+    exists(GenericType op | op.hasQualifiedName("java.util.stream", ["BaseStream", "Stream"]) |
+      op.getAParameterizedType().getASupertype*() = t
+    ) and
+    c instanceof CollectionContent
+  }
+
+  bindingset[arg]
+  override string getCall(string arg) { result = "Stream.of(" + arg + ")" }
+}
+
 private class OptionalGenMethod extends GenMethod {
   OptionalGenMethod() { this = "optionalgenmethod" }
 

java/ql/test/TestUtilities/InlineFlowTest.qll

@@ -43,12 +43,14 @@ import semmle.code.java.dataflow.ExternalFlow
 import semmle.code.java.dataflow.TaintTracking
 import TestUtilities.InlineExpectationsTest
 
+private predicate defaultSource(DataFlow::Node src) {
+  src.asExpr().(MethodAccess).getMethod().getName() = ["source", "taint"]
+}
+
 class DefaultValueFlowConf extends DataFlow::Configuration {
   DefaultValueFlowConf() { this = "qltest:defaultValueFlowConf" }
 
-  override predicate isSource(DataFlow::Node n) {
-    n.asExpr().(MethodAccess).getMethod().getName() = ["source", "taint"]
-  }
+  override predicate isSource(DataFlow::Node n) { defaultSource(n) }
 
   override predicate isSink(DataFlow::Node n) {
     exists(MethodAccess ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
@@ -60,9 +62,7 @@ class DefaultValueFlowConf extends DataFlow::Configuration {
 class DefaultTaintFlowConf extends TaintTracking::Configuration {
   DefaultTaintFlowConf() { this = "qltest:defaultTaintFlowConf" }
 
-  override predicate isSource(DataFlow::Node n) {
-    n.asExpr().(MethodAccess).getMethod().getName() = ["source", "taint"]
-  }
+  override predicate isSource(DataFlow::Node n) { defaultSource(n) }
 
   override predicate isSink(DataFlow::Node n) {
     exists(MethodAccess ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
@@ -71,6 +71,11 @@ class DefaultTaintFlowConf extends TaintTracking::Configuration {
   override int fieldFlowBranchLimit() { result = 1000 }
 }
 
+private string getSourceArgString(DataFlow::Node src) {
+  defaultSource(src) and
+  src.asExpr().(MethodAccess).getAnArgument().(StringLiteral).getValue() = result
+}
+
 class InlineFlowTest extends InlineExpectationsTest {
   InlineFlowTest() { this = "HasFlowTest" }
 
@@ -81,7 +86,7 @@ class InlineFlowTest extends InlineExpectationsTest {
     exists(DataFlow::Node src, DataFlow::Node sink | getValueFlowConfig().hasFlow(src, sink) |
       sink.getLocation() = location and
       element = sink.toString() and
-      value = ""
+      if exists(getSourceArgString(src)) then value = getSourceArgString(src) else value = ""
     )
     or
     tag = "hasTaintFlow" and
@@ -90,7 +95,7 @@ class InlineFlowTest extends InlineExpectationsTest {
     |
       sink.getLocation() = location and
       element = sink.toString() and
-      value = ""
+      if exists(getSourceArgString(src)) then value = getSourceArgString(src) else value = ""
     )
   }