Skip to content

Commit 4661bed

Browse files
JohanLarssonJohanLarsson
committed
Annotate test code.
1 parent 2c315c5 commit 4661bed

76 files changed

Lines changed: 1255 additions & 1247 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎PropertyChangedAnalyzers.Test/Helpers/OnPropertyChangedTests.Find.cs‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ namespace N
2121
2222
public class C : INotifyPropertyChanged
2323
{
24-
public event PropertyChangedEventHandler PropertyChanged;
24+
public event PropertyChangedEventHandler? PropertyChanged;
2525
26-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
26+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
2727
{
2828
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
2929
}
@@ -33,7 +33,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
3333
var semanticModel = compilation.GetSemanticModel(syntaxTree);
3434
var classDeclaration = syntaxTree.FindClassDeclaration("C");
3535
var type = semanticModel.GetDeclaredSymbol(classDeclaration);
36-
Assert.AreEqual("N.C.OnPropertyChanged(string)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
36+
Assert.AreEqual("N.C.OnPropertyChanged(string?)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
3737
}
3838

3939
[Test]
@@ -48,9 +48,9 @@ namespace N
4848
4949
internal class C : INotifyPropertyChanged
5050
{
51-
public event PropertyChangedEventHandler PropertyChanged;
51+
public event PropertyChangedEventHandler? PropertyChanged;
5252
53-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
53+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
5454
{
5555
var handler = this.PropertyChanged;
5656
if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
@@ -61,7 +61,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
6161
var semanticModel = compilation.GetSemanticModel(syntaxTree);
6262
var classDeclaration = syntaxTree.FindClassDeclaration("C");
6363
var type = semanticModel.GetDeclaredSymbol(classDeclaration);
64-
Assert.AreEqual("N.C.OnPropertyChanged(string)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
64+
Assert.AreEqual("N.C.OnPropertyChanged(string?)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
6565
}
6666

6767
[Test]
@@ -76,7 +76,7 @@ namespace N
7676
7777
public class C : INotifyPropertyChanged
7878
{
79-
public event PropertyChangedEventHandler PropertyChanged;
79+
public event PropertyChangedEventHandler? PropertyChanged;
8080
8181
public int P { get; set; }
8282
@@ -85,7 +85,7 @@ protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
8585
this.PropertyChanged?.Invoke(this, e);
8686
}
8787
88-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
88+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
8989
{
9090
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
9191
}
@@ -95,7 +95,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
9595
var semanticModel = compilation.GetSemanticModel(syntaxTree);
9696
var classDeclaration = syntaxTree.FindClassDeclaration("C");
9797
var type = semanticModel.GetDeclaredSymbol(classDeclaration);
98-
Assert.AreEqual("N.C.OnPropertyChanged(string)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
98+
Assert.AreEqual("N.C.OnPropertyChanged(string?)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
9999
}
100100

101101
[Test]
@@ -110,7 +110,7 @@ namespace N
110110
111111
public class C : INotifyPropertyChanged
112112
{
113-
public event PropertyChangedEventHandler PropertyChanged;
113+
public event PropertyChangedEventHandler? PropertyChanged;
114114
115115
public int P { get; set; }
116116
@@ -119,7 +119,7 @@ protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
119119
this.PropertyChanged?.Invoke(this, e);
120120
}
121121
122-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
122+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
123123
{
124124
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
125125
}
@@ -129,7 +129,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
129129
var semanticModel = compilation.GetSemanticModel(syntaxTree);
130130
var classDeclaration = syntaxTree.FindClassDeclaration("C");
131131
var type = semanticModel.GetDeclaredSymbol(classDeclaration);
132-
Assert.AreEqual("N.C.OnPropertyChanged(string)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
132+
Assert.AreEqual("N.C.OnPropertyChanged(string?)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
133133
}
134134

135135
[Test]
@@ -143,9 +143,9 @@ namespace N
143143
144144
public class ViewModelBase : INotifyPropertyChanged
145145
{
146-
public virtual event PropertyChangedEventHandler PropertyChanged;
146+
public virtual event PropertyChangedEventHandler? PropertyChanged;
147147
148-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
148+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
149149
{
150150
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
151151
}
@@ -159,15 +159,15 @@ namespace N
159159
160160
public class C : N.ViewModelBase
161161
{
162-
public override event PropertyChangedEventHandler PropertyChanged;
162+
public override event PropertyChangedEventHandler? PropertyChanged;
163163
}
164164
}");
165165

166166
var compilation = CSharpCompilation.Create("test", new[] { viewModelBaseCode, code }, Settings.Default.MetadataReferences);
167167
var semanticModel = compilation.GetSemanticModel(code);
168168
var classDeclaration = code.FindClassDeclaration("ViewModel");
169169
var type = semanticModel.GetDeclaredSymbol(classDeclaration);
170-
Assert.AreEqual("N.ViewModelBase.OnPropertyChanged(string)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
170+
Assert.AreEqual("N.ViewModelBase.OnPropertyChanged(string?)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
171171
}
172172

173173
[Test]
@@ -181,9 +181,9 @@ namespace N
181181
182182
public class ViewModelBase : INotifyPropertyChanged
183183
{
184-
public virtual event PropertyChangedEventHandler PropertyChanged;
184+
public virtual event PropertyChangedEventHandler? PropertyChanged;
185185
186-
private void OnPropertyChanged([CallerMemberName] string propertyName = null)
186+
private void OnPropertyChanged([CallerMemberName] string? propertyName = null)
187187
{
188188
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
189189
}
@@ -197,7 +197,7 @@ namespace N
197197
198198
public class C : N.ViewModelBase
199199
{
200-
public override event PropertyChangedEventHandler PropertyChanged;
200+
public override event PropertyChangedEventHandler? PropertyChanged;
201201
}
202202
}");
203203

@@ -221,7 +221,7 @@ public class C : INotifyPropertyChanged
221221
{
222222
private int p;
223223
224-
public event PropertyChangedEventHandler PropertyChanged;
224+
public event PropertyChangedEventHandler? PropertyChanged;
225225
226226
public int P
227227
{
@@ -238,7 +238,7 @@ public int P
238238
}
239239
}
240240
241-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
241+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
242242
{
243243
var handler = this.PropertyChanged;
244244
if (handler != null)
@@ -254,7 +254,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
254254
var semanticModel = compilation.GetSemanticModel(syntaxTree);
255255
var classDeclaration = syntaxTree.FindClassDeclaration("C");
256256
var type = semanticModel.GetDeclaredSymbol(classDeclaration);
257-
Assert.AreEqual("N.C.OnPropertyChanged(string)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
257+
Assert.AreEqual("N.C.OnPropertyChanged(string?)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
258258
}
259259

260260
[Test]
@@ -269,9 +269,9 @@ namespace N
269269
270270
public static class C
271271
{
272-
public static event PropertyChangedEventHandler PropertyChanged;
272+
public static event PropertyChangedEventHandler? PropertyChanged;
273273
274-
private static void OnPropertyChanged([CallerMemberName] string propertyName = null)
274+
private static void OnPropertyChanged([CallerMemberName] string? propertyName = null)
275275
{
276276
PropertyChanged?.Invoke(null, new PropertyChangedEventArgs(propertyName));
277277
}
@@ -281,7 +281,7 @@ private static void OnPropertyChanged([CallerMemberName] string propertyName = n
281281
var semanticModel = compilation.GetSemanticModel(syntaxTree);
282282
var classDeclaration = syntaxTree.FindClassDeclaration("C");
283283
var type = semanticModel.GetDeclaredSymbol(classDeclaration);
284-
Assert.AreEqual("N.C.OnPropertyChanged(string)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
284+
Assert.AreEqual("N.C.OnPropertyChanged(string?)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
285285
}
286286

287287
[Test]
@@ -296,7 +296,7 @@ namespace N
296296
297297
public class C : INotifyPropertyChanged
298298
{
299-
public event PropertyChangedEventHandler PropertyChanged;
299+
public event PropertyChangedEventHandler? PropertyChanged;
300300
301301
public int P { get; set; }
302302
@@ -305,7 +305,7 @@ protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
305305
this.OnPropertyChanged(e);
306306
}
307307
308-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
308+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
309309
{
310310
this.OnPropertyChanged(propertyName);
311311
}
@@ -334,9 +334,9 @@ public class C : INotifyPropertyChanged
334334
{
335335
private static readonly ConcurrentDictionary<string, PropertyChangedEventArgs> Cache = new ConcurrentDictionary<string, PropertyChangedEventArgs>();
336336
337-
public event PropertyChangedEventHandler PropertyChanged;
337+
public event PropertyChangedEventHandler? PropertyChanged;
338338
339-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
339+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
340340
{
341341
this.PropertyChanged?.Invoke(this, Cache.GetOrAdd(propertyName ?? string.Empty, name => new PropertyChangedEventArgs(name)));
342342
}
@@ -346,7 +346,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
346346
var semanticModel = compilation.GetSemanticModel(syntaxTree);
347347
var classDeclaration = syntaxTree.FindClassDeclaration("C");
348348
var type = semanticModel.GetDeclaredSymbol(classDeclaration);
349-
Assert.AreEqual("N.C.OnPropertyChanged(string)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
349+
Assert.AreEqual("N.C.OnPropertyChanged(string?)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
350350
}
351351

352352
[TestCase("propertyName ?? string.Empty")]
@@ -365,9 +365,9 @@ public class C : INotifyPropertyChanged
365365
{
366366
private static readonly ConcurrentDictionary<string, PropertyChangedEventArgs> Cache = new ConcurrentDictionary<string, PropertyChangedEventArgs>();
367367
368-
public event PropertyChangedEventHandler PropertyChanged;
368+
public event PropertyChangedEventHandler? PropertyChanged;
369369
370-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
370+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
371371
{
372372
var e = Cache.GetOrAdd(propertyName ?? string.Empty, name => new PropertyChangedEventArgs(name));
373373
this.PropertyChanged?.Invoke(this, e);
@@ -378,7 +378,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
378378
var semanticModel = compilation.GetSemanticModel(syntaxTree);
379379
var classDeclaration = syntaxTree.FindClassDeclaration("C");
380380
var type = semanticModel.GetDeclaredSymbol(classDeclaration);
381-
Assert.AreEqual("N.C.OnPropertyChanged(string)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
381+
Assert.AreEqual("N.C.OnPropertyChanged(string?)", OnPropertyChanged.Find(type, semanticModel, CancellationToken.None).ToString());
382382
}
383383
}
384384
}

‎PropertyChangedAnalyzers.Test/Helpers/OnPropertyChangedTests.MatchMethodSymbol.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ namespace N
2121
2222
public class C : INotifyPropertyChanged
2323
{
24-
public event PropertyChangedEventHandler PropertyChanged;
24+
public event PropertyChangedEventHandler? PropertyChanged;
2525
26-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
26+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
2727
{
2828
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
2929
}
@@ -47,9 +47,9 @@ namespace N
4747
4848
internal class C : INotifyPropertyChanged
4949
{
50-
public event PropertyChangedEventHandler PropertyChanged;
50+
public event PropertyChangedEventHandler? PropertyChanged;
5151
52-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
52+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
5353
{
5454
var handler = this.PropertyChanged;
5555
if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
@@ -76,7 +76,7 @@ public class C : INotifyPropertyChanged
7676
{
7777
private int p;
7878
79-
public event PropertyChangedEventHandler PropertyChanged;
79+
public event PropertyChangedEventHandler? PropertyChanged;
8080
8181
public int P
8282
{
@@ -94,7 +94,7 @@ public int P
9494
}
9595
}
9696
97-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
97+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
9898
{
9999
var handler = this.PropertyChanged;
100100
if (handler != null)
@@ -126,7 +126,7 @@ public class C : INotifyPropertyChanged
126126
{
127127
private int p;
128128
129-
public event PropertyChangedEventHandler PropertyChanged;
129+
public event PropertyChangedEventHandler? PropertyChanged;
130130
131131
public int P
132132
{
@@ -147,7 +147,7 @@ public int P
147147
}
148148
}
149149
150-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
150+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
151151
{
152152
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
153153
}
@@ -324,9 +324,9 @@ public C()
324324
OnPropertyChanged();
325325
}
326326
327-
public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
327+
public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
328328
329-
protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)
329+
protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
330330
{
331331
PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
332332
}
@@ -356,7 +356,7 @@ private void M1()
356356
}
357357
}
358358

359-
[TestCase("protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)")]
359+
[TestCase("protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)")]
360360
[TestCase("protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)")]
361361
[TestCase("protected virtual void OnPropertyChanged<T>(Expression<Func<T>> property)")]
362362
public static void WhenTrue(string signature)
@@ -372,7 +372,7 @@ namespace N
372372
373373
public class C : INotifyPropertyChanged
374374
{
375-
public event PropertyChangedEventHandler PropertyChanged;
375+
public event PropertyChangedEventHandler? PropertyChanged;
376376
377377
protected virtual void OnPropertyChanged<T>(Expression<Func<T>> property)
378378
{
@@ -384,7 +384,7 @@ protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
384384
this.PropertyChanged?.Invoke(this, e);
385385
}
386386
387-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
387+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
388388
{
389389
this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
390390
}
@@ -397,7 +397,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
397397
Assert.AreEqual(AnalysisResult.Yes, OnPropertyChanged.Match(method, semanticModel, CancellationToken.None)?.AnalysisResult);
398398
}
399399

400-
[TestCase("protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)")]
400+
[TestCase("protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)")]
401401
[TestCase("protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)")]
402402
[TestCase("protected virtual void OnPropertyChanged<T>(Expression<Func<T>> property)")]
403403
public static void WhenRecursive(string signature)
@@ -412,7 +412,7 @@ namespace N
412412
413413
public class C : INotifyPropertyChanged
414414
{
415-
public event PropertyChangedEventHandler PropertyChanged;
415+
public event PropertyChangedEventHandler? PropertyChanged;
416416
417417
protected virtual void OnPropertyChanged<T>(Expression<Func<T>> property)
418418
{
@@ -424,7 +424,7 @@ protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
424424
this.OnPropertyChanged(e);
425425
}
426426
427-
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
427+
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
428428
{
429429
this.OnPropertyChanged(propertyName);
430430
}

0 commit comments

Comments
 (0)