From bce5f2539f7c2bdf6feaef9810188dc133cb8416 Mon Sep 17 00:00:00 2001 From: Mathias Vorreiter Pedersen Date: Fri, 2 May 2025 16:52:05 +0100 Subject: [PATCH] C++/C#/Java/Rust: Fixup tests. --- .../src/utils/modelgenerator/CaptureContentSummaryModels.ql | 2 +- .../modelgenerator/dataflow/CaptureContentSummaryModels.ql | 4 +++- .../src/utils/modelgenerator/CaptureContentSummaryModels.ql | 2 +- .../modelgenerator/dataflow/CaptureContentSummaryModels.ql | 2 +- .../src/utils/modelgenerator/CaptureContentSummaryModels.ql | 2 +- .../modelgenerator/dataflow/CaptureContentSummaryModels.ql | 2 +- .../src/utils/modelgenerator/CaptureContentSummaryModels.ql | 2 +- .../test/utils-tests/modelgenerator/CaptureSummaryModels.ql | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cpp/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql b/cpp/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql index c9ded748466..a15a584e13d 100644 --- a/cpp/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql +++ b/cpp/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql @@ -10,5 +10,5 @@ import internal.CaptureModels import SummaryModels from DataFlowSummaryTargetApi api, string flow -where flow = ContentSensitive::captureFlow(api, _, _) +where flow = ContentSensitive::captureFlow(api, _, _, _, _) select flow order by flow diff --git a/cpp/ql/test/library-tests/dataflow/modelgenerator/dataflow/CaptureContentSummaryModels.ql b/cpp/ql/test/library-tests/dataflow/modelgenerator/dataflow/CaptureContentSummaryModels.ql index a7d6e0ad4ec..37990554258 100644 --- a/cpp/ql/test/library-tests/dataflow/modelgenerator/dataflow/CaptureContentSummaryModels.ql +++ b/cpp/ql/test/library-tests/dataflow/modelgenerator/dataflow/CaptureContentSummaryModels.ql @@ -4,7 +4,9 @@ import SummaryModels import InlineModelsAsDataTest module InlineMadTestConfig implements InlineMadTestConfigSig { - string getCapturedModel(MadRelevantFunction c) { result = ContentSensitive::captureFlow(c, _, _) } + string getCapturedModel(MadRelevantFunction c) { + result = ContentSensitive::captureFlow(c, _, _, _, _) + } string getKind() { result = "contentbased-summary" } } diff --git a/csharp/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql b/csharp/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql index cc36c15d6ad..6030960a1a7 100644 --- a/csharp/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql +++ b/csharp/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql @@ -10,5 +10,5 @@ import internal.CaptureModels import SummaryModels from DataFlowSummaryTargetApi api, string flow -where flow = ContentSensitive::captureFlow(api, _, _) +where flow = ContentSensitive::captureFlow(api, _, _, _, _) select flow order by flow diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql index 7a385bc70ac..a52b96b0232 100644 --- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql +++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql @@ -4,7 +4,7 @@ import SummaryModels import utils.test.InlineMadTest module InlineMadTestConfig implements InlineMadTestConfigSig { - string getCapturedModel(Callable c) { result = ContentSensitive::captureFlow(c, _, _) } + string getCapturedModel(Callable c) { result = ContentSensitive::captureFlow(c, _, _, _, _) } string getKind() { result = "contentbased-summary" } } diff --git a/java/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql b/java/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql index 3eec61cc8d4..39e8cd9a0a4 100644 --- a/java/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql +++ b/java/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql @@ -10,5 +10,5 @@ import internal.CaptureModels import SummaryModels from DataFlowSummaryTargetApi api, string flow -where flow = ContentSensitive::captureFlow(api, _, _) +where flow = ContentSensitive::captureFlow(api, _, _, _, _) select flow order by flow diff --git a/java/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql b/java/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql index 1954bc8cd96..aecabe42901 100644 --- a/java/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql +++ b/java/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql @@ -4,7 +4,7 @@ import SummaryModels import utils.test.InlineMadTest module InlineMadTestConfig implements InlineMadTestConfigSig { - string getCapturedModel(Callable c) { result = ContentSensitive::captureFlow(c, _, _) } + string getCapturedModel(Callable c) { result = ContentSensitive::captureFlow(c, _, _, _, _) } string getKind() { result = "contentbased-summary" } } diff --git a/rust/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql b/rust/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql index e88efe80b8e..9dd63e06ea7 100644 --- a/rust/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql +++ b/rust/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql @@ -10,5 +10,5 @@ import internal.CaptureModels import SummaryModels from DataFlowSummaryTargetApi api, string flow -where flow = ContentSensitive::captureFlow(api, _, _) +where flow = ContentSensitive::captureFlow(api, _, _, _, _) select flow order by flow diff --git a/rust/ql/test/utils-tests/modelgenerator/CaptureSummaryModels.ql b/rust/ql/test/utils-tests/modelgenerator/CaptureSummaryModels.ql index c68b3b18b8c..fe5e532394b 100644 --- a/rust/ql/test/utils-tests/modelgenerator/CaptureSummaryModels.ql +++ b/rust/ql/test/utils-tests/modelgenerator/CaptureSummaryModels.ql @@ -4,7 +4,7 @@ import SummaryModels import utils.test.InlineMadTest module InlineMadTestConfig implements InlineMadTestConfigSig { - string getCapturedModel(Function f) { result = ContentSensitive::captureFlow(f, _, _) } + string getCapturedModel(Function f) { result = ContentSensitive::captureFlow(f, _, _, _, _) } string getKind() { result = "summary" } }