Change isInTestFile to ignore %/test/%

egregius313 · egregius313 · commit 83d5cde01da5 · 2023-04-18T10:27:20.000-04:00
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll b/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll
@@ -27,8 +27,7 @@ private J::Method superImpl(J::Method m) {
 }
 
 private predicate isInTestFile(J::File file) {
-  file.getAbsolutePath()
-      .matches(["%src/test/%", "%/guava-tests/%", "%/guava-testlib/%", "%/groovy-stubs/test/%"])
+  file.getAbsolutePath().matches(["%/test/%", "%/guava-tests/%", "%/guava-testlib/%"])
 }
 
 private predicate isJdkInternal(J::CompilationUnit cu) {

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ private J::Method superImpl(J::Method m) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`private predicate isInTestFile(J::File file) {`
`30`		`- file.getAbsolutePath()`
`31`		`- .matches(["%src/test/%", "%/guava-tests/%", "%/guava-testlib/%", "%/groovy-stubs/test/%"])`
	`30`	`+ file.getAbsolutePath().matches(["%/test/%", "%/guava-tests/%", "%/guava-testlib/%"])`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`private predicate isJdkInternal(J::CompilationUnit cu) {`