hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 10:15:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Test gen] Distinguish default support methods

Browse Source
This commit is contained in:
Joe Farebrother
2021-09-14 11:18:37 +01:00
parent eb45e67784
commit ef5bf87672
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/ql/src/utils/FlowTestCase.qll
View File

@@ -257,9 +257,15 @@ class TestCase extends TTestCase {
if componentStack = baseOutput
then result = "out"
else
result =
SupportMethod::getMethodForContent(componentStack)
.getCall(this.getOutput(componentStack.tail()))
if componentStack.tail() = baseOutput
then
result =
SupportMethod::getMethodFor(this.getOutputType(), componentStack)
.getCall(this.getOutput(componentStack.tail()))
else
result =
SupportMethod::getMethodForContent(componentStack)
.getCall(this.getOutput(componentStack.tail()))
)
}

12
java/ql/src/utils/FlowTestCaseSupportMethods.qll
View File

@@ -145,7 +145,7 @@ private class DefaultGetMethod extends GetMethod {
DefaultGetMethod() { this = "DefaultGet" + contentToken(c) }
string getName() { result = "get" + contentToken(c) }
string getName() { result = "get" + contentToken(c) + "Default" }
override int getPriority() { result = 999 }
@@ -159,12 +159,12 @@ private class DefaultGetMethod extends GetMethod {
override string getCall(string arg) { result = this.getName() + "(" + arg + ")" }
override string getDefinition() {
result = "Object get" + contentToken(c) + "(Object container) { return null; }"
result = "Object get" + contentToken(c) + "Default(Object container) { return null; }"
}
override string getCsvModel() {
result =
"generatedtest;Test;false;" + this.getName() + ";;;" +
"generatedtest;Test;false;" + this.getName() + ";(Object);;" +
getComponentSpec(SummaryComponent::content(c)) + " of Argument[0];ReturnValue;value"
}
}
@@ -285,7 +285,7 @@ private class DefaultGenMethod extends GenMethod {
DefaultGenMethod() { this = "DefaultGen" + contentToken(c) }
string getName() { result = "newWith" + contentToken(c) }
string getName() { result = "newWith" + contentToken(c) + "Default" }
override int getPriority() { result = 999 }
@@ -299,12 +299,12 @@ private class DefaultGenMethod extends GenMethod {
override string getCall(string arg) { result = this.getName() + "(" + arg + ")" }
override string getDefinition() {
result = "Object newWith" + contentToken(c) + "(Object element) { return null; }"
result = "Object newWith" + contentToken(c) + "Default(Object element) { return null; }"
}
override string getCsvModel() {
result =
"generatedtest;Test;false;" + this.getName() + ";;;Argument[0];" +
"generatedtest;Test;false;" + this.getName() + ";(Object);;Argument[0];" +
getComponentSpec(SummaryComponent::content(c)) + " of ReturnValue;value"
}
}