Skip to content

Commit 6b45a47

Browse files
JohanLarssonJohanLarsson
committed
Annotate test code
1 parent 884fd8a commit 6b45a47

2 files changed

Lines changed: 45 additions & 34 deletions

File tree

‎PropertyChangedAnalyzers.Test/INPC006UseReferenceEquals/CodeFix.cs‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ public class ReferenceType
4141
public static void Check(string expressionBefore, string expressionAfter)
4242
{
4343
var before = @"
44+
#pragma warning disable CS8019
45+
#nullable disable
4446
namespace N
4547
{
4648
using System;
@@ -51,7 +53,7 @@ public class C : INotifyPropertyChanged
5153
{
5254
private ReferenceType p;
5355
54-
public event PropertyChangedEventHandler? PropertyChanged;
56+
public event PropertyChangedEventHandler PropertyChanged;
5557
5658
public ReferenceType P
5759
{
@@ -68,14 +70,16 @@ public ReferenceType P
6870
}
6971
}
7072
71-
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
73+
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
7274
{
7375
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
7476
}
7577
}
7678
}".AssertReplace("Equals(value, this.p)", expressionBefore);
7779

7880
var after = @"
81+
#pragma warning disable CS8019
82+
#nullable disable
7983
namespace N
8084
{
8185
using System;
@@ -86,7 +90,7 @@ public class C : INotifyPropertyChanged
8690
{
8791
private ReferenceType p;
8892
89-
public event PropertyChangedEventHandler? PropertyChanged;
93+
public event PropertyChangedEventHandler PropertyChanged;
9094
9195
public ReferenceType P
9296
{
@@ -103,7 +107,7 @@ public ReferenceType P
103107
}
104108
}
105109
106-
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
110+
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
107111
{
108112
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
109113
}
@@ -118,6 +122,8 @@ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName
118122
public static void CheckNegated(string expressionBefore, string expressionAfter)
119123
{
120124
var before = @"
125+
#pragma warning disable CS8019
126+
#nullable disable
121127
namespace N
122128
{
123129
using System;
@@ -128,7 +134,7 @@ public class C : INotifyPropertyChanged
128134
{
129135
private ReferenceType p;
130136
131-
public event PropertyChangedEventHandler? PropertyChanged;
137+
public event PropertyChangedEventHandler PropertyChanged;
132138
133139
public ReferenceType P
134140
{
@@ -143,14 +149,16 @@ public ReferenceType P
143149
}
144150
}
145151
146-
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
152+
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
147153
{
148154
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
149155
}
150156
}
151157
}".AssertReplace("Equals(value, this.p)", expressionBefore);
152158

153159
var after = @"
160+
#pragma warning disable CS8019
161+
#nullable disable
154162
namespace N
155163
{
156164
using System;
@@ -161,7 +169,7 @@ public class C : INotifyPropertyChanged
161169
{
162170
private ReferenceType p;
163171
164-
public event PropertyChangedEventHandler? PropertyChanged;
172+
public event PropertyChangedEventHandler PropertyChanged;
165173
166174
public ReferenceType P
167175
{
@@ -176,7 +184,7 @@ public ReferenceType P
176184
}
177185
}
178186
179-
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
187+
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
180188
{
181189
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
182190
}
@@ -198,10 +206,11 @@ namespace N
198206
public class C<T> : INotifyPropertyChanged
199207
where T : class
200208
{
201-
private T p;
209+
private T? p;
210+
202211
public event PropertyChangedEventHandler? PropertyChanged;
203212
204-
public T P
213+
public T? P
205214
{
206215
get { return this.p; }
207216
set
@@ -232,10 +241,11 @@ namespace N
232241
public class C<T> : INotifyPropertyChanged
233242
where T : class
234243
{
235-
private T p;
244+
private T? p;
245+
236246
public event PropertyChangedEventHandler? PropertyChanged;
237247
238-
public T P
248+
public T? P
239249
{
240250
get { return this.p; }
241251
set
@@ -271,11 +281,11 @@ namespace N
271281
272282
public class C : INotifyPropertyChanged
273283
{
274-
private ReferenceType p;
284+
private ReferenceType? p;
275285
276286
public event PropertyChangedEventHandler? PropertyChanged;
277287
278-
public ReferenceType P
288+
public ReferenceType? P
279289
{
280290
get { return this.p; }
281291
set
@@ -305,11 +315,11 @@ namespace N
305315
306316
public class C : INotifyPropertyChanged
307317
{
308-
private ReferenceType p;
318+
private ReferenceType? p;
309319
310320
public event PropertyChangedEventHandler? PropertyChanged;
311321
312-
public ReferenceType P
322+
public ReferenceType? P
313323
{
314324
get { return this.p; }
315325
set
@@ -345,11 +355,11 @@ namespace N
345355
346356
internal class C : INotifyPropertyChanged
347357
{
348-
private ReferenceType p;
358+
private ReferenceType? p;
349359
350360
public event PropertyChangedEventHandler? PropertyChanged;
351361
352-
internal ReferenceType P
362+
internal ReferenceType? P
353363
{
354364
get { return this.p; }
355365
set
@@ -379,11 +389,11 @@ namespace N
379389
380390
internal class C : INotifyPropertyChanged
381391
{
382-
private ReferenceType p;
392+
private ReferenceType? p;
383393
384394
public event PropertyChangedEventHandler? PropertyChanged;
385395
386-
internal ReferenceType P
396+
internal ReferenceType? P
387397
{
388398
get { return this.p; }
389399
set
@@ -419,11 +429,11 @@ namespace N
419429
420430
public class C : INotifyPropertyChanged
421431
{
422-
private ReferenceType p;
432+
private ReferenceType? p;
423433
424434
public event PropertyChangedEventHandler? PropertyChanged;
425435
426-
public ReferenceType P
436+
public ReferenceType? P
427437
{
428438
get { return this.p; }
429439
set
@@ -451,11 +461,11 @@ namespace N
451461
452462
public class C : INotifyPropertyChanged
453463
{
454-
private ReferenceType p;
464+
private ReferenceType? p;
455465
456466
public event PropertyChangedEventHandler? PropertyChanged;
457467
458-
public ReferenceType P
468+
public ReferenceType? P
459469
{
460470
get { return this.p; }
461471
set

‎PropertyChangedAnalyzers.Test/INPC006UseReferenceEquals/Valid.cs‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ public class ReferenceType
4040
public static void Check(string type, string expression)
4141
{
4242
var code = @"
43+
#pragma warning disable CS8019
44+
#nullable disable
4345
namespace N
4446
{
4547
using System;
@@ -50,7 +52,7 @@ public class C : INotifyPropertyChanged
5052
{
5153
private ReferenceType p;
5254
53-
public event PropertyChangedEventHandler? PropertyChanged;
55+
public event PropertyChangedEventHandler PropertyChanged;
5456
5557
public ReferenceType P
5658
{
@@ -82,6 +84,8 @@ protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
8284
public static void CheckNegated(string type, string expression)
8385
{
8486
var code = @"
87+
#pragma warning disable CS8019
88+
#nullable disable
8589
namespace N
8690
{
8791
using System;
@@ -92,7 +96,7 @@ public class C : INotifyPropertyChanged
9296
{
9397
private ReferenceType p;
9498
95-
public event PropertyChangedEventHandler? PropertyChanged;
99+
public event PropertyChangedEventHandler PropertyChanged;
96100
97101
public ReferenceType P
98102
{
@@ -125,7 +129,6 @@ public static void SimpleProperty()
125129
namespace N
126130
{
127131
using System.ComponentModel;
128-
using System.Runtime.CompilerServices;
129132
130133
public class C : INotifyPropertyChanged
131134
{
@@ -155,15 +158,14 @@ public static void CallsRaisePropertyChangedWithEventArgsIfReturn()
155158
namespace N
156159
{
157160
using System.ComponentModel;
158-
using System.Runtime.CompilerServices;
159161
160162
public class C : INotifyPropertyChanged
161163
{
162-
private ReferenceType p;
164+
private ReferenceType? p;
163165
164166
public event PropertyChangedEventHandler? PropertyChanged;
165167
166-
public ReferenceType P
168+
public ReferenceType? P
167169
{
168170
get { return this.p; }
169171
set
@@ -190,7 +192,6 @@ public static void CallsRaisePropertyChangedWithEventArgsIfReturnUseProperty()
190192
namespace N
191193
{
192194
using System.ComponentModel;
193-
using System.Runtime.CompilerServices;
194195
195196
public class C : INotifyPropertyChanged
196197
{
@@ -226,7 +227,6 @@ public static void CallsRaisePropertyChangedWithEventArgsIfBody()
226227
namespace N
227228
{
228229
using System.ComponentModel;
229-
using System.Runtime.CompilerServices;
230230
231231
public class C : INotifyPropertyChanged
232232
{
@@ -368,10 +368,11 @@ namespace N
368368
369369
public class C<T> : INotifyPropertyChanged
370370
{
371-
private T p;
371+
private T? p;
372+
372373
public event PropertyChangedEventHandler? PropertyChanged;
373374
374-
public T P
375+
public T? P
375376
{
376377
get { return this.p; }
377378
set

0 commit comments

Comments
 (0)