Merge pull request #13426 from jketema/inline-3

Update inline flow tests to use parameterized module

java/ql/test/library-tests/dataflow/callctx/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/dataflow/callctx/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/dataflow/collections/containerflow.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/dataflow/collections/containerflow.ql

@@ -1,3 +1,4 @@
 import java
 import semmle.code.java.dataflow.DataFlow
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

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

@@ -0,0 +1,2 @@
+failures
+testFailures

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

@@ -2,6 +2,7 @@ import java
 import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.dataflow.FlowSteps
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest
 
 class Model extends FluentMethod {
   Model() { this.getName() = "modelledFluentMethod" }

java/ql/test/library-tests/dataflow/stream-collect/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/dataflow/stream-collect/test.ql

@@ -1 +1,2 @@
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/dataflow/synth-global/test.expected

@@ -1,2 +1,3 @@
 failures
+testFailures
 invalidModelRow

java/ql/test/library-tests/dataflow/synth-global/test.ql

@@ -1,3 +1,4 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest
 import ModelValidation

java/ql/test/library-tests/dataflow/taint-format/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/dataflow/taint-format/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/dataflow/taint-gson/dataFlow.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/dataflow/taint-gson/dataFlow.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

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

@@ -0,0 +1,2 @@
+failures
+testFailures

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

@@ -13,16 +13,4 @@ module Config implements DataFlow::ConfigSig {
   predicate isSink = DefaultFlowConfig::isSink/1;
 }
 
-module TaintFlow = TaintTracking::Global<Config>;
-
-module ValueFlow = DataFlow::Global<Config>;
-
-class Test extends InlineFlowTest {
-  override predicate hasTaintFlow(DataFlow::Node source, DataFlow::Node sink) {
-    TaintFlow::flow(source, sink)
-  }
-
-  override predicate hasValueFlow(DataFlow::Node source, DataFlow::Node sink) {
-    ValueFlow::flow(source, sink)
-  }
-}
+import FlowTest<Config, Config>

java/ql/test/library-tests/frameworks/android/asynctask/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/android/asynctask/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/android/content-provider-summaries/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/android/content-provider-summaries/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/android/content-provider/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/android/content-provider/test.ql

@@ -10,12 +10,4 @@ module ProviderTaintFlowConfig implements DataFlow::ConfigSig {
   int fieldFlowBranchLimit() { result = DefaultFlowConfig::fieldFlowBranchLimit() }
 }
 
-module ProviderTaintFlow = TaintTracking::Global<ProviderTaintFlowConfig>;
-
-class ProviderInlineFlowTest extends InlineFlowTest {
-  override predicate hasValueFlow(DataFlow::Node src, DataFlow::Node sink) { none() }
-
-  override predicate hasTaintFlow(DataFlow::Node src, DataFlow::Node sink) {
-    ProviderTaintFlow::flow(src, sink)
-  }
-}
+import TaintFlowTest<ProviderTaintFlowConfig>

java/ql/test/library-tests/frameworks/android/external-storage/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/android/external-storage/test.ql

@@ -11,10 +11,4 @@ module Config implements DataFlow::ConfigSig {
   }
 }
 
-module Flow = TaintTracking::Global<Config>;
-
-class ExternalStorageTest extends InlineFlowTest {
-  override predicate hasValueFlow(DataFlow::Node src, DataFlow::Node sink) { none() }
-
-  override predicate hasTaintFlow(DataFlow::Node src, DataFlow::Node sink) { Flow::flow(src, sink) }
-}
+import TaintFlowTest<Config>

java/ql/test/library-tests/frameworks/android/flow-steps/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/android/flow-steps/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/android/intent/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/android/intent/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/android/notification/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/android/notification/test.ql

@@ -1,3 +1,4 @@
 import java
 import semmle.code.java.frameworks.android.Intent
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/android/slice/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/android/slice/test.ql

@@ -11,8 +11,6 @@ module SliceValueFlowConfig implements DataFlow::ConfigSig {
   predicate isSink = DefaultFlowConfig::isSink/1;
 }
 
-module SliceValueFlow = DataFlow::Global<SliceValueFlowConfig>;
-
 module SliceTaintFlowConfig implements DataFlow::ConfigSig {
   predicate isSource = DefaultFlowConfig::isSource/1;
 
@@ -24,14 +22,4 @@ module SliceTaintFlowConfig implements DataFlow::ConfigSig {
   }
 }
 
-module SliceTaintFlow = TaintTracking::Global<SliceTaintFlowConfig>;
-
-class SliceFlowTest extends InlineFlowTest {
-  override predicate hasValueFlow(DataFlow::Node source, DataFlow::Node sink) {
-    SliceValueFlow::flow(source, sink)
-  }
-
-  override predicate hasTaintFlow(DataFlow::Node source, DataFlow::Node sink) {
-    SliceTaintFlow::flow(source, sink)
-  }
-}
+import FlowTest<SliceValueFlowConfig, SliceTaintFlowConfig>

java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql

@@ -10,12 +10,4 @@ module SourceValueFlowConfig implements DataFlow::ConfigSig {
   int fieldFlowBranchLimit() { result = DefaultFlowConfig::fieldFlowBranchLimit() }
 }
 
-module SourceValueFlow = DataFlow::Global<SourceValueFlowConfig>;
-
-class SourceInlineFlowTest extends InlineFlowTest {
-  override predicate hasValueFlow(DataFlow::Node src, DataFlow::Node sink) {
-    SourceValueFlow::flow(src, sink)
-  }
-
-  override predicate hasTaintFlow(DataFlow::Node src, DataFlow::Node sink) { none() }
-}
+import ValueFlowTest<SourceValueFlowConfig>

java/ql/test/library-tests/frameworks/android/uri/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/android/uri/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/android/widget/test.expected

