Skip to content

Commit aa99869

Browse files
michaelnebelmichaelnebel
committed
C#: Update partial tests and expected output.
1 parent a930cbf commit aa99869

14 files changed

+192
-173
lines changed

‎csharp/ql/test/library-tests/dispatch/CallGraph.expected‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,10 @@
270270
| ViableCallable.cs:679:17:679:20 | Run3 | ViableCallable.cs:637:21:637:21 | M |
271271
| ViableCallable.cs:679:17:679:20 | Run3 | ViableCallable.cs:646:21:646:21 | M |
272272
| ViableCallable.cs:679:17:679:20 | Run3 | ViableCallable.cs:648:21:648:21 | M |
273-
| ViableCallable.cs:709:17:709:20 | Run1 | ViableCallable.cs:703:42:703:44 | get_Property |
274-
| ViableCallable.cs:709:17:709:20 | Run1 | ViableCallable.cs:703:63:703:65 | set_Property |
275-
| ViableCallable.cs:709:17:709:20 | Run1 | ViableCallable.cs:705:49:705:51 | get_Item |
276-
| ViableCallable.cs:709:17:709:20 | Run1 | ViableCallable.cs:705:70:705:72 | set_Item |
277-
| ViableCallable.cs:709:17:709:20 | Run1 | ViableCallable.cs:706:51:706:53 | add_Event |
278-
| ViableCallable.cs:709:17:709:20 | Run1 | ViableCallable.cs:706:59:706:64 | remove_Event |
273+
| ViableCallable.cs:711:17:711:20 | Run1 | ViableCallable.cs:695:24:695:31 | Partial1 |
274+
| ViableCallable.cs:711:17:711:20 | Run1 | ViableCallable.cs:705:42:705:44 | get_Property |
275+
| ViableCallable.cs:711:17:711:20 | Run1 | ViableCallable.cs:705:63:705:65 | set_Property |
276+
| ViableCallable.cs:711:17:711:20 | Run1 | ViableCallable.cs:707:49:707:51 | get_Item |
277+
| ViableCallable.cs:711:17:711:20 | Run1 | ViableCallable.cs:707:70:707:72 | set_Item |
278+
| ViableCallable.cs:711:17:711:20 | Run1 | ViableCallable.cs:708:51:708:53 | add_Event |
279+
| ViableCallable.cs:711:17:711:20 | Run1 | ViableCallable.cs:708:59:708:64 | remove_Event |

‎csharp/ql/test/library-tests/dispatch/GetADynamicTarget.expected‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -518,9 +518,10 @@
518518
| ViableCallable.cs:683:9:683:16 | call to method M | C22+TestOverloadResolution2<System.Int32>.M(Int32[]) |
519519
| ViableCallable.cs:687:9:687:16 | call to method M | C22+TestOverloadResolution1<System.Int32>.M(List<int>) |
520520
| ViableCallable.cs:687:9:687:16 | call to method M | C22+TestOverloadResolution2<System.Int32>.M(List<int>) |
521-
| ViableCallable.cs:714:9:714:18 | access to property Property | C23+Partial1.set_Property(object) |
522-
| ViableCallable.cs:717:13:717:22 | access to property Property | C23+Partial1.get_Property() |
523-
| ViableCallable.cs:720:9:720:12 | access to indexer | C23+Partial1.set_Item(int, object) |
524-
| ViableCallable.cs:723:13:723:16 | access to indexer | C23+Partial1.get_Item(int) |
525-
| ViableCallable.cs:726:9:726:15 | access to event Event | C23+Partial1.add_Event(EventHandler) |
526-
| ViableCallable.cs:729:9:729:15 | access to event Event | C23+Partial1.remove_Event(EventHandler) |
521+
| ViableCallable.cs:716:9:716:18 | access to property Property | C23+Partial1.set_Property(object) |
522+
| ViableCallable.cs:719:13:719:22 | access to property Property | C23+Partial1.get_Property() |
523+
| ViableCallable.cs:722:9:722:12 | access to indexer | C23+Partial1.set_Item(int, object) |
524+
| ViableCallable.cs:725:13:725:16 | access to indexer | C23+Partial1.get_Item(int) |
525+
| ViableCallable.cs:728:9:728:15 | access to event Event | C23+Partial1.add_Event(EventHandler) |
526+
| ViableCallable.cs:731:9:731:15 | access to event Event | C23+Partial1.remove_Event(EventHandler) |
527+
| ViableCallable.cs:734:18:734:43 | object creation of type Partial1 | C23+Partial1.Partial1(object) |

