Diagnostics tests: don't create own diagnostics directory

The CLI does this now. Also omit default arguments to the integration test script.

Author: smowton

java/ql/integration-tests/all-platforms/java/diagnostics/android-gradle-incompatibility/test.py

@@ -2,7 +2,6 @@
 from create_database_utils import *
 from diagnostics_test_utils import *
 
-os.mkdir("diagnostics")
-run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None, extra_env = {"CODEQL_EXTRACTOR_JAVA_DIAGNOSTIC_DIR": "diagnostics"})
+run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None)
 
-check_diagnostics(test_dir = ".", diagnostics_dir = "diagnostics")
+check_diagnostics()

java/ql/integration-tests/all-platforms/java/diagnostics/compilation-error/test.py

@@ -2,7 +2,6 @@
 from create_database_utils import *
 from diagnostics_test_utils import *
 
-os.mkdir("diagnostics")
-run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None, extra_env = {"CODEQL_EXTRACTOR_JAVA_DIAGNOSTIC_DIR": "diagnostics"})
+run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None)
 
-check_diagnostics(test_dir = ".", diagnostics_dir = "diagnostics")
+check_diagnostics()

java/ql/integration-tests/all-platforms/java/diagnostics/dependency-error/test.py

@@ -11,7 +11,6 @@
 except FileNotFoundError:
   pass
 
-os.mkdir("diagnostics")
-run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None, extra_env = {"CODEQL_EXTRACTOR_JAVA_DIAGNOSTIC_DIR": "diagnostics"})
+run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None)
 
-check_diagnostics(test_dir = ".", diagnostics_dir = "diagnostics")
+check_diagnostics()

java/ql/integration-tests/all-platforms/java/diagnostics/java-version-too-old/test.py

@@ -8,7 +8,6 @@
   sep = ";" if platform.system() == "Windows" else ":"
   os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
 
-os.mkdir("diagnostics")
-run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None, extra_env = {"CODEQL_EXTRACTOR_JAVA_DIAGNOSTIC_DIR": "diagnostics"})
+run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None)
 
-check_diagnostics(test_dir = ".", diagnostics_dir = "diagnostics")
+check_diagnostics()

java/ql/integration-tests/all-platforms/java/diagnostics/maven-http-repository/test.py

@@ -2,7 +2,6 @@
 from create_database_utils import *
 from diagnostics_test_utils import *
 
-os.mkdir("diagnostics")
-run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None, extra_env = {"CODEQL_EXTRACTOR_JAVA_DIAGNOSTIC_DIR": "diagnostics"})
+run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None)
 
-check_diagnostics(test_dir = ".", diagnostics_dir = "diagnostics")
+check_diagnostics()

java/ql/integration-tests/all-platforms/java/diagnostics/multiple-candidate-builds/test.py

@@ -2,7 +2,6 @@
 from create_database_utils import *
 from diagnostics_test_utils import *
 
-os.mkdir("diagnostics")
-run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None, extra_env = {"CODEQL_EXTRACTOR_JAVA_DIAGNOSTIC_DIR": "diagnostics"})
+run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None)
 
-check_diagnostics(test_dir = ".", diagnostics_dir = "diagnostics")
+check_diagnostics()

java/ql/integration-tests/all-platforms/java/diagnostics/no-build-system/test.py

@@ -2,7 +2,6 @@
 from create_database_utils import *
 from diagnostics_test_utils import *
 
-os.mkdir("diagnostics")
-run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None, extra_env = {"CODEQL_EXTRACTOR_JAVA_DIAGNOSTIC_DIR": "diagnostics"})
+run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None)
 
-check_diagnostics(test_dir = ".", diagnostics_dir = "diagnostics")
+check_diagnostics()

java/ql/integration-tests/all-platforms/java/diagnostics/no-gradle-test-classes/test.py

@@ -2,7 +2,6 @@
 from create_database_utils import *
 from diagnostics_test_utils import *
 
-os.mkdir("diagnostics")
-run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None, extra_env = {"CODEQL_EXTRACTOR_JAVA_DIAGNOSTIC_DIR": "diagnostics"})
+run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None)
 
-check_diagnostics(test_dir = ".", diagnostics_dir = "diagnostics")
+check_diagnostics()

java/ql/integration-tests/all-platforms/java/diagnostics/no-gradle-wrapper/test.py

@@ -2,7 +2,6 @@
 from create_database_utils import *
 from diagnostics_test_utils import *
 
-os.mkdir("diagnostics")
-run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None, extra_env = {"CODEQL_EXTRACTOR_JAVA_DIAGNOSTIC_DIR": "diagnostics"})
+run_codeql_database_create([], lang="java", runFunction = runUnsuccessfully, db = None)
 
-check_diagnostics(test_dir = ".", diagnostics_dir = "diagnostics")
+check_diagnostics()