Java: update model exclusions logic to cope with new automodel test location

Stephan Brandauer · Stephan Brandauer · commit 480e3bf506f1 · 2023-08-18T10:28:51.000+02:00
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll b/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll
@@ -27,7 +27,7 @@ class TestLibrary extends RefType {
 /** Holds if the given file is a test file. */
 private predicate isInTestFile(File file) {
   file.getAbsolutePath().matches(["%/test/%", "%/guava-tests/%", "%/guava-testlib/%"]) and
-  not file.getAbsolutePath().matches("%/ql/test/%") // allows our test cases to work
+  not file.getAbsolutePath().matches(["%/ql/test/%", "%/ql/automodel/test/%"]) // allows our test cases to work
 }
 
 /** Holds if the given compilation unit's package is a JDK internal. */

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class TestLibrary extends RefType {`
`27`	`27`	`/** Holds if the given file is a test file. */`
`28`	`28`	`private predicate isInTestFile(File file) {`
`29`	`29`	`file.getAbsolutePath().matches(["%/test/%", "%/guava-tests/%", "%/guava-testlib/%"]) and`
`30`		`- not file.getAbsolutePath().matches("%/ql/test/%") // allows our test cases to work`
	`30`	`+ not file.getAbsolutePath().matches(["%/ql/test/%", "%/ql/automodel/test/%"]) // allows our test cases to work`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/** Holds if the given compilation unit's package is a JDK internal. */`