C#: Base tests on stubs, move extractor options to options file and updated expected test output.

michaelnebel · michaelnebel · commit 577bbd531d0a · 2023-06-13T10:17:42.000+02:00
diff --git a/csharp/ql/test/experimental/CWE-918/RequestForgery.cs b/csharp/ql/test/experimental/CWE-918/RequestForgery.cs
@@ -1,5 +1,3 @@
-// semmle-extractor-options: ${testdir}/../../resources/stubs/System.Web.cs /r:System.Threading.Tasks.dll /r:System.Collections.Specialized.dll /r:System.Runtime.dll /r:System.Private.Uri.dll
-
 using System;
 using System.Threading.Tasks;
 using System.Web.Mvc;
diff --git a/csharp/ql/test/experimental/CWE-918/RequestForgery.expected b/csharp/ql/test/experimental/CWE-918/RequestForgery.expected
@@ -1,8 +1,8 @@
 edges
-| RequestForgery.cs:14:52:14:54 | url : String | RequestForgery.cs:16:66:16:68 | access to parameter url |
+| RequestForgery.cs:12:52:12:54 | url : String | RequestForgery.cs:14:66:14:68 | access to parameter url |
 nodes
-| RequestForgery.cs:14:52:14:54 | url : String | semmle.label | url : String |
-| RequestForgery.cs:16:66:16:68 | access to parameter url | semmle.label | access to parameter url |
+| RequestForgery.cs:12:52:12:54 | url : String | semmle.label | url : String |
+| RequestForgery.cs:14:66:14:68 | access to parameter url | semmle.label | access to parameter url |
 subpaths
 #select
-| RequestForgery.cs:16:66:16:68 | access to parameter url | RequestForgery.cs:14:52:14:54 | url : String | RequestForgery.cs:16:66:16:68 | access to parameter url | The URL of this request depends on a $@. | RequestForgery.cs:14:52:14:54 | url | user-provided value |
+| RequestForgery.cs:14:66:14:68 | access to parameter url | RequestForgery.cs:12:52:12:54 | url : String | RequestForgery.cs:14:66:14:68 | access to parameter url | The URL of this request depends on a $@. | RequestForgery.cs:12:52:12:54 | url | user-provided value |
diff --git a/csharp/ql/test/experimental/CWE-918/options b/csharp/ql/test/experimental/CWE-918/options
@@ -1 +1,3 @@
-semmle-extractor-options: /r:System.Net.Http.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
+semmle-extractor-options: ${testdir}/../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-327/InsecureSQLConnection/options b/csharp/ql/test/query-tests/Security Features/CWE-327/InsecureSQLConnection/options
@@ -1 +1,2 @@
-semmle-extractor-options: /r:System.Data.Common.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../resources/stubs/System.Data.SqlClient/4.8.3/System.Data.SqlClient.csproj
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-327/InsecureSQLConnection/stubs.cs b/csharp/ql/test/query-tests/Security Features/CWE-327/InsecureSQLConnection/stubs.cs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// semmle-extractor-options: ${testdir}/../../resources/stubs/System.Web.cs /r:System.Threading.Tasks.dll /r:System.Collections.Specialized.dll /r:System.Runtime.dll /r:System.Private.Uri.dll`
`2`		`-`
`3`	`1`	`using System;`
`4`	`2`	`using System.Threading.Tasks;`
`5`	`3`	`using System.Web.Mvc;`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-semmle-extractor-options: /r:System.Data.Common.dll`
	`1`	`+semmle-extractor-options: /nostdlib /noconfig`
	`2`	`+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../resources/stubs/System.Data.SqlClient/4.8.3/System.Data.SqlClient.csproj`