From 70f2958eb79f7a81b6025034e80fa10d7707c5ff Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Fri, 3 Jan 2025 14:53:28 +0100 Subject: [PATCH] C#: Update expected test output. --- csharp/ql/test/library-tests/dispatch/CallContext.expected | 1 - csharp/ql/test/library-tests/dispatch/CallGraph.expected | 1 - .../test/library-tests/dispatch/GetADynamicTarget.expected | 1 - csharp/ql/test/library-tests/dispatch/ViableCallable.cs | 2 +- csharp/ql/test/library-tests/unification/Unification.cs | 2 +- .../ql/test/library-tests/unification/Unification.expected | 6 ------ 6 files changed, 2 insertions(+), 11 deletions(-) diff --git a/csharp/ql/test/library-tests/dispatch/CallContext.expected b/csharp/ql/test/library-tests/dispatch/CallContext.expected index 2dd23fbced1b..f1b9602f0010 100644 --- a/csharp/ql/test/library-tests/dispatch/CallContext.expected +++ b/csharp/ql/test/library-tests/dispatch/CallContext.expected @@ -26,5 +26,4 @@ mayBenefitFromCallContext | ViableCallable.cs:563:18:563:22 | call to operator / | | ViableCallable.cs:566:26:566:30 | call to operator checked / | | ViableCallable.cs:572:9:572:15 | call to method M12 | -| ViableCallable.cs:599:9:599:13 | call to method M | | ViableCallable.cs:605:9:605:13 | call to method M | diff --git a/csharp/ql/test/library-tests/dispatch/CallGraph.expected b/csharp/ql/test/library-tests/dispatch/CallGraph.expected index 9c3262e4a1d3..cba0919fed43 100644 --- a/csharp/ql/test/library-tests/dispatch/CallGraph.expected +++ b/csharp/ql/test/library-tests/dispatch/CallGraph.expected @@ -257,6 +257,5 @@ | ViableCallable.cs:542:10:542:15 | Run`1 | ViableCallable.cs:539:17:539:19 | M11 | | ViableCallable.cs:542:10:542:15 | Run`1 | ViableCallable.cs:540:17:540:19 | M12 | | ViableCallable.cs:596:17:596:23 | Run1`1 | ViableCallable.cs:588:21:588:21 | M | -| ViableCallable.cs:596:17:596:23 | Run1`1 | ViableCallable.cs:593:21:593:21 | M | | ViableCallable.cs:602:17:602:23 | Run2`1 | ViableCallable.cs:588:21:588:21 | M | | ViableCallable.cs:602:17:602:23 | Run2`1 | ViableCallable.cs:593:21:593:21 | M | diff --git a/csharp/ql/test/library-tests/dispatch/GetADynamicTarget.expected b/csharp/ql/test/library-tests/dispatch/GetADynamicTarget.expected index 7f483b7164f1..13a4ae09bafb 100644 --- a/csharp/ql/test/library-tests/dispatch/GetADynamicTarget.expected +++ b/csharp/ql/test/library-tests/dispatch/GetADynamicTarget.expected @@ -490,6 +490,5 @@ | ViableCallable.cs:572:9:572:15 | call to method M12 | I3.M12() | | ViableCallable.cs:575:9:575:15 | call to method M13 | I3.M13() | | ViableCallable.cs:599:9:599:13 | call to method M | C21+A1.M() | -| ViableCallable.cs:599:9:599:13 | call to method M | C21+A2.M() | | ViableCallable.cs:605:9:605:13 | call to method M | C21+A1.M() | | ViableCallable.cs:605:9:605:13 | call to method M | C21+A2.M() | diff --git a/csharp/ql/test/library-tests/dispatch/ViableCallable.cs b/csharp/ql/test/library-tests/dispatch/ViableCallable.cs index 93076bd58e0d..ac2ac72c2a2d 100644 --- a/csharp/ql/test/library-tests/dispatch/ViableCallable.cs +++ b/csharp/ql/test/library-tests/dispatch/ViableCallable.cs @@ -595,7 +595,7 @@ public void M() { } public void Run1(T t) where T : I { - // Viable callable: A1.M() [also reports A2.M(); false positive] + // Viable callable: A1.M() t.M(); } diff --git a/csharp/ql/test/library-tests/unification/Unification.cs b/csharp/ql/test/library-tests/unification/Unification.cs index 50aab4943569..65d06e9c1397 100644 --- a/csharp/ql/test/library-tests/unification/Unification.cs +++ b/csharp/ql/test/library-tests/unification/Unification.cs @@ -54,5 +54,5 @@ struct S3 : I2 { } ref struct RS : I2 { } class C7 : I2 { } -class NormalConstraint where T : I2 { } // False positive: Allows T to be `RS`. +class NormalConstraint where T : I2 { } class NegativeConstraint where T : I2, allows ref struct { } diff --git a/csharp/ql/test/library-tests/unification/Unification.expected b/csharp/ql/test/library-tests/unification/Unification.expected index fac47754e195..9849938a4a68 100644 --- a/csharp/ql/test/library-tests/unification/Unification.expected +++ b/csharp/ql/test/library-tests/unification/Unification.expected @@ -8,7 +8,6 @@ constrainedTypeParameterSubsumes | Unification.cs:8:10:8:11 | T2 | Unification.cs:31:12:31:23 | (string, T9) | | Unification.cs:8:10:8:11 | T2 | Unification.cs:32:12:32:19 | (T8, T9) | | Unification.cs:8:10:8:11 | T2 | Unification.cs:53:8:53:9 | S3 | -| Unification.cs:8:10:8:11 | T2 | Unification.cs:54:12:54:13 | RS | | Unification.cs:9:10:9:11 | T3 | Unification.cs:1:11:1:12 | I1 | | Unification.cs:9:10:9:11 | T3 | Unification.cs:6:7:6:8 | C0 | | Unification.cs:9:10:9:11 | T3 | Unification.cs:7:7:7:12 | C1 | @@ -103,12 +102,10 @@ constrainedTypeParameterSubsumes | Unification.cs:12:25:12:27 | T6d | Unification.cs:31:12:31:23 | (string, T9) | | Unification.cs:12:25:12:27 | T6d | Unification.cs:32:12:32:19 | (T8, T9) | | Unification.cs:12:25:12:27 | T6d | Unification.cs:53:8:53:9 | S3 | -| Unification.cs:12:25:12:27 | T6d | Unification.cs:54:12:54:13 | RS | | Unification.cs:24:12:24:13 | Tm | Unification.cs:8:7:8:12 | C2 | | Unification.cs:24:12:24:13 | Tm | Unification.cs:24:12:24:13 | Tm | | Unification.cs:57:24:57:24 | T | Unification.cs:52:11:52:12 | I2 | | Unification.cs:57:24:57:24 | T | Unification.cs:53:8:53:9 | S3 | -| Unification.cs:57:24:57:24 | T | Unification.cs:54:12:54:13 | RS | | Unification.cs:57:24:57:24 | T | Unification.cs:55:7:55:8 | C7 | | Unification.cs:57:24:57:24 | T | Unification.cs:57:24:57:24 | T | | Unification.cs:57:24:57:24 | T | Unification.cs:58:26:58:26 | T | @@ -129,7 +126,6 @@ constrainedTypeParameterUnifiable | Unification.cs:8:10:8:11 | T2 | Unification.cs:31:12:31:23 | (string, T9) | | Unification.cs:8:10:8:11 | T2 | Unification.cs:32:12:32:19 | (T8, T9) | | Unification.cs:8:10:8:11 | T2 | Unification.cs:53:8:53:9 | S3 | -| Unification.cs:8:10:8:11 | T2 | Unification.cs:54:12:54:13 | RS | | Unification.cs:9:10:9:11 | T3 | Unification.cs:1:11:1:12 | I1 | | Unification.cs:9:10:9:11 | T3 | Unification.cs:6:7:6:8 | C0 | | Unification.cs:9:10:9:11 | T3 | Unification.cs:7:7:7:12 | C1 | @@ -232,13 +228,11 @@ constrainedTypeParameterUnifiable | Unification.cs:12:25:12:27 | T6d | Unification.cs:31:12:31:23 | (string, T9) | | Unification.cs:12:25:12:27 | T6d | Unification.cs:32:12:32:19 | (T8, T9) | | Unification.cs:12:25:12:27 | T6d | Unification.cs:53:8:53:9 | S3 | -| Unification.cs:12:25:12:27 | T6d | Unification.cs:54:12:54:13 | RS | | Unification.cs:24:12:24:13 | Tm | Unification.cs:8:7:8:12 | C2 | | Unification.cs:24:12:24:13 | Tm | Unification.cs:8:7:8:12 | C2 | | Unification.cs:24:12:24:13 | Tm | Unification.cs:24:12:24:13 | Tm | | Unification.cs:57:24:57:24 | T | Unification.cs:52:11:52:12 | I2 | | Unification.cs:57:24:57:24 | T | Unification.cs:53:8:53:9 | S3 | -| Unification.cs:57:24:57:24 | T | Unification.cs:54:12:54:13 | RS | | Unification.cs:57:24:57:24 | T | Unification.cs:55:7:55:8 | C7 | | Unification.cs:57:24:57:24 | T | Unification.cs:57:24:57:24 | T | | Unification.cs:57:24:57:24 | T | Unification.cs:58:26:58:26 | T |