Simplify test setup

Benjamin Muskalla · Benjamin Muskalla · commit 24d43689b254 · 2021-09-07T16:46:58.000+02:00
diff --git a/java/ql/test/library-tests/dataflow/taint-format/A.java b/java/ql/test/library-tests/dataflow/taint-format/A.java
@@ -2,12 +2,12 @@
 import java.lang.StringBuilder;
 
 class A {
-    public static String taint() {
+    public static String source() {
         return "tainted";
     }
 
     public static void test1() {
-        String bad = taint(); // $ hasTaintFlow
+        String bad = source(); // $ hasTaintFlow
         String good = "hi";
 
         bad.formatted(good); // $ hasTaintFlow
@@ -18,7 +18,7 @@ public static void test1() {
     }
 
     public static void test2() {
-        String bad = taint();  // $ hasTaintFlow
+        String bad = source();  // $ hasTaintFlow
         Formatter f = new Formatter();
 
         f.toString();
@@ -27,7 +27,7 @@ public static void test2() {
     }
 
     public static void test3() {
-        String bad = taint();  // $ hasTaintFlow
+        String bad = source();  // $ hasTaintFlow
         StringBuilder sb = new StringBuilder();
         Formatter f = new Formatter(sb);
 
@@ -37,7 +37,7 @@ public static void test3() {
     }
 
     public static void test4() {
-        String bad = taint();  // $ hasTaintFlow
+        String bad = source();  // $ hasTaintFlow
         StringBuilder sb = new StringBuilder();
 
         sb.append(bad);  // $ hasTaintFlow
diff --git a/java/ql/test/library-tests/dataflow/taint-format/test.ql b/java/ql/test/library-tests/dataflow/taint-format/test.ql
@@ -3,13 +3,7 @@ import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.dataflow.TaintTracking
 import TestUtilities.InlineFlowTest
 
-class TaintFlowConf extends TaintTracking::Configuration {
-  TaintFlowConf() { this = "qltest:dataflow:format" }
-
-  override predicate isSource(DataFlow::Node n) {
-    n.asExpr().(MethodAccess).getMethod().hasName("taint")
-  }
-
+class TaintFlowConf extends DefaultTaintFlowConf {
   override predicate isSink(DataFlow::Node n) { n instanceof DataFlow::ExprNode }
 }
 
