Merge pull request #6692 from bmuskalla/testGeneratorFlowTest

Java: Test generator uses `InlineFlowTest`

Author: smowton

java/ql/src/utils/GenerateFlowTestCase.py

@@ -212,7 +212,6 @@ def copyfile(fromName, toFileHandle):
         f.write(", ".join('"%s"' %
                           modelSpecRow[0].strip() for modelSpecRow in supportModelRows))
         copyfile("testModelsFooter.qlfrag", f)
-    copyfile("testFooter.qlfrag", f)
 
 # Make an empty .expected file, since this is an inline-exectations test
 with open(os.path.join(sys.argv[3], "test.expected"), "w"):

java/ql/src/utils/testFooter.qlfrag

@@ -1,5 +1,2 @@
 import java
-import semmle.code.java.dataflow.DataFlow
-import semmle.code.java.dataflow.ExternalFlow
-import semmle.code.java.dataflow.TaintTracking
-import TestUtilities.InlineExpectationsTest
+import TestUtilities.InlineFlowTest