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

Python: Autoformat everything using qlformat.

Browse Source 
Will need subsequent PRs fixing up test failures (due to deprecated
methods moving around), but other than that everything should be
straight-forward.
This commit is contained in:
Taus Brock-Nannestad
2020-07-07 15:43:52 +02:00
parent 993506d781
commit f07a7bf8cf
602 changed files with 26777 additions and 26790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
python/ql/src/Testing/ImpreciseAssert.ql
View File

@@ -14,79 +14,79 @@ import python
/* Helper predicate for CallToAssertOnComparison class */
predicate callToAssertOnComparison(Call call, string assertName, Cmpop op) {
call.getFunc().(Attribute).getName() = assertName and
(assertName = "assertTrue" or assertName = "assertFalse") and
exists(Compare cmp |
cmp = call.getArg(0) and
/* Exclude complex comparisons like: a < b < c */
not exists(cmp.getOp(1)) and
op = cmp.getOp(0)
)
call.getFunc().(Attribute).getName() = assertName and
(assertName = "assertTrue" or assertName = "assertFalse") and
exists(Compare cmp |
cmp = call.getArg(0) and
/* Exclude complex comparisons like: a < b < c */
not exists(cmp.getOp(1)) and
op = cmp.getOp(0)
)
}
class CallToAssertOnComparison extends Call {
CallToAssertOnComparison() { callToAssertOnComparison(this, _, _) }
CallToAssertOnComparison() { callToAssertOnComparison(this, _, _) }
Cmpop getOperator() { callToAssertOnComparison(this, _, result) }
Cmpop getOperator() { callToAssertOnComparison(this, _, result) }
string getMethodName() { callToAssertOnComparison(this, result, _) }
string getMethodName() { callToAssertOnComparison(this, result, _) }
string getBetterName() {
exists(Cmpop op |
callToAssertOnComparison(this, "assertTrue", op) and
(
op instanceof Eq and result = "assertEqual"
or
op instanceof NotEq and result = "assertNotEqual"
or
op instanceof Lt and result = "assertLess"
or
op instanceof LtE and result = "assertLessEqual"
or
op instanceof Gt and result = "assertGreater"
or
op instanceof GtE and result = "assertGreaterEqual"
or
op instanceof In and result = "assertIn"
or
op instanceof NotIn and result = "assertNotIn"
or
op instanceof Is and result = "assertIs"
or
op instanceof IsNot and result = "assertIsNot"
)
or
callToAssertOnComparison(this, "assertFalse", op) and
(
op instanceof NotEq and result = "assertEqual"
or
op instanceof Eq and result = "assertNotEqual"
or
op instanceof GtE and result = "assertLess"
or
op instanceof Gt and result = "assertLessEqual"
or
op instanceof LtE and result = "assertGreater"
or
op instanceof Lt and result = "assertGreaterEqual"
or
op instanceof NotIn and result = "assertIn"
or
op instanceof In and result = "assertNotIn"
or
op instanceof IsNot and result = "assertIs"
or
op instanceof Is and result = "assertIsNot"
)
)
}
string getBetterName() {
exists(Cmpop op |
callToAssertOnComparison(this, "assertTrue", op) and
(
op instanceof Eq and result = "assertEqual"
or
op instanceof NotEq and result = "assertNotEqual"
or
op instanceof Lt and result = "assertLess"
or
op instanceof LtE and result = "assertLessEqual"
or
op instanceof Gt and result = "assertGreater"
or
op instanceof GtE and result = "assertGreaterEqual"
or
op instanceof In and result = "assertIn"
or
op instanceof NotIn and result = "assertNotIn"
or
op instanceof Is and result = "assertIs"
or
op instanceof IsNot and result = "assertIsNot"
)
or
callToAssertOnComparison(this, "assertFalse", op) and
(
op instanceof NotEq and result = "assertEqual"
or
op instanceof Eq and result = "assertNotEqual"
or
op instanceof GtE and result = "assertLess"
or
op instanceof Gt and result = "assertLessEqual"
or
op instanceof LtE and result = "assertGreater"
or
op instanceof Lt and result = "assertGreaterEqual"
or
op instanceof NotIn and result = "assertIn"
or
op instanceof In and result = "assertNotIn"
or
op instanceof IsNot and result = "assertIs"
or
op instanceof Is and result = "assertIsNot"
)
)
}
}
from CallToAssertOnComparison call
where
/* Exclude cases where an explicit message is provided*/
not exists(call.getArg(1))
/* Exclude cases where an explicit message is provided*/
not exists(call.getArg(1))
select call,
call.getMethodName() + "(a " + call.getOperator().getSymbol() + " b) " +
"cannot provide an informative message. Using " + call.getBetterName() +
"(a, b) instead will give more informative messages."
call.getMethodName() + "(a " + call.getOperator().getSymbol() + " b) " +
"cannot provide an informative message. Using " + call.getBetterName() +
"(a, b) instead will give more informative messages."

20
python/ql/src/Testing/Mox.qll
View File

@@ -2,15 +2,15 @@ import python
/** Whether `mox` or `.StubOutWithMock()` is used in thin module `m`. */
predicate useOfMoxInModule(Module m) {
exists(ModuleObject mox | mox.getName() = "mox" or mox.getName() = "mox3.mox" |
exists(ControlFlowNode use |
use.refersTo(mox) and
use.getScope().getEnclosingModule() = m
)
)
or
exists(Call call |
call.getFunc().(Attribute).getName() = "StubOutWithMock" and
call.getEnclosingModule() = m
exists(ModuleObject mox | mox.getName() = "mox" or mox.getName() = "mox3.mox" |
exists(ControlFlowNode use |
use.refersTo(mox) and
use.getScope().getEnclosingModule() = m
)
)
or
exists(Call call |
call.getFunc().(Attribute).getName() = "StubOutWithMock" and
call.getEnclosingModule() = m
)
}