Skip to content

Turn inline expectation test into a parameterized module #12789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 23, 2023
Merged

Turn inline expectation test into a parameterized module #12789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b96bfea
Turn inline expectation test into a parameterized module
jketema Apr 8, 2023
9228e0d
C++: Rewrite local flow test to use `TestSig`
jketema Apr 11, 2023
04beeef
Add convenience module that merges two inline expectation tests
jketema Apr 12, 2023
adbf66a
C++: Rewrite inline expectation test to demonstrate `MergeTests`
jketema Apr 12, 2023
3efc78e
Add default for `hasOptionalResult`
jketema May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
failures
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a bit of a shame that we also have the failures predicate here, but I don't see an easy way to avoid that. Should of course disappear when we have converted all existing tests away from the legacy interface.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I completely agree.

testFailures
18 changes: 8 additions & 10 deletions cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ module AstTest {
private import semmle.code.cpp.dataflow.DataFlow::DataFlow
private import semmle.code.cpp.dataflow.internal.DataFlowPrivate

class AstParameterDefTest extends InlineExpectationsTest {
AstParameterDefTest() { this = "AstParameterDefTest" }
module AstParameterDefTest implements TestSig {
string getARelevantTag() { result = "ast-def" }

override string getARelevantTag() { result = "ast-def" }

override predicate hasActualResult(Location location, string element, string tag, string value) {
predicate hasActualResult(Location location, string element, string tag, string value) {
exists(Function f, Parameter p, RefParameterFinalValueNode n |
p.isNamed() and
n.getParameter() = p and
Expand All @@ -33,12 +31,10 @@ module IRTest {
(if k = 0 then result = "" else result = "*" + stars(k - 1))
}

class IRParameterDefTest extends InlineExpectationsTest {
IRParameterDefTest() { this = "IRParameterDefTest" }

override string getARelevantTag() { result = "ir-def" }
module IRParameterDefTest implements TestSig {
string getARelevantTag() { result = "ir-def" }

override predicate hasActualResult(Location location, string element, string tag, string value) {
predicate hasActualResult(Location location, string element, string tag, string value) {
exists(Function f, Parameter p, FinalParameterNode n |
p.isNamed() and
n.getParameter() = p and
Expand All @@ -51,3 +47,5 @@ module IRTest {
}
}
}

import MakeTest<MergeTests<AstTest::AstParameterDefTest, IRTest::IRParameterDefTest>>
2 changes: 2 additions & 0 deletions cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
failures
testFailures
10 changes: 5 additions & 5 deletions cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ import cpp
import TestUtilities.InlineExpectationsTest
import semmle.code.cpp.security.FlowSources

class LocalFlowSourceTest extends InlineExpectationsTest {
LocalFlowSourceTest() { this = "LocalFlowSourceTest" }
module LocalFlowSourceTest implements TestSig {
string getARelevantTag() { result = "local_source" }

override string getARelevantTag() { result = "local_source" }

override predicate hasActualResult(Location location, string element, string tag, string value) {
predicate hasActualResult(Location location, string element, string tag, string value) {
tag = "local_source" and
exists(LocalFlowSource node, int n |
n =
Expand All @@ -30,3 +28,5 @@ class LocalFlowSourceTest extends InlineExpectationsTest {
)
}
}

import MakeTest<LocalFlowSourceTest>
Loading