Use InlineExpectationsTest directly

Author: atorralba

java/ql/test/library-tests/dataflow/taintsources/local.ql

@@ -1,6 +1,6 @@
 import java
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineFlowTest
+import TestUtilities.InlineExpectationsTest
 
 class LocalSource extends DataFlow::Node {
   LocalSource() {
@@ -9,28 +9,42 @@ class LocalSource extends DataFlow::Node {
   }
 }
 
-class LocalValueConf extends DefaultValueFlowConf {
+predicate isTestSink(DataFlow::Node n) {
+  exists(MethodAccess ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
+}
+
+class LocalValueConf extends DataFlow::Configuration {
+  LocalValueConf() { this = "LocalValueConf" }
+
   override predicate isSource(DataFlow::Node n) { n instanceof LocalSource }
+
+  override predicate isSink(DataFlow::Node n) { isTestSink(n) }
 }
 
-class LocalTaintConf extends DefaultTaintFlowConf {
+class LocalTaintConf extends TaintTracking::Configuration {
+  LocalTaintConf() { this = "LocalTaintConf" }
+
   override predicate isSource(DataFlow::Node n) { n instanceof LocalSource }
+
+  override predicate isSink(DataFlow::Node n) { isTestSink(n) }
 }
 
-class LocalFlowTest extends InlineFlowTest {
+class LocalFlowTest extends InlineExpectationsTest {
+  LocalFlowTest() { this = "LocalFlowTest" }
+
   override string getARelevantTag() { result = ["hasLocalValueFlow", "hasLocalTaintFlow"] }
 
   override predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "hasLocalValueFlow" and
-    exists(DataFlow::Node src, DataFlow::Node sink | getValueFlowConfig().hasFlow(src, sink) |
+    exists(DataFlow::Node src, DataFlow::Node sink | any(LocalValueConf c).hasFlow(src, sink) |
       sink.getLocation() = location and
       element = sink.toString() and
       value = ""
     )
     or
     tag = "hasLocalTaintFlow" and
     exists(DataFlow::Node src, DataFlow::Node sink |
-      getTaintFlowConfig().hasFlow(src, sink) and not getValueFlowConfig().hasFlow(src, sink)
+      any(LocalTaintConf c).hasFlow(src, sink) and not any(LocalValueConf c).hasFlow(src, sink)
     |
       sink.getLocation() = location and
       element = sink.toString() and

java/ql/test/library-tests/dataflow/taintsources/remote.ql

@@ -1,29 +1,43 @@
 import java
 import semmle.code.java.dataflow.FlowSources
-import TestUtilities.InlineFlowTest
+import TestUtilities.InlineExpectationsTest
+
+predicate isTestSink(DataFlow::Node n) {
+  exists(MethodAccess ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
+}
+
+class RemoteValueConf extends DataFlow::Configuration {
+  RemoteValueConf() { this = "RemoteValueConf" }
 
-class RemoteValueConf extends DefaultValueFlowConf {
   override predicate isSource(DataFlow::Node n) { n instanceof RemoteFlowSource }
+
+  override predicate isSink(DataFlow::Node n) { isTestSink(n) }
 }
 
-class RemoteTaintConf extends DefaultTaintFlowConf {
+class RemoteTaintConf extends TaintTracking::Configuration {
+  RemoteTaintConf() { this = "RemoteTaintConf" }
+
   override predicate isSource(DataFlow::Node n) { n instanceof RemoteFlowSource }
+
+  override predicate isSink(DataFlow::Node n) { isTestSink(n) }
 }
 
-class RemoteFlowTest extends InlineFlowTest {
+class RemoteFlowTest extends InlineExpectationsTest {
+  RemoteFlowTest() { this = "RemoteFlowTest" }
+
   override string getARelevantTag() { result = ["hasRemoteValueFlow", "hasRemoteTaintFlow"] }
 
   override predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "hasRemoteValueFlow" and
-    exists(DataFlow::Node src, DataFlow::Node sink | getValueFlowConfig().hasFlow(src, sink) |
+    exists(DataFlow::Node src, DataFlow::Node sink | any(RemoteValueConf c).hasFlow(src, sink) |
       sink.getLocation() = location and
       element = sink.toString() and
       value = ""
     )
     or
     tag = "hasRemoteTaintFlow" and
     exists(DataFlow::Node src, DataFlow::Node sink |
-      getTaintFlowConfig().hasFlow(src, sink) and not getValueFlowConfig().hasFlow(src, sink)
+      any(RemoteTaintConf c).hasFlow(src, sink) and not any(RemoteValueConf c).hasFlow(src, sink)
     |
       sink.getLocation() = location and
       element = sink.toString() and