Convert some tests to use InlineFlowTest

Author: Benjamin Muskalla

java/ql/test/TestUtilities/InlineFlowTest.qll

@@ -11,7 +11,7 @@ class DefaultValueFlowConf extends DataFlow::Configuration {
   }
 
   override predicate isSink(DataFlow::Node n) {
-    n.asExpr().(Argument).getCall().getCallee().hasName("sink")
+    exists(MethodAccess ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
   }
 }
 

java/ql/test/library-tests/dataflow/fluent-methods/flow.ql

@@ -1,19 +1,7 @@
 import java
 import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.dataflow.FlowSteps
-import TestUtilities.InlineExpectationsTest
-
-class Conf extends DataFlow::Configuration {
-  Conf() { this = "qltest:dataflow:fluent-methods" }
-
-  override predicate isSource(DataFlow::Node n) {
-    n.asExpr().(MethodAccess).getMethod().hasName("source")
-  }
-
-  override predicate isSink(DataFlow::Node n) {
-    exists(MethodAccess ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
-  }
-}
+import TestUtilities.InlineFlowTest
 
 class Model extends FluentMethod {
   Model() { this.getName() = "modelledFluentMethod" }
@@ -25,17 +13,6 @@ class IdentityModel extends ValuePreservingMethod {
   override predicate returnsValue(int arg) { arg = 0 }
 }
 
-class HasFlowTest extends InlineExpectationsTest {
-  HasFlowTest() { this = "HasFlowTest" }
-
-  override string getARelevantTag() { result = "hasTaintFlow" }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
-    tag = "hasTaintFlow" and
-    exists(DataFlow::Node src, DataFlow::Node sink, Conf conf | conf.hasFlow(src, sink) |
-      sink.getLocation() = location and
-      element = sink.toString() and
-      value = ""
-    )
-  }
+class HasFlowTest extends InlineFlowTest {
+  override DataFlow::Configuration getValueFlowConfig() { none() }
 }

java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql

@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.TaintTracking
-import TestUtilities.InlineExpectationsTest
+import TestUtilities.InlineFlowTest
 
 class TaintFlowConf extends TaintTracking::Configuration {
   TaintFlowConf() { this = "qltest:frameworks:jax-rs-taint" }
@@ -27,28 +27,12 @@ class ValueFlowConf extends DataFlow::Configuration {
     exists(MethodAccess ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
   }
 
+  // TODO: move to default?
   override int fieldFlowBranchLimit() { result = 1000 }
 }
 
-class HasFlowTest extends InlineExpectationsTest {
-  HasFlowTest() { this = "HasFlowTest" }
-
-  override string getARelevantTag() { result = ["hasTaintFlow", "hasValueFlow"] }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
-    tag = "hasTaintFlow" and
-    exists(DataFlow::Node src, DataFlow::Node sink, TaintFlowConf conf | conf.hasFlow(src, sink) |
-      not any(ValueFlowConf vconf).hasFlow(src, sink) and
-      sink.getLocation() = location and
-      element = sink.toString() and
-      value = ""
-    )
-    or
-    tag = "hasValueFlow" and
-    exists(DataFlow::Node src, DataFlow::Node sink, ValueFlowConf conf | conf.hasFlow(src, sink) |
-      sink.getLocation() = location and
-      element = sink.toString() and
-      value = ""
-    )
-  }
+class HasFlowTest extends InlineFlowTest {
+  override DataFlow::Configuration getValueFlowConfig() { result = any(ValueFlowConf config) }
+
+  override DataFlow::Configuration getTaintFlowConfig() { result = any(TaintFlowConf config) }
 }