From b9b15af308e50bd48c841e46727e50df68aaddeb Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Mon, 15 Jun 2026 14:51:52 +0200
Subject: [PATCH] Java: Use fixture for filtering diagnostics

---
 java/ql/integration-tests/java/buildless-erroneous/test.py      | 2 +-
 java/ql/integration-tests/java/buildless-gradle-boms/test.py    | 2 +-
 .../integration-tests/java/buildless-gradle-classifiers/test.py | 2 +-
 java/ql/integration-tests/java/buildless-gradle-timeout/test.py | 2 +-
 java/ql/integration-tests/java/buildless-gradle/test.py         | 2 +-
 .../java/buildless-inherit-trust-store/test.py                  | 2 +-
 .../java/buildless-maven-executable-war/test.py                 | 2 +-
 .../java/buildless-maven-existing-settings-xml/test.py          | 2 +-
 java/ql/integration-tests/java/buildless-maven-mirrorof/test.py | 2 +-
 .../integration-tests/java/buildless-maven-multimodule/test.py  | 2 +-
 java/ql/integration-tests/java/buildless-maven-timeout/test.py  | 2 +-
 java/ql/integration-tests/java/buildless-maven/test.py          | 2 +-
 java/ql/integration-tests/java/buildless-proxy-gradle/test.py   | 2 +-
 java/ql/integration-tests/java/buildless-proxy-maven/test.py    | 2 +-
 .../integration-tests/java/buildless-sibling-projects/test.py   | 2 +-
 java/ql/integration-tests/java/buildless/test.py                | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/java/ql/integration-tests/java/buildless-erroneous/test.py b/java/ql/integration-tests/java/buildless-erroneous/test.py
index 834b1132cf1..aa78b3574f9 100644
--- a/java/ql/integration-tests/java/buildless-erroneous/test.py
+++ b/java/ql/integration-tests/java/buildless-erroneous/test.py
@@ -1,2 +1,2 @@
-def test(codeql, java):
+def test(codeql, java, check_diagnostics_java):
     codeql.database.create(_env={"CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true"})
diff --git a/java/ql/integration-tests/java/buildless-gradle-boms/test.py b/java/ql/integration-tests/java/buildless-gradle-boms/test.py
index bea3e5f552c..9611010179d 100644
--- a/java/ql/integration-tests/java/buildless-gradle-boms/test.py
+++ b/java/ql/integration-tests/java/buildless-gradle-boms/test.py
@@ -1,4 +1,4 @@
-def test(codeql, java, gradle_8_3):
+def test(codeql, java, gradle_8_3, check_diagnostics_java):
     codeql.database.create(
         _env={
             "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true",
diff --git a/java/ql/integration-tests/java/buildless-gradle-classifiers/test.py b/java/ql/integration-tests/java/buildless-gradle-classifiers/test.py
index bea3e5f552c..9611010179d 100644
--- a/java/ql/integration-tests/java/buildless-gradle-classifiers/test.py
+++ b/java/ql/integration-tests/java/buildless-gradle-classifiers/test.py
@@ -1,4 +1,4 @@
-def test(codeql, java, gradle_8_3):
+def test(codeql, java, gradle_8_3, check_diagnostics_java):
     codeql.database.create(
         _env={
             "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true",
diff --git a/java/ql/integration-tests/java/buildless-gradle-timeout/test.py b/java/ql/integration-tests/java/buildless-gradle-timeout/test.py
index b0e307f15bb..8fcd60479d5 100644
--- a/java/ql/integration-tests/java/buildless-gradle-timeout/test.py
+++ b/java/ql/integration-tests/java/buildless-gradle-timeout/test.py
@@ -1,4 +1,4 @@
-def test(codeql, java):
+def test(codeql, java, check_diagnostics_java):
     # gradlew has been rigged to stall for a long time by trying to fetch from a black-hole IP.
     # We should find the timeout logic fires and buildless aborts the Gradle run quickly.
     codeql.database.create(
diff --git a/java/ql/integration-tests/java/buildless-gradle/test.py b/java/ql/integration-tests/java/buildless-gradle/test.py
index bea3e5f552c..9611010179d 100644
--- a/java/ql/integration-tests/java/buildless-gradle/test.py
+++ b/java/ql/integration-tests/java/buildless-gradle/test.py
@@ -1,4 +1,4 @@
-def test(codeql, java, gradle_8_3):
+def test(codeql, java, gradle_8_3, check_diagnostics_java):
     codeql.database.create(
         _env={
             "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true",
diff --git a/java/ql/integration-tests/java/buildless-inherit-trust-store/test.py b/java/ql/integration-tests/java/buildless-inherit-trust-store/test.py
index 93a527620e1..06855e43ba2 100644
--- a/java/ql/integration-tests/java/buildless-inherit-trust-store/test.py
+++ b/java/ql/integration-tests/java/buildless-inherit-trust-store/test.py
@@ -3,7 +3,7 @@ import os
 import runs_on
 
 
-def test(codeql, java, cwd):
+def test(codeql, java, cwd, check_diagnostics_java):
     # This serves the "repo" directory on https://locahost:4443
     command = ["python3", "../server.py"]
     if runs_on.github_actions and runs_on.posix:
diff --git a/java/ql/integration-tests/java/buildless-maven-executable-war/test.py b/java/ql/integration-tests/java/buildless-maven-executable-war/test.py
index a92ac46584c..2a839a0c294 100644
--- a/java/ql/integration-tests/java/buildless-maven-executable-war/test.py
+++ b/java/ql/integration-tests/java/buildless-maven-executable-war/test.py
@@ -1,4 +1,4 @@
-def test(codeql, java):
+def test(codeql, java, check_diagnostics_java):
     codeql.database.create(
         _env={
             "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true",
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/test.py b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/test.py
index fc10b066d0b..811ef3bb926 100644
--- a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/test.py
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/test.py
@@ -1,7 +1,7 @@
 import os
 import os.path
 
-def test(codeql, java):
+def test(codeql, java, check_diagnostics_java):
     codeql.database.create(build_mode = "none",
         _env={
             "_JAVA_OPTIONS": "-Duser.home=" + os.path.join(os.getcwd(), "home-dir-with-maven-settings")
diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/test.py b/java/ql/integration-tests/java/buildless-maven-mirrorof/test.py
index 9cae7b67553..c24417c1440 100644
--- a/java/ql/integration-tests/java/buildless-maven-mirrorof/test.py
+++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/test.py
@@ -1,7 +1,7 @@
 import os
 import os.path
 
-def test(codeql, java):
+def test(codeql, java, check_diagnostics_java):
     codeql.database.create(build_mode = "none",
         _env={
             "_JAVA_OPTIONS": "-Duser.home=" + os.path.join(os.getcwd(), "empty-home"),
diff --git a/java/ql/integration-tests/java/buildless-maven-multimodule/test.py b/java/ql/integration-tests/java/buildless-maven-multimodule/test.py
index a92ac46584c..2a839a0c294 100644
--- a/java/ql/integration-tests/java/buildless-maven-multimodule/test.py
+++ b/java/ql/integration-tests/java/buildless-maven-multimodule/test.py
@@ -1,4 +1,4 @@
-def test(codeql, java):
+def test(codeql, java, check_diagnostics_java):
     codeql.database.create(
         _env={
             "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true",
diff --git a/java/ql/integration-tests/java/buildless-maven-timeout/test.py b/java/ql/integration-tests/java/buildless-maven-timeout/test.py
index 2c70d7dd91a..7bf7e25357f 100644
--- a/java/ql/integration-tests/java/buildless-maven-timeout/test.py
+++ b/java/ql/integration-tests/java/buildless-maven-timeout/test.py
@@ -1,4 +1,4 @@
-def test(codeql, java):
+def test(codeql, java, check_diagnostics_java):
     # mvnw has been rigged to stall for a long time by trying to fetch from a black-hole IP. We should find the timeout logic fires and buildless aborts the Maven run quickly.
     codeql.database.create(
         build_mode="none",
diff --git a/java/ql/integration-tests/java/buildless-maven/test.py b/java/ql/integration-tests/java/buildless-maven/test.py
index 958eddca2c7..2e49378d982 100644
--- a/java/ql/integration-tests/java/buildless-maven/test.py
+++ b/java/ql/integration-tests/java/buildless-maven/test.py
@@ -1,7 +1,7 @@
 import os
 import os.path
 
-def test(codeql, java):
+def test(codeql, java, check_diagnostics_java):
     codeql.database.create(build_mode = "none",
         _env={
             "_JAVA_OPTIONS": "-Duser.home=" + os.path.join(os.getcwd(), "empty-home")
diff --git a/java/ql/integration-tests/java/buildless-proxy-gradle/test.py b/java/ql/integration-tests/java/buildless-proxy-gradle/test.py
index 970c78f97ab..251efbede22 100644
--- a/java/ql/integration-tests/java/buildless-proxy-gradle/test.py
+++ b/java/ql/integration-tests/java/buildless-proxy-gradle/test.py
@@ -1,4 +1,4 @@
-def test(codeql, java, codeql_mitm_proxy, gradle_8_3):
+def test(codeql, java, codeql_mitm_proxy, gradle_8_3, check_diagnostics_java):
     codeql.database.create(
         _env={
             "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true",
diff --git a/java/ql/integration-tests/java/buildless-proxy-maven/test.py b/java/ql/integration-tests/java/buildless-proxy-maven/test.py
index c8919d321fa..879a1b3a80a 100644
--- a/java/ql/integration-tests/java/buildless-proxy-maven/test.py
+++ b/java/ql/integration-tests/java/buildless-proxy-maven/test.py
@@ -1,4 +1,4 @@
-def test(codeql, java, codeql_mitm_proxy):
+def test(codeql, java, codeql_mitm_proxy, check_diagnostics_java):
     codeql.database.create(
         _env={
             "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true",
diff --git a/java/ql/integration-tests/java/buildless-sibling-projects/test.py b/java/ql/integration-tests/java/buildless-sibling-projects/test.py
index 1b7cae27c64..65ae24ed441 100644
--- a/java/ql/integration-tests/java/buildless-sibling-projects/test.py
+++ b/java/ql/integration-tests/java/buildless-sibling-projects/test.py
@@ -1,4 +1,4 @@
-def test(codeql, use_java_11, java, actions_toolchains_file):
+def test(codeql, use_java_11, java, actions_toolchains_file, check_diagnostics_java):
     # The version of gradle used doesn't work on java 17
     codeql.database.create(
         _env={
diff --git a/java/ql/integration-tests/java/buildless/test.py b/java/ql/integration-tests/java/buildless/test.py
index 834b1132cf1..aa78b3574f9 100644
--- a/java/ql/integration-tests/java/buildless/test.py
+++ b/java/ql/integration-tests/java/buildless/test.py
@@ -1,2 +1,2 @@
-def test(codeql, java):
+def test(codeql, java, check_diagnostics_java):
     codeql.database.create(_env={"CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true"})