Simplify inline tests

Benjamin Muskalla · Benjamin Muskalla · commit bf5a46f6d81b · 2021-09-13T17:08:02.000+02:00
diff --git a/java/ql/test/TestUtilities/InlineFlowTest.qll b/java/ql/test/TestUtilities/InlineFlowTest.qll
@@ -3,7 +3,8 @@
  *
  * Example for a test.ql:
  * ```ql
- * class HasFlowTest extends InlineFlowTest { }
+ * import java
+ * import TestUtilities.InlineFlowTest
  * ```
  *
  * To declare expecations, you can use the $hasTaintFlow or $hasValueFlow comments within the test source files.
diff --git a/java/ql/test/library-tests/dataflow/taint-format/test.ql b/java/ql/test/library-tests/dataflow/taint-format/test.ql
@@ -6,7 +6,3 @@ import TestUtilities.InlineFlowTest
 class TaintFlowConf extends DefaultTaintFlowConf {
   override predicate isSink(DataFlow::Node n) { n instanceof DataFlow::ExprNode }
 }
-
-class HasFlowTest extends InlineFlowTest {
-  override DataFlow::Configuration getTaintFlowConfig() { result = any(TaintFlowConf config) }
-}
diff --git a/java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.ql b/java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql b/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/apache-collections/test.ql b/java/ql/test/library-tests/frameworks/apache-collections/test.ql
@@ -16,5 +16,3 @@ class SummaryModelTest extends SummaryModelCsv {
       ]
   }
 }
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.ql b/java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/guava/generated/cache/test.ql b/java/ql/test/library-tests/frameworks/guava/generated/cache/test.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/jackson/test.ql b/java/ql/test/library-tests/frameworks/jackson/test.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/javax-json/test.ql b/java/ql/test/library-tests/frameworks/javax-json/test.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/json-java/test.ql b/java/ql/test/library-tests/frameworks/json-java/test.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/spring/beans/test.ql b/java/ql/test/library-tests/frameworks/spring/beans/test.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/spring/cache/test.ql b/java/ql/test/library-tests/frameworks/spring/cache/test.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/spring/http/flow.ql b/java/ql/test/library-tests/frameworks/spring/http/flow.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/spring/ui/test.ql b/java/ql/test/library-tests/frameworks/spring/ui/test.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/spring/util/test.ql b/java/ql/test/library-tests/frameworks/spring/util/test.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/spring/validation/test.ql b/java/ql/test/library-tests/frameworks/spring/validation/test.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/spring/webmultipart/test.ql b/java/ql/test/library-tests/frameworks/spring/webmultipart/test.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/frameworks/spring/webutil/test.ql b/java/ql/test/library-tests/frameworks/spring/webutil/test.ql
@@ -1,4 +1,2 @@
 import java
 import TestUtilities.InlineFlowTest
-
-class HasFlowTest extends InlineFlowTest { }
diff --git a/java/ql/test/library-tests/optional/test.ql b/java/ql/test/library-tests/optional/test.ql
@@ -10,5 +10,3 @@ class SummaryModelTest extends SummaryModelCsv {
       ]
   }
 }
-
-class HasFlowTest extends InlineFlowTest { }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@`
`3`	`3`	`*`
`4`	`4`	`* Example for a test.ql:`
`5`	`5`	* ```ql
`6`		`- * class HasFlowTest extends InlineFlowTest { }`
	`6`	`+ * import java`
	`7`	`+ * import TestUtilities.InlineFlowTest`
`7`	`8`	* ```
`8`	`9`	`*`
`9`	`10`	`* To declare expecations, you can use the $hasTaintFlow or $hasValueFlow comments within the test source files.`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,3 @@ import TestUtilities.InlineFlowTest`
`6`	`6`	`class TaintFlowConf extends DefaultTaintFlowConf {`
`7`	`7`	`override predicate isSink(DataFlow::Node n) { n instanceof DataFlow::ExprNode }`
`8`	`8`	`}`
`9`		`-`
`10`		`-class HasFlowTest extends InlineFlowTest {`
`11`		`- override DataFlow::Configuration getTaintFlowConfig() { result = any(TaintFlowConf config) }`
`12`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,3 @@ class SummaryModelTest extends SummaryModelCsv {`
`16`	`16`	`]`
`17`	`17`	`}`
`18`	`18`	`}`
`19`		`-`
`20`		`-class HasFlowTest extends InlineFlowTest { }`