@@ -1,2 +1,3 @@
 failures
+testFailures
 valueOf

java/ql/test/library-tests/frameworks/android/widget/test.ql

@@ -1,6 +1,7 @@
 import java
 import semmle.code.java.dataflow.FlowSources
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest
 
 query predicate valueOf(MethodAccess ma) {
   ma.getMethod().hasQualifiedName("java.lang", "String", "valueOf")

java/ql/test/library-tests/frameworks/apache-ant/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/apache-ant/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/apache-collections/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/apache-collections/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/apache-commons-compress/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/apache-commons-compress/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/apache-http/flow.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/apache-http/flow.ql

@@ -21,10 +21,4 @@ module Config implements DataFlow::ConfigSig {
   }
 }
 
-module Flow = TaintTracking::Global<Config>;
-
-class HasFlowTest extends InlineFlowTest {
-  override predicate hasValueFlow(DataFlow::Node src, DataFlow::Node sink) { none() }
-
-  override predicate hasTaintFlow(DataFlow::Node src, DataFlow::Node sink) { Flow::flow(src, sink) }
-}
+import TaintFlowTest<Config>

java/ql/test/library-tests/frameworks/gson/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/gson/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/guava/generated/cache/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/guava/generated/cache/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/guava/generated/collect/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/guava/generated/collect/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/hudson/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/hudson/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/jackson/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/jackson/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/javax-json/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/javax-json/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/jdk/java.io/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/jdk/java.io/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/jdk/java.net/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/jdk/java.net/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/jdk/java.nio.file/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/jdk/java.nio.file/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/json-java/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/json-java/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/netty/generated/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/netty/generated/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/netty/manual/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/netty/manual/test.ql

@@ -13,10 +13,4 @@ module Config implements DataFlow::ConfigSig {
   predicate isSink = DefaultFlowConfig::isSink/1;
 }
 
-module Flow = TaintTracking::Global<Config>;
-
-class Test extends InlineFlowTest {
-  override predicate hasTaintFlow(DataFlow::Node source, DataFlow::Node sink) {
-    Flow::flow(source, sink)
-  }
-}
+import FlowTest<DefaultFlowConfig, Config>

java/ql/test/library-tests/frameworks/okhttp/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/okhttp/test.ql

@@ -10,10 +10,4 @@ module OkHttpFlowConfig implements DataFlow::ConfigSig {
   }
 }
 
-module OkHttpFlow = DataFlow::Global<OkHttpFlowConfig>;
-
-class OkHttpTest extends InlineFlowTest {
-  override predicate hasValueFlow(DataFlow::Node src, DataFlow::Node sink) {
-    OkHttpFlow::flow(src, sink)
-  }
-}
+import FlowTest<OkHttpFlowConfig, DefaultFlowConfig>

java/ql/test/library-tests/frameworks/play/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/play/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql

@@ -11,10 +11,4 @@ module Config implements DataFlow::ConfigSig {
   }
 }
 
-module Flow = TaintTracking::Global<Config>;
-
-class HasFlowTest extends InlineFlowTest {
-  override predicate hasValueFlow(DataFlow::Node src, DataFlow::Node sink) { none() }
-
-  override predicate hasTaintFlow(DataFlow::Node src, DataFlow::Node sink) { Flow::flow(src, sink) }
-}
+import TaintFlowTest<Config>

java/ql/test/library-tests/frameworks/ratpack/flow.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/ratpack/flow.ql

@@ -15,12 +15,4 @@ module Config implements DataFlow::ConfigSig {
   }
 }
 
-module Flow = TaintTracking::Global<Config>;
-
-class HasFlowTest extends InlineFlowTest {
-  HasFlowTest() { this = "HasFlowTest" }
-
-  override predicate hasValueFlow(DataFlow::Node src, DataFlow::Node sink) { none() }
-
-  override predicate hasTaintFlow(DataFlow::Node src, DataFlow::Node sink) { Flow::flow(src, sink) }
-}
+import TaintFlowTest<Config>

java/ql/test/library-tests/frameworks/retrofit/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/retrofit/test.ql

@@ -10,8 +10,4 @@ module FlowConfig implements DataFlow::ConfigSig {
   }
 }
 
-module Flow = DataFlow::Global<FlowConfig>;
-
-class RetrofitFlowTest extends InlineFlowTest {
-  override predicate hasValueFlow(DataFlow::Node src, DataFlow::Node sink) { Flow::flow(src, sink) }
-}
+import FlowTest<FlowConfig, DefaultFlowConfig>

java/ql/test/library-tests/frameworks/spring/beans/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/spring/beans/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/spring/cache/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/spring/cache/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/spring/context/flow.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/spring/context/flow.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/spring/controller/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/spring/controller/test.ql

@@ -10,10 +10,4 @@ module ValueFlowConfig implements DataFlow::ConfigSig {
   }
 }
 
-module ValueFlow = DataFlow::Global<ValueFlowConfig>;
-
-class Test extends InlineFlowTest {
-  override predicate hasValueFlow(DataFlow::Node src, DataFlow::Node sink) {
-    ValueFlow::flow(src, sink)
-  }
-}
+import FlowTest<ValueFlowConfig, DefaultFlowConfig>

java/ql/test/library-tests/frameworks/spring/data/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/spring/data/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/spring/http/flow.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/spring/http/flow.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/spring/ui/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/spring/ui/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest

java/ql/test/library-tests/frameworks/spring/util/test.expected

@@ -0,0 +1,2 @@
+failures
+testFailures

java/ql/test/library-tests/frameworks/spring/util/test.ql

@@ -1,2 +1,3 @@
 import java
 import TestUtilities.InlineFlowTest
+import DefaultFlowTest