Skip to content

Commit 5e6b7be

Browse files
calumgrantcalumgrant
committed
C#: Update nullability tests.
1 parent 5f6527a commit 5e6b7be

File tree

2 files changed

+31
-35
lines changed

2 files changed

+31
-35
lines changed

‎csharp/ql/test/library-tests/csharp8/NullableRefTypes.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void TestSuppressNullableWarningExpr()
8383
{
8484
string? x = "source";
8585
string y = x!;
86-
y = x!!;
86+
y = x!;
8787
x = null;
8888
y = x!;
8989
}

‎csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
suppressNullableWarnings
22
| NullableRefTypes.cs:85:20:85:21 | ...! | NullableRefTypes.cs:85:20:85:20 | access to local variable x |
33
| NullableRefTypes.cs:86:13:86:14 | ...! | NullableRefTypes.cs:86:13:86:13 | access to local variable x |
4-
| NullableRefTypes.cs:86:13:86:15 | ...! | NullableRefTypes.cs:86:13:86:14 | ...! |
54
| NullableRefTypes.cs:88:13:88:14 | ...! | NullableRefTypes.cs:88:13:88:13 | access to local variable x |
65
| NullableRefTypes.cs:113:36:113:44 | ...! | NullableRefTypes.cs:113:36:113:43 | access to field Property |
76
nullableDataFlow
@@ -10,7 +9,6 @@ nullableDataFlow
109
| NullableRefTypes.cs:85:20:85:20 | access to local variable x | NullableRefTypes.cs:85:20:85:21 | ...! |
1110
| NullableRefTypes.cs:85:20:85:20 | access to local variable x | NullableRefTypes.cs:86:13:86:13 | access to local variable x |
1211
| NullableRefTypes.cs:86:13:86:13 | access to local variable x | NullableRefTypes.cs:86:13:86:14 | ...! |
13-
| NullableRefTypes.cs:86:13:86:14 | ...! | NullableRefTypes.cs:86:13:86:15 | ...! |
1412
| NullableRefTypes.cs:87:9:87:16 | SSA def(x) | NullableRefTypes.cs:88:13:88:13 | access to local variable x |
1513
| NullableRefTypes.cs:87:13:87:16 | null | NullableRefTypes.cs:87:9:87:16 | SSA def(x) |
1614
| NullableRefTypes.cs:88:13:88:13 | access to local variable x | NullableRefTypes.cs:88:13:88:14 | ...! |
@@ -21,14 +19,13 @@ nullableControlFlow
2119
| NullableRefTypes.cs:84:17:84:28 | String x = ... | NullableRefTypes.cs:85:9:85:22 | ... ...; | successor |
2220
| NullableRefTypes.cs:84:21:84:28 | "source" | NullableRefTypes.cs:84:17:84:28 | String x = ... | successor |
2321
| NullableRefTypes.cs:85:9:85:22 | ... ...; | NullableRefTypes.cs:85:20:85:20 | access to local variable x | successor |
24-
| NullableRefTypes.cs:85:16:85:21 | String y = ... | NullableRefTypes.cs:86:9:86:16 | ...; | successor |
22+
| NullableRefTypes.cs:85:16:85:21 | String y = ... | NullableRefTypes.cs:86:9:86:15 | ...; | successor |
2523
| NullableRefTypes.cs:85:20:85:20 | access to local variable x | NullableRefTypes.cs:85:20:85:21 | ...! | successor |
2624
| NullableRefTypes.cs:85:20:85:21 | ...! | NullableRefTypes.cs:85:16:85:21 | String y = ... | successor |
27-
| NullableRefTypes.cs:86:9:86:15 | ... = ... | NullableRefTypes.cs:87:9:87:17 | ...; | successor |
28-
| NullableRefTypes.cs:86:9:86:16 | ...; | NullableRefTypes.cs:86:13:86:13 | access to local variable x | successor |
25+
| NullableRefTypes.cs:86:9:86:14 | ... = ... | NullableRefTypes.cs:87:9:87:17 | ...; | successor |
26+
| NullableRefTypes.cs:86:9:86:15 | ...; | NullableRefTypes.cs:86:13:86:13 | access to local variable x | successor |
2927
| NullableRefTypes.cs:86:13:86:13 | access to local variable x | NullableRefTypes.cs:86:13:86:14 | ...! | successor |
30-
| NullableRefTypes.cs:86:13:86:14 | ...! | NullableRefTypes.cs:86:13:86:15 | ...! | successor |
31-
| NullableRefTypes.cs:86:13:86:15 | ...! | NullableRefTypes.cs:86:9:86:15 | ... = ... | successor |
28+
| NullableRefTypes.cs:86:13:86:14 | ...! | NullableRefTypes.cs:86:9:86:14 | ... = ... | successor |
3229
| NullableRefTypes.cs:87:9:87:16 | ... = ... | NullableRefTypes.cs:88:9:88:15 | ...; | successor |
3330
| NullableRefTypes.cs:87:9:87:17 | ...; | NullableRefTypes.cs:87:13:87:16 | null | successor |
3431
| NullableRefTypes.cs:87:13:87:16 | null | NullableRefTypes.cs:87:9:87:16 | ... = ... | successor |
@@ -40,10 +37,9 @@ nonNullExpressions
4037
| NullableRefTypes.cs:84:21:84:28 | "source" |
4138
| NullableRefTypes.cs:85:20:85:20 | access to local variable x |
4239
| NullableRefTypes.cs:85:20:85:21 | ...! |
43-
| NullableRefTypes.cs:86:9:86:15 | ... = ... |
40+
| NullableRefTypes.cs:86:9:86:14 | ... = ... |
4441
| NullableRefTypes.cs:86:13:86:13 | access to local variable x |
4542
| NullableRefTypes.cs:86:13:86:14 | ...! |
46-
| NullableRefTypes.cs:86:13:86:15 | ...! |
4743
| NullableRefTypes.cs:88:9:88:14 | ... = ... |
4844
| NullableRefTypes.cs:88:13:88:14 | ...! |
4945
assignableTypes
@@ -74,10 +70,10 @@ assignableTypes
7470
| NullableRefTypes.cs:48:16:48:16 | P | NullableRefTypes.cs:47:23:47:25 | Del? | ? |
7571
| NullableRefTypes.cs:48:16:48:16 | value | NullableRefTypes.cs:47:23:47:25 | Del? | ? |
7672
| NullableRefTypes.cs:48:16:48:16 | value | NullableRefTypes.cs:47:23:47:25 | Del? | ? |
77-
| NullableRefTypes.cs:51:19:51:19 | t | NullableRefTypes.cs:6:7:6:13 | MyClass | _ |
73+
| NullableRefTypes.cs:51:19:51:19 | t | NullableRefTypes.cs:6:7:6:13 | MyClass? | ? |
7874
| NullableRefTypes.cs:51:19:51:19 | t | NullableRefTypes.cs:51:14:51:14 | T! | ! |
7975
| NullableRefTypes.cs:65:54:65:59 | items2 | NullableRefTypes.cs:54:11:54:33 | Generic<MyClass?, MyClass!, IDisposable!, MyClass!>! | <?,!,!,!>! |
80-
| NullableRefTypes.cs:67:25:67:25 | x | NullableRefTypes.cs:6:7:6:13 | MyClass | _ |
76+
| NullableRefTypes.cs:67:25:67:25 | x | NullableRefTypes.cs:6:7:6:13 | MyClass? | ? |
8177
| NullableRefTypes.cs:67:25:67:25 | x | NullableRefTypes.cs:67:20:67:20 | T! | ! |
8278
| NullableRefTypes.cs:73:18:73:18 | x | NullableRefTypes.cs:6:7:6:13 | MyClass? | ? |
8379
| NullableRefTypes.cs:103:42:103:42 | r | NullableRefTypes.cs:6:7:6:13 | ref MyClass! | ! |
@@ -90,10 +86,10 @@ assignableTypes
9086
| NullableRefTypes.cs:110:51:110:52 | p2 | NullableRefTypes.cs:6:7:6:13 | out MyClass? | ? |
9187
| NullableRefTypes.cs:112:14:112:21 | Property | NullableRefTypes.cs:6:7:6:13 | MyClass? | ? |
9288
| NullableRefTypes.cs:113:17:113:27 | RefProperty | NullableRefTypes.cs:6:7:6:13 | ref MyClass! | ! |
93-
| NullableRefTypes.cs:118:15:118:15 | a | NullableRefTypes.cs:165:8:165:15 | MyStruct? | <_>? |
89+
| NullableRefTypes.cs:118:15:118:15 | a | NullableRefTypes.cs:165:8:165:15 | MyStruct? | <!>? |
9490
| NullableRefTypes.cs:119:17:119:17 | b | NullableRefTypes.cs:165:8:165:15 | MyStruct![]? | <!>? |
95-
| NullableRefTypes.cs:120:17:120:17 | c | NullableRefTypes.cs:165:8:165:15 | MyStruct?[]! | <<_>?>! |
96-
| NullableRefTypes.cs:121:18:121:18 | d | NullableRefTypes.cs:165:8:165:15 | MyStruct?[]? | <<_>?>? |
91+
| NullableRefTypes.cs:120:17:120:17 | c | NullableRefTypes.cs:165:8:165:15 | MyStruct?[]! | <<!>?>! |
92+
| NullableRefTypes.cs:121:18:121:18 | d | NullableRefTypes.cs:165:8:165:15 | MyStruct?[]? | <<!>?>? |
9793
| NullableRefTypes.cs:123:14:123:14 | e | NullableRefTypes.cs:6:7:6:13 | MyClass? | ? |
9894
| NullableRefTypes.cs:124:16:124:16 | f | NullableRefTypes.cs:6:7:6:13 | MyClass?[]! | <?>! |
9995
| NullableRefTypes.cs:125:16:125:16 | g | NullableRefTypes.cs:6:7:6:13 | MyClass![]? | <!>? |
@@ -102,10 +98,10 @@ assignableTypes
10298
| NullableRefTypes.cs:129:22:129:22 | j | NullableRefTypes.cs:6:7:6:13 | MyClass![,,][,][]! | ! |
10399
| NullableRefTypes.cs:130:27:130:27 | k | NullableRefTypes.cs:6:7:6:13 | MyClass![,,,][][,][,,]! | ! |
104100
| NullableRefTypes.cs:131:29:131:29 | l | NullableRefTypes.cs:6:7:6:13 | MyClass?[,,,][][,]?[,,]! | <<<<?>!>!>?>! |
105-
| NullableRefTypes.cs:138:15:138:15 | a | NullableRefTypes.cs:165:8:165:15 | MyStruct? | <_>? |
106-
| NullableRefTypes.cs:139:17:139:17 | b | NullableRefTypes.cs:165:8:165:15 | MyStruct[]? | <_>? |
107-
| NullableRefTypes.cs:140:17:140:17 | c | NullableRefTypes.cs:165:8:165:15 | MyStruct?[] | <<_>?>_ |
108-
| NullableRefTypes.cs:141:18:141:18 | d | NullableRefTypes.cs:165:8:165:15 | MyStruct?[]? | <<_>?>? |
101+
| NullableRefTypes.cs:138:15:138:15 | a | NullableRefTypes.cs:165:8:165:15 | MyStruct? | <!>? |
102+
| NullableRefTypes.cs:139:17:139:17 | b | NullableRefTypes.cs:165:8:165:15 | MyStruct![]? | <!>? |
103+
| NullableRefTypes.cs:140:17:140:17 | c | NullableRefTypes.cs:165:8:165:15 | MyStruct?[] | <<!>?>_ |
104+
| NullableRefTypes.cs:141:18:141:18 | d | NullableRefTypes.cs:165:8:165:15 | MyStruct?[]? | <<!>?>? |
109105
| NullableRefTypes.cs:143:14:143:14 | e | NullableRefTypes.cs:6:7:6:13 | MyClass? | ? |
110106
| NullableRefTypes.cs:144:16:144:16 | f | NullableRefTypes.cs:6:7:6:13 | MyClass?[] | <?>_ |
111107
| NullableRefTypes.cs:145:16:145:16 | g | NullableRefTypes.cs:6:7:6:13 | MyClass[]? | <_>? |
@@ -135,7 +131,7 @@ arrayElements
135131
| NullableRefTypes.cs:129:22:129:22 | j | NullableRefTypes.cs:6:7:6:13 | MyClass![,,][,][]! | NullableRefTypes.cs:6:7:6:13 | MyClass![,][]! |
136132
| NullableRefTypes.cs:130:27:130:27 | k | NullableRefTypes.cs:6:7:6:13 | MyClass![,,,][][,][,,]! | NullableRefTypes.cs:6:7:6:13 | MyClass![][,][,,]! |
137133
| NullableRefTypes.cs:131:29:131:29 | l | NullableRefTypes.cs:6:7:6:13 | MyClass?[,,,][][,]?[,,]! | NullableRefTypes.cs:6:7:6:13 | MyClass?[,,,][][,]? |
138-
| NullableRefTypes.cs:139:17:139:17 | b | NullableRefTypes.cs:165:8:165:15 | MyStruct[]? | NullableRefTypes.cs:165:8:165:15 | MyStruct |
134+
| NullableRefTypes.cs:139:17:139:17 | b | NullableRefTypes.cs:165:8:165:15 | MyStruct![]? | NullableRefTypes.cs:165:8:165:15 | MyStruct! |
139135
| NullableRefTypes.cs:140:17:140:17 | c | NullableRefTypes.cs:165:8:165:15 | MyStruct?[] | NullableRefTypes.cs:165:8:165:15 | MyStruct? |
140136
| NullableRefTypes.cs:141:18:141:18 | d | NullableRefTypes.cs:165:8:165:15 | MyStruct?[]? | NullableRefTypes.cs:165:8:165:15 | MyStruct? |
141137
| NullableRefTypes.cs:144:16:144:16 | f | NullableRefTypes.cs:6:7:6:13 | MyClass?[] | NullableRefTypes.cs:6:7:6:13 | MyClass? |
@@ -146,7 +142,7 @@ arrayElements
146142
| NullableRefTypes.cs:150:27:150:27 | k | NullableRefTypes.cs:6:7:6:13 | MyClass[,,,][][,][,,] | NullableRefTypes.cs:6:7:6:13 | MyClass[][,][,,] |
147143
| NullableRefTypes.cs:151:29:151:29 | l | NullableRefTypes.cs:6:7:6:13 | MyClass?[,,,][][,]?[,,] | NullableRefTypes.cs:6:7:6:13 | MyClass?[,,,][][,]? |
148144
returnTypes
149-
| NullableRefTypes.cs:6:7:6:13 | MyClass | Void |
145+
| NullableRefTypes.cs:6:7:6:13 | MyClass | Void! |
150146
| NullableRefTypes.cs:13:19:13:22 | get_C | MyClass? |
151147
| NullableRefTypes.cs:14:18:14:21 | get_D | MyClass! |
152148
| NullableRefTypes.cs:17:29:17:32 | get_Item | MyClass? |
@@ -159,28 +155,28 @@ returnTypes
159155
| NullableRefTypes.cs:32:10:32:10 | O | Void! |
160156
| NullableRefTypes.cs:35:10:35:15 | Locals | Void! |
161157
| NullableRefTypes.cs:44:23:44:26 | BeginInvoke | IAsyncResult |
162-
| NullableRefTypes.cs:44:23:44:26 | Del1 | Void |
158+
| NullableRefTypes.cs:44:23:44:26 | Del1 | Void! |
163159
| NullableRefTypes.cs:44:23:44:26 | EndInvoke | MyClass? |
164160
| NullableRefTypes.cs:44:23:44:26 | Invoke | MyClass? |
165161
| NullableRefTypes.cs:47:23:47:25 | BeginInvoke | IAsyncResult |
166-
| NullableRefTypes.cs:47:23:47:25 | Del | Void |
162+
| NullableRefTypes.cs:47:23:47:25 | Del | Void! |
167163
| NullableRefTypes.cs:47:23:47:25 | EndInvoke | MyClass? |
168164
| NullableRefTypes.cs:47:23:47:25 | Invoke | MyClass? |
169-
| NullableRefTypes.cs:48:16:48:16 | add_P | Void |
170-
| NullableRefTypes.cs:48:16:48:16 | remove_P | Void |
165+
| NullableRefTypes.cs:48:16:48:16 | add_P | Void! |
166+
| NullableRefTypes.cs:48:16:48:16 | remove_P | Void! |
171167
| NullableRefTypes.cs:51:12:51:15 | Q | object |
172168
| NullableRefTypes.cs:51:12:51:15 | Q | object! |
173169
| NullableRefTypes.cs:51:12:51:15 | Q | object! |
174-
| NullableRefTypes.cs:54:11:54:33 | Generic | Void |
175-
| NullableRefTypes.cs:58:11:58:26 | Generic2 | Void |
170+
| NullableRefTypes.cs:54:11:54:33 | Generic | Void! |
171+
| NullableRefTypes.cs:58:11:58:26 | Generic2 | Void! |
176172
| NullableRefTypes.cs:67:10:67:21 | GenericFn | Void |
177173
| NullableRefTypes.cs:67:10:67:21 | GenericFn | Void! |
178174
| NullableRefTypes.cs:67:10:67:21 | GenericFn | Void! |
179175
| NullableRefTypes.cs:71:14:71:18 | CallF | MyStruct! |
180-
| NullableRefTypes.cs:80:7:80:22 | NullableRefTypes | Void |
176+
| NullableRefTypes.cs:80:7:80:22 | NullableRefTypes | Void! |
181177
| NullableRefTypes.cs:82:10:82:40 | TestSuppressNullableWarningExpr | Void! |
182178
| NullableRefTypes.cs:91:10:91:34 | FunctionInNullableContext | Void! |
183-
| NullableRefTypes.cs:100:7:100:14 | RefTypes | Void |
179+
| NullableRefTypes.cs:100:7:100:14 | RefTypes | Void! |
184180
| NullableRefTypes.cs:103:18:103:28 | ReturnsRef1 | ref MyClass? |
185181
| NullableRefTypes.cs:104:17:104:27 | ReturnsRef2 | ref MyClass! |
186182
| NullableRefTypes.cs:105:27:105:37 | ReturnsRef3 | readonly MyClass? |
@@ -189,17 +185,17 @@ returnTypes
189185
| NullableRefTypes.cs:108:26:108:36 | ReturnsRef6 | readonly MyClass! |
190186
| NullableRefTypes.cs:110:10:110:20 | Parameters1 | Void! |
191187
| NullableRefTypes.cs:113:32:113:44 | get_RefProperty | MyClass! |
192-
| NullableRefTypes.cs:116:7:116:23 | ToStringWithTypes | Void |
193-
| NullableRefTypes.cs:136:7:136:24 | ToStringWithTypes2 | Void |
194-
| NullableRefTypes.cs:154:7:154:25 | DisabledNullability | Void |
188+
| NullableRefTypes.cs:116:7:116:23 | ToStringWithTypes | Void! |
189+
| NullableRefTypes.cs:136:7:136:24 | ToStringWithTypes2 | Void! |
190+
| NullableRefTypes.cs:154:7:154:25 | DisabledNullability | Void! |
195191
| NullableRefTypes.cs:157:18:157:30 | get_P | MyClass |
196192
| NullableRefTypes.cs:158:13:158:14 | Fn | MyClass |
197-
| NullableRefTypes.cs:165:8:165:15 | MyStruct | Void |
193+
| NullableRefTypes.cs:165:8:165:15 | MyStruct | Void! |
198194
methodTypeArguments
199-
| NullableRefTypes.cs:51:12:51:15 | Q | 0 | MyClass |
200195
| NullableRefTypes.cs:51:12:51:15 | Q | 0 | MyClass! |
201-
| NullableRefTypes.cs:67:10:67:21 | GenericFn | 0 | MyClass |
196+
| NullableRefTypes.cs:51:12:51:15 | Q | 0 | MyClass? |
202197
| NullableRefTypes.cs:67:10:67:21 | GenericFn | 0 | MyClass! |
198+
| NullableRefTypes.cs:67:10:67:21 | GenericFn | 0 | MyClass? |
203199
constructedTypes
204200
| NullableRefTypes.cs:54:11:54:33 | Generic<MyClass, MyClass, IDisposable, MyClass> | 0 | MyClass | _ |
205201
| NullableRefTypes.cs:54:11:54:33 | Generic<MyClass, MyClass, IDisposable, MyClass> | 1 | MyClass | _ |

0 commit comments

Comments
 (0)