Merge remote-tracking branch 'origin/main' into criemen/pytest-swift

Author: criemen

csharp/ql/integration-tests/all-platforms/autobuild/test.py

@@ -1,3 +1,2 @@
-from create_database_utils import *
-
-run_codeql_database_create([], lang="csharp")
+def test(codeql, csharp):
+    codeql.database.create()

csharp/ql/integration-tests/all-platforms/binlog/test.py

@@ -1,7 +1,6 @@
-import subprocess
-from create_database_utils import *
-from diagnostics_test_utils import *
+import commands
 
-subprocess.check_call(["dotnet", "build", "test.sln", "/bl:test.binlog"])
-run_codeql_database_create([], lang="csharp", extra_args=["--build-mode=none", "-Obinlog=test.binlog"])
-check_diagnostics()
+
+def test(codeql, csharp):
+    commands.run(["dotnet", "build", "test.sln", "/bl:test.binlog"])
+    codeql.database.create(build_mode="none", extractor_option="binlog=test.binlog")

csharp/ql/integration-tests/all-platforms/conditional_compilation/test.py

@@ -1,6 +1,8 @@
-from create_database_utils import *
 import os
 
-os.environ["CODEQL_EXTRACTOR_CSHARP_OPTION_TRAP_COMPRESSION"] = "none"
 
-run_codeql_database_create(['dotnet build /p:DefineConstants=A', 'dotnet build /p:DefineConstants=B'], lang="csharp")
+def test(codeql, csharp):
+    os.environ["CODEQL_EXTRACTOR_CSHARP_OPTION_TRAP_COMPRESSION"] = "none"
+    codeql.database.create(
+        command=["dotnet build /p:DefineConstants=A", "dotnet build /p:DefineConstants=B"]
+    )

csharp/ql/integration-tests/all-platforms/cshtml/test.py

@@ -1,3 +1,2 @@
-from create_database_utils import *
-
-run_codeql_database_create(['dotnet build'], lang="csharp")
+def test(codeql, csharp):
+    codeql.database.create(command="dotnet build")

csharp/ql/integration-tests/all-platforms/cshtml_standalone/Files.expected

@@ -1,4 +1,4 @@
 | Program.cs |
 | Views/Home/Index.cshtml |
-| _semmle_code_target_codeql_csharp_integration_tests_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_Views_Home_Index_cshtml.g.cs |
+| _ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_test_test_Views_Home_Index_cshtml.g.cs |
 | test-db/working/implicitUsings/GlobalUsings.g.cs |

csharp/ql/integration-tests/all-platforms/cshtml_standalone/Files.ql

@@ -2,15 +2,12 @@ import csharp
 
 private string getPath(File f) {
   result = f.getRelativePath() and
-  not exists(
-    result
-        .indexOf("_semmle_code_target_codeql_csharp_integration_tests_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_")
-  )
+  not exists(result.indexOf("_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_"))
   or
   exists(int index |
     index =
       f.getRelativePath()
-          .indexOf("_semmle_code_target_codeql_csharp_integration_tests_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_") and
+          .indexOf("_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_") and
     result = f.getRelativePath().substring(index, f.getRelativePath().length())
   )
 }

csharp/ql/integration-tests/all-platforms/cshtml_standalone/test.py

@@ -1,4 +1,2 @@
-import os
-from create_database_utils import *
-
-run_codeql_database_create(lang="csharp", extra_args=["--build-mode=none"])
+def test(codeql, csharp):
+    codeql.database.create(build_mode="none")

csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/test.py

@@ -1,5 +1,6 @@
 import os
-from create_database_utils import *
 
-os.environ['CODEQL_EXTRACTOR_CSHARP_BUILDLESS_EXTRACT_WEB_VIEWS'] = 'false'
-run_codeql_database_create(lang="csharp", extra_args=["--build-mode=none"])
+
+def test(codeql, csharp):
+    os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_EXTRACT_WEB_VIEWS"] = "false"
+    codeql.database.create(build_mode="none")

csharp/ql/integration-tests/all-platforms/cshtml_standalone_flowsteps/test.py

@@ -1,4 +1,2 @@
-import os
-from create_database_utils import *
-
-run_codeql_database_create(lang="csharp", extra_args=["--build-mode=none"])
+def test(codeql, csharp):
+    codeql.database.create(build_mode="none")

csharp/ql/integration-tests/all-platforms/cshtml_standalone_net6/Files.expected

@@ -1,4 +1,4 @@
 | Program.cs |
 | Views/Home/Index.cshtml |
-| _semmle_code_target_codeql_csharp_integration_tests_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_net6_Views_Home_Index_cshtml.g.cs |
+| _ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_net6_test_test_Views_Home_Index_cshtml.g.cs |
 | test-db/working/implicitUsings/GlobalUsings.g.cs |