C++: Move test utilities into the query pack.

cpp/ql/test/TestUtilities/InlineExpectationsTest.qll

@@ -1,9 +0,0 @@
-/**
- * Inline expectation tests for C++.
- * See `shared/util/codeql/util/test/InlineExpectationsTest.qll`
- */
-
-import cpp as C
-private import codeql.util.test.InlineExpectationsTest
-private import internal.InlineExpectationsTestImpl
-import Make<Impl>

cpp/ql/test/TestUtilities/InlineExpectationsTestQuery.ql

@@ -1,21 +0,0 @@
-/**
- * @kind test-postprocess
- */
-
-private import cpp
-private import codeql.util.test.InlineExpectationsTest as T
-private import internal.InlineExpectationsTestImpl
-import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}

cpp/ql/test/TestUtilities/dataflow/FlowTestCommon.qll

@@ -1,75 +0,0 @@
-/**
- * Helper library for implementing data or taint flow inline expectation tests.
- * As long as data or taint flow configurations for IR and/or AST based data/taint flow
- * are in scope, provides inline expectations tests.
- * All sinks that have flow are annotated with `ast` (or respective `ir`) if there
- * is a unique source for the flow.
- * Otherwise, if there are multiple sources that can reach a given sink, the annotations
- * have the form `ast=lineno:column` (or `ir=lineno:column`).
- * If a sink is reachable through both AST and IR flow, the annotations have the form
- * `ast,ir` or `ast,ir=lineno:column`.
- * Intermediate steps from the source to the sink are not annotated.
- */
-
-import cpp
-private import semmle.code.cpp.ir.dataflow.DataFlow::DataFlow as IRDataFlow
-private import semmle.code.cpp.dataflow.DataFlow::DataFlow as AstDataFlow
-import TestUtilities.InlineExpectationsTest
-
-module IRFlowTest<IRDataFlow::GlobalFlowSig Flow> implements TestSig {
-  string getARelevantTag() { result = "ir" }
-
-  predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(IRDataFlow::Node source, IRDataFlow::Node sink, int n |
-      tag = "ir" and
-      Flow::flow(source, sink) and
-      n =
-        strictcount(int line, int column |
-          Flow::flow(any(IRDataFlow::Node otherSource |
-              otherSource.hasLocationInfo(_, line, column, _, _)
-            ), sink)
-        ) and
-      (
-        n = 1 and value = ""
-        or
-        // If there is more than one source for this sink
-        // we specify the source location explicitly.
-        n > 1 and
-        value =
-          source.getLocation().getStartLine().toString() + ":" +
-            source.getLocation().getStartColumn()
-      ) and
-      location = sink.getLocation() and
-      element = sink.toString()
-    )
-  }
-}
-
-module AstFlowTest<AstDataFlow::GlobalFlowSig Flow> implements TestSig {
-  string getARelevantTag() { result = "ast" }
-
-  predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(AstDataFlow::Node source, AstDataFlow::Node sink, int n |
-      tag = "ast" and
-      Flow::flow(source, sink) and
-      n =
-        strictcount(int line, int column |
-          Flow::flow(any(AstDataFlow::Node otherSource |
-              otherSource.hasLocationInfo(_, line, column, _, _)
-            ), sink)
-        ) and
-      (
-        n = 1 and value = ""
-        or
-        // If there is more than one source for this sink
-        // we specify the source location explicitly.
-        n > 1 and
-        value =
-          source.getLocation().getStartLine().toString() + ":" +
-            source.getLocation().getStartColumn()
-      ) and
-      location = sink.getLocation() and
-      element = sink.toString()
-    )
-  }
-}

cpp/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll

@@ -1,28 +0,0 @@
-import cpp as C
-private import codeql.util.test.InlineExpectationsTest
-
-module Impl implements InlineExpectationsTestSig {
-  private newtype TExpectationComment = MkExpectationComment(C::CppStyleComment c)
-
-  /**
-   * A class representing a line comment in the CPP style.
-   * Unlike the `CppStyleComment` class, however, the string returned by `getContents` does _not_
-   * include the preceding comment marker (`//`).
-   */
-  class ExpectationComment extends TExpectationComment {
-    C::CppStyleComment comment;
-
-    ExpectationComment() { this = MkExpectationComment(comment) }
-
-    /** Returns the contents of the given comment, _without_ the preceding comment marker (`//`). */
-    string getContents() { result = comment.getContents().suffix(2) }
-
-    /** Gets a textual representation of this element. */
-    string toString() { result = comment.toString() }
-
-    /** Gets the location of this comment. */
-    Location getLocation() { result = comment.getLocation() }
-  }
-
-  class Location = C::Location;
-}