C++: update test QL for modulus and sign analysis

These now instantiate their respective parameterized modules. No
results change.

Author: Robert Marsh

cpp/ql/test/library-tests/ir/modulus-analysis/ModulusAnalysis.ql

@@ -1,9 +1,16 @@
 import cpp
 import experimental.semmle.code.cpp.semantic.analysis.ModulusAnalysis
 import experimental.semmle.code.cpp.semantic.Semantic
+import experimental.semmle.code.cpp.semantic.analysis.RangeUtils
+import experimental.semmle.code.cpp.semantic.analysis.FloatDelta
+import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysisSpecific
+import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysis
 import semmle.code.cpp.ir.IR as IR
 import TestUtilities.InlineExpectationsTest
 
+module ModulusAnalysisInstantiated =
+  ModulusAnalysis<FloatDelta, Bounds, RangeUtil<FloatDelta, CppLangImpl>>;
+
 class ModulusAnalysisTest extends InlineExpectationsTest {
   ModulusAnalysisTest() { this = "ModulusAnalysisTest" }
 
@@ -23,7 +30,7 @@ class ModulusAnalysisTest extends InlineExpectationsTest {
 
 private string getAModString(SemExpr e) {
   exists(SemBound b, int delta, int mod |
-    semExprModulus(e, b, delta, mod) and
+    ModulusAnalysisInstantiated::semExprModulus(e, b, delta, mod) and
     result = b.toString() + "," + delta.toString() + "," + mod.toString() and
     not (delta = 0 and mod = 0)
   )

cpp/ql/test/library-tests/ir/sign-analysis/SignAnalysis.ql

@@ -1,9 +1,14 @@
 import cpp
 import experimental.semmle.code.cpp.semantic.analysis.SignAnalysisCommon
 import experimental.semmle.code.cpp.semantic.Semantic
+import experimental.semmle.code.cpp.semantic.analysis.RangeUtils
+import experimental.semmle.code.cpp.semantic.analysis.FloatDelta
+import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysisSpecific
 import semmle.code.cpp.ir.IR as IR
 import TestUtilities.InlineExpectationsTest
 
+module SignAnalysisInstantiated = SignAnalysis<FloatDelta, RangeUtil<FloatDelta, CppLangImpl>>;
+
 class SignAnalysisTest extends InlineExpectationsTest {
   SignAnalysisTest() { this = "SignAnalysisTest" }
 
@@ -21,4 +26,6 @@ class SignAnalysisTest extends InlineExpectationsTest {
   }
 }
 
-private string getASignString(SemExpr e) { result = strictconcat(semExprSign(e).toString(), "") }
+private string getASignString(SemExpr e) {
+  result = strictconcat(SignAnalysisInstantiated::semExprSign(e).toString(), "")
+}