Merge pull request github#13346 from jketema/inline-2

Update inline expectation tests to use parameterized module

Author: jketema

go/ql/test/experimental/frameworks/CleverGo/HeaderWrite.expected

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

go/ql/test/experimental/frameworks/CleverGo/HeaderWrite.ql

@@ -2,14 +2,10 @@ import go
 import TestUtilities.InlineExpectationsTest
 import experimental.frameworks.CleverGo
 
-class HttpHeaderWriteTest extends InlineExpectationsTest {
-  HttpHeaderWriteTest() { this = "HttpHeaderWriteTest" }
+module HttpHeaderWriteTest implements TestSig {
+  string getARelevantTag() { result = ["headerKeyNode", "headerValNode", "headerKey", "headerVal"] }
 
-  override string getARelevantTag() {
-    result = ["headerKeyNode", "headerValNode", "headerKey", "headerVal"]
-  }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     // Dynamic key-value header:
     exists(Http::HeaderWrite hw |
       hw.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
@@ -56,3 +52,5 @@ class HttpHeaderWriteTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<HttpHeaderWriteTest>

go/ql/test/experimental/frameworks/CleverGo/HttpRedirect.expected

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

go/ql/test/experimental/frameworks/CleverGo/HttpRedirect.ql

@@ -2,12 +2,10 @@ import go
 import TestUtilities.InlineExpectationsTest
 import experimental.frameworks.CleverGo
 
-class HttpRedirectTest extends InlineExpectationsTest {
-  HttpRedirectTest() { this = "HttpRedirectTest" }
+module HttpRedirectTest implements TestSig {
+  string getARelevantTag() { result = "redirectUrl" }
 
-  override string getARelevantTag() { result = "redirectUrl" }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "redirectUrl" and
     exists(Http::Redirect rd |
       rd.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
@@ -17,3 +15,5 @@ class HttpRedirectTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<HttpRedirectTest>

go/ql/test/experimental/frameworks/CleverGo/HttpResponseBody.expected

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

go/ql/test/experimental/frameworks/CleverGo/HttpResponseBody.ql

@@ -2,12 +2,10 @@ import go
 import TestUtilities.InlineExpectationsTest
 import experimental.frameworks.CleverGo
 
-class HttpResponseBodyTest extends InlineExpectationsTest {
-  HttpResponseBodyTest() { this = "HttpResponseBodyTest" }
+module HttpResponseBodyTest implements TestSig {
+  string getARelevantTag() { result = ["contentType", "responseBody"] }
 
-  override string getARelevantTag() { result = ["contentType", "responseBody"] }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     exists(Http::ResponseBody rd |
       rd.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
         location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
@@ -23,3 +21,5 @@ class HttpResponseBodyTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<HttpResponseBodyTest>

go/ql/test/experimental/frameworks/CleverGo/TaintTracking.expected

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

go/ql/test/experimental/frameworks/CleverGo/TaintTracking.ql

@@ -14,12 +14,10 @@ class Configuration extends TaintTracking::Configuration {
   }
 }
 
-class TaintTrackingTest extends InlineExpectationsTest {
-  TaintTrackingTest() { this = "TaintTrackingTest" }
+module TaintTrackingTest implements TestSig {
+  string getARelevantTag() { result = "taintSink" }
 
-  override string getARelevantTag() { result = "taintSink" }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "taintSink" and
     exists(DataFlow::Node sink | any(Configuration c).hasFlow(_, sink) |
       element = sink.toString() and
@@ -29,3 +27,5 @@ class TaintTrackingTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<TaintTrackingTest>

go/ql/test/experimental/frameworks/CleverGo/UntrustedSources.expected

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

go/ql/test/experimental/frameworks/CleverGo/UntrustedSources.ql

@@ -2,12 +2,10 @@ import go
 import TestUtilities.InlineExpectationsTest
 import experimental.frameworks.CleverGo
 
-class UntrustedFlowSourceTest extends InlineExpectationsTest {
-  UntrustedFlowSourceTest() { this = "UntrustedFlowSourceTest" }
+module UntrustedFlowSourceTest implements TestSig {
+  string getARelevantTag() { result = "untrustedFlowSource" }
 
-  override string getARelevantTag() { result = "untrustedFlowSource" }
-
-  override predicate hasActualResult(Location location, string element, string tag, string value) {
+  predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "untrustedFlowSource" and
     exists(DataFlow::CallNode sinkCall, DataFlow::ArgumentNode arg |
       sinkCall.getCalleeName() = "sink" and
@@ -21,3 +19,5 @@ class UntrustedFlowSourceTest extends InlineExpectationsTest {
     )
   }
 }
+
+import MakeTest<UntrustedFlowSourceTest>