Java: Move more tests to use the try_use_java11() helper.

This is in preparation of executing these tests on GH-hosted M1 runners,
where we need to have architecture-specific path handling.
It's nicer to fix all of this in one place (the helper), than to run around
fixing individual tests.

Author: criemen

java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script-no-wrapper/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample-no-wrapper/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py

@@ -1,10 +1,6 @@
 import sys
-
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample-old-style-no-wrapper/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample-old-style/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")

java/ql/integration-tests/all-platforms/java/android-sample/test.py

@@ -2,9 +2,6 @@
 
 from create_database_utils import *
 
-if "JAVA_HOME_11_X64" in os.environ:
-  os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
-  sep = ";" if platform.system() == "Windows" else ":"
-  os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
+try_use_java11()
 
 run_codeql_database_create([], lang="java")