Merge pull request github#12851 from egregius313/egregius313/mad/add-groovy-stubs-to-isInTestFile

egregius313 · web-flow · commit 76f8d460e7a7 · 2023-04-20T11:06:38.000-04:00
Java: Add `*/test/*` to model generator's list of ignored paths
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll b/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll
@@ -27,9 +27,8 @@ private J::Method superImpl(J::Method m) {
 }
 
 private predicate isInTestFile(J::File file) {
-  file.getAbsolutePath().matches("%src/test/%") or
-  file.getAbsolutePath().matches("%/guava-tests/%") or
-  file.getAbsolutePath().matches("%/guava-testlib/%")
+  file.getAbsolutePath().matches(["%/test/%", "%/guava-tests/%", "%/guava-testlib/%"]) and
+  not file.getAbsolutePath().matches("%/ql/test/%") // allows our test cases to work
 }
 
 private predicate isJdkInternal(J::CompilationUnit cu) {

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,8 @@ private J::Method superImpl(J::Method m) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`private predicate isInTestFile(J::File file) {`
`30`		`- file.getAbsolutePath().matches("%src/test/%") or`
`31`		`- file.getAbsolutePath().matches("%/guava-tests/%") or`
`32`		`- file.getAbsolutePath().matches("%/guava-testlib/%")`
	`30`	`+ file.getAbsolutePath().matches(["%/test/%", "%/guava-tests/%", "%/guava-testlib/%"]) and`
	`31`	`+ not file.getAbsolutePath().matches("%/ql/test/%") // allows our test cases to work`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`private predicate isJdkInternal(J::CompilationUnit cu) {`