Merge pull request #6366 from smowton/smowton/fiix/junit-nested-classes

aschackmull · web-flow · commit 6c666b49f56f · 2021-07-26T12:45:23.000+02:00
Prevent class-could-be-static alerts regarding JUnit Nested tests
diff --git a/java/ql/src/Performance/InnerClassCouldBeStatic.ql b/java/ql/src/Performance/InnerClassCouldBeStatic.ql
@@ -127,7 +127,9 @@ predicate potentiallyStatic(InnerClass c) {
     forall(InnerClass superOfNested | superOfNested = nested.getASourceSupertype+() |
       potentiallyStatic(superOfNested)
     )
-  )
+  ) and
+  // JUnit Nested test classes are required to be non-static.
+  not c.hasAnnotation("org.junit.jupiter.api", "Nested")
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,9 @@ predicate potentiallyStatic(InnerClass c) {`
`127`	`127`	`forall(InnerClass superOfNested \| superOfNested = nested.getASourceSupertype+() \|`
`128`	`128`	`potentiallyStatic(superOfNested)`
`129`	`129`	`)`
`130`		`- )`
	`130`	`+ ) and`
	`131`	`+ // JUnit Nested test classes are required to be non-static.`
	`132`	`+ not c.hasAnnotation("org.junit.jupiter.api", "Nested")`
`131`	`133`	`}`
`132`	`134`
`133`	`135`	`/**`