‎csharp/ql/test/library-tests/dispatch/ViableCallable.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,7 @@ public class C23
692692
{
693693
public partial class Partial1
694694
{
695+
public partial Partial1(object obj);
695696
public partial object Property { get; set; }
696697

697698
public partial object this[int index] { get; set; }
@@ -700,6 +701,7 @@ public partial class Partial1
700701

701702
public partial class Partial1
702703
{
704+
public partial Partial1(object obj) { }
703705
public partial object Property { get { return null; } set { } }
704706

705707
public partial object this[int index] { get { return null; } set { } }
@@ -727,5 +729,8 @@ public void Run1(Partial1 p)
727729

728730
// Viable callable: Partial1.remove_Event
729731
p.Event -= (sender, e) => { };
732+
733+
// Viable callable: Partial1.Partial1(object)
734+
var p0 = new Partial1(new object());
730735
}
731736
}

‎csharp/ql/test/library-tests/partial/MethodIsPartial.expected‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
| Partial.cs:7:18:7:42 | PartialMethodWithoutBody1 | true |
2-
| Partial.cs:8:17:8:23 | Method2 | false |
3-
| Partial.cs:19:18:19:39 | PartialMethodWithBody1 | true |
4-
| Partial.cs:20:27:20:48 | PartialMethodWithBody2 | true |
5-
| Partial.cs:24:17:24:23 | Method3 | false |
6-
| Partial.cs:46:18:46:42 | PartialMethodWithoutBody2 | true |
7-
| Partial.cs:47:17:47:23 | Method4 | false |
8-
| Partial.cs:52:17:52:23 | Method5 | false |
1+
| Partial.cs:9:18:9:42 | PartialMethodWithoutBody1 | true |
2+
| Partial.cs:10:17:10:23 | Method2 | false |
3+
| Partial.cs:23:18:23:39 | PartialMethodWithBody1 | true |
4+
| Partial.cs:24:27:24:48 | PartialMethodWithBody2 | true |
5+
| Partial.cs:28:17:28:23 | Method3 | false |
6+
| Partial.cs:50:18:50:42 | PartialMethodWithoutBody2 | true |
7+
| Partial.cs:51:17:51:23 | Method4 | false |
8+
| Partial.cs:57:17:57:23 | Method5 | false |

‎csharp/ql/test/library-tests/partial/Partial.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
partial class TwoPartClass
44
{
5+
// Declaring declaration.
6+
public partial TwoPartClass(object obj);
57
partial void PartialMethodWithBody1();
68
public partial object PartialMethodWithBody2(object obj);
79
partial void PartialMethodWithoutBody1();
@@ -16,6 +18,8 @@ public void Method2() { }
1618

1719
partial class TwoPartClass
1820
{
21+
// Implementation declaration.
22+
public partial TwoPartClass(object obj) { }
1923
partial void PartialMethodWithBody1() { }
2024
public partial object PartialMethodWithBody2(object obj)
2125
{
@@ -49,6 +53,7 @@ public void Method4() { }
4953

5054
class NonPartialClass
5155
{
56+
public NonPartialClass(object obj) { }
5257
public void Method5() { }
5358
public object Property { get; set; }
5459
public object this[int index]

‎csharp/ql/test/library-tests/partial/Partial1.expected‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
| Partial.cs:3:15:3:26 | TwoPartClass |
2-
| Partial.cs:7:18:7:42 | PartialMethodWithoutBody1 |
3-
| Partial.cs:17:15:17:26 | TwoPartClass |
4-
| Partial.cs:19:18:19:39 | PartialMethodWithBody1 |
5-
| Partial.cs:20:27:20:48 | PartialMethodWithBody2 |
6-
| Partial.cs:27:27:27:42 | PartialProperty1 |
7-
| Partial.cs:29:9:29:11 | get_PartialProperty1 |
8-
| Partial.cs:30:9:30:11 | set_PartialProperty1 |
9-
| Partial.cs:34:27:34:30 | Item |
10-
| Partial.cs:36:9:36:11 | get_Item |
11-
| Partial.cs:37:9:37:11 | set_Item |
12-
| Partial.cs:41:39:41:51 | PartialEvent1 |
13-
| Partial.cs:41:55:41:57 | add_PartialEvent1 |
14-
| Partial.cs:41:63:41:68 | remove_PartialEvent1 |
15-
| Partial.cs:44:15:44:33 | OnePartPartialClass |
16-
| Partial.cs:46:18:46:42 | PartialMethodWithoutBody2 |
2+
| Partial.cs:6:20:6:31 | TwoPartClass |
3+
| Partial.cs:9:18:9:42 | PartialMethodWithoutBody1 |
4+
| Partial.cs:19:15:19:26 | TwoPartClass |
5+
| Partial.cs:23:18:23:39 | PartialMethodWithBody1 |
6+
| Partial.cs:24:27:24:48 | PartialMethodWithBody2 |
7+
| Partial.cs:31:27:31:42 | PartialProperty1 |
8+
| Partial.cs:33:9:33:11 | get_PartialProperty1 |
9+
| Partial.cs:34:9:34:11 | set_PartialProperty1 |
10+
| Partial.cs:38:27:38:30 | Item |
11+
| Partial.cs:40:9:40:11 | get_Item |
12+
| Partial.cs:41:9:41:11 | set_Item |
13+
| Partial.cs:45:39:45:51 | PartialEvent1 |
14+
| Partial.cs:45:55:45:57 | add_PartialEvent1 |
15+
| Partial.cs:45:63:45:68 | remove_PartialEvent1 |
16+
| Partial.cs:48:15:48:33 | OnePartPartialClass |
17+
| Partial.cs:50:18:50:42 | PartialMethodWithoutBody2 |
1718
| PartialMultipleFiles1.cs:1:22:1:41 | PartialMultipleFiles |
1819
| PartialMultipleFiles2.cs:1:22:1:41 | PartialMultipleFiles |

‎csharp/ql/test/library-tests/partial/Partial2.expected‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:3:15:3:26 | <object initializer> |
2-
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:7:18:7:42 | PartialMethodWithoutBody1 |
3-
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:8:17:8:23 | Method2 |
4-
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:19:18:19:39 | PartialMethodWithBody1 |
5-
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:20:27:20:48 | PartialMethodWithBody2 |
6-
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:24:17:24:23 | Method3 |
7-
| Partial.cs:17:15:17:26 | TwoPartClass | Partial.cs:3:15:3:26 | <object initializer> |
8-
| Partial.cs:17:15:17:26 | TwoPartClass | Partial.cs:7:18:7:42 | PartialMethodWithoutBody1 |
9-
| Partial.cs:17:15:17:26 | TwoPartClass | Partial.cs:8:17:8:23 | Method2 |
10-
| Partial.cs:17:15:17:26 | TwoPartClass | Partial.cs:19:18:19:39 | PartialMethodWithBody1 |
11-
| Partial.cs:17:15:17:26 | TwoPartClass | Partial.cs:20:27:20:48 | PartialMethodWithBody2 |
12-
| Partial.cs:17:15:17:26 | TwoPartClass | Partial.cs:24:17:24:23 | Method3 |
13-
| Partial.cs:44:15:44:33 | OnePartPartialClass | Partial.cs:44:15:44:33 | <object initializer> |
14-
| Partial.cs:44:15:44:33 | OnePartPartialClass | Partial.cs:46:18:46:42 | PartialMethodWithoutBody2 |
15-
| Partial.cs:44:15:44:33 | OnePartPartialClass | Partial.cs:47:17:47:23 | Method4 |
1+
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:9:18:9:42 | PartialMethodWithoutBody1 |
2+
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:10:17:10:23 | Method2 |
3+
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:23:18:23:39 | PartialMethodWithBody1 |
4+
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:24:27:24:48 | PartialMethodWithBody2 |
5+
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:28:17:28:23 | Method3 |
6+
| Partial.cs:19:15:19:26 | TwoPartClass | Partial.cs:9:18:9:42 | PartialMethodWithoutBody1 |
7+
| Partial.cs:19:15:19:26 | TwoPartClass | Partial.cs:10:17:10:23 | Method2 |
8+
| Partial.cs:19:15:19:26 | TwoPartClass | Partial.cs:23:18:23:39 | PartialMethodWithBody1 |
9+
| Partial.cs:19:15:19:26 | TwoPartClass | Partial.cs:24:27:24:48 | PartialMethodWithBody2 |
10+
| Partial.cs:19:15:19:26 | TwoPartClass | Partial.cs:28:17:28:23 | Method3 |
11+
| Partial.cs:48:15:48:33 | OnePartPartialClass | Partial.cs:48:15:48:33 | <object initializer> |
12+
| Partial.cs:48:15:48:33 | OnePartPartialClass | Partial.cs:50:18:50:42 | PartialMethodWithoutBody2 |
13+
| Partial.cs:48:15:48:33 | OnePartPartialClass | Partial.cs:51:17:51:23 | Method4 |
1614
| PartialMultipleFiles1.cs:1:22:1:41 | PartialMultipleFiles | PartialMultipleFiles1.cs:1:22:1:41 | <object initializer> |
1715
| PartialMultipleFiles2.cs:1:22:1:41 | PartialMultipleFiles | PartialMultipleFiles1.cs:1:22:1:41 | <object initializer> |

‎csharp/ql/test/library-tests/partial/PartialAccessors.expected‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
| Partial.cs:29:9:29:11 | get_PartialProperty1 | true |
2-
| Partial.cs:30:9:30:11 | set_PartialProperty1 | true |
3-
| Partial.cs:36:9:36:11 | get_Item | true |
4-
| Partial.cs:37:9:37:11 | set_Item | true |
5-
| Partial.cs:41:55:41:57 | add_PartialEvent1 | true |
6-
| Partial.cs:41:63:41:68 | remove_PartialEvent1 | true |
7-
| Partial.cs:53:30:53:32 | get_Property | false |
8-
| Partial.cs:53:35:53:37 | set_Property | false |
9-
| Partial.cs:56:9:56:11 | get_Item | false |
10-
| Partial.cs:57:9:57:11 | set_Item | false |
11-
| Partial.cs:59:31:59:35 | add_Event | false |
12-
| Partial.cs:59:31:59:35 | remove_Event | false |
1+
| Partial.cs:33:9:33:11 | get_PartialProperty1 | true |
2+
| Partial.cs:34:9:34:11 | set_PartialProperty1 | true |
3+
| Partial.cs:40:9:40:11 | get_Item | true |
4+
| Partial.cs:41:9:41:11 | set_Item | true |
5+
| Partial.cs:45:55:45:57 | add_PartialEvent1 | true |
6+
| Partial.cs:45:63:45:68 | remove_PartialEvent1 | true |
7+
| Partial.cs:58:30:58:32 | get_Property | false |
8+
| Partial.cs:58:35:58:37 | set_Property | false |
9+
| Partial.cs:61:9:61:11 | get_Item | false |
10+
| Partial.cs:62:9:62:11 | set_Item | false |
11+
| Partial.cs:64:31:64:35 | add_Event | false |
12+
| Partial.cs:64:31:64:35 | remove_Event | false |

‎csharp/ql/test/library-tests/partial/PartialConstructors.expected‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:3:15:3:26 | {...} |
2-
| Partial.cs:44:15:44:33 | OnePartPartialClass | Partial.cs:44:15:44:33 | {...} |
3-
| Partial.cs:50:7:50:21 | NonPartialClass | Partial.cs:50:7:50:21 | {...} |
1+
| Partial.cs:48:15:48:33 | OnePartPartialClass | Partial.cs:48:15:48:33 | {...} |
2+
| Partial.cs:56:12:56:26 | NonPartialClass | Partial.cs:56:40:56:42 | {...} |
43
| PartialMultipleFiles1.cs:1:22:1:41 | PartialMultipleFiles | PartialMultipleFiles1.cs:1:22:1:41 | {...} |

‎csharp/ql/test/library-tests/partial/PartialEvents.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| Partial.cs:41:39:41:51 | PartialEvent1 | true |
2-
| Partial.cs:59:31:59:35 | Event | false |
1+
| Partial.cs:45:39:45:51 | PartialEvent1 | true |
2+
| Partial.cs:64:31:64:35 | Event | false |

0 commit comments

Comments
 (0)