Annotate code in tests.

JohanLarsson · JohanLarsson · commit f9515d4773ee · 2021-12-10T07:18:58.000+01:00
diff --git a/PropertyChangedAnalyzers.Test/Helpers/LibrarySettings.cs b/PropertyChangedAnalyzers.Test/Helpers/LibrarySettings.cs
@@ -21,6 +21,10 @@ public static class LibrarySettings
 
         internal static Settings Prism { get; } = Settings.Default.WithMetadataReferences(MetadataReferences.Transitive(typeof(Microsoft.Practices.Prism.Mvvm.BindableBase)));
 
+        internal static Settings Reactive { get; } = Settings.Default
+                                                             .WithCompilationOptions(x => x.WithSuppressedDiagnostics("CS1701"))
+                                                             .WithMetadataReferences(MetadataReferences.Transitive(typeof(Gu.Wpf.Reactive.AsyncCommand)));
+
         // Use this if the dll is not signed
         private static Assembly LoadUnsigned(string dllName)
         {
diff --git a/PropertyChangedAnalyzers.Test/ValidWithAllAnalyzers.cs b/PropertyChangedAnalyzers.Test/ValidWithAllAnalyzers.cs
@@ -3,12 +3,16 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+
     using Gu.Roslyn.Asserts;
+
     using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.Diagnostics;
 
     using NUnit.Framework;
 
+    using PropertyChangedAnalyzers.Test.Helpers;
+
     public static class ValidWithAllAnalyzers
     {
         private static readonly IReadOnlyList<DiagnosticAnalyzer> AllAnalyzers =
@@ -57,9 +61,9 @@ namespace N.Core
 
     public abstract class ViewModelBase : INotifyPropertyChanged
     {
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
-        protected bool TrySet<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
+        protected bool TrySet<T>(ref T field, T value, [CallerMemberName] string? propertyName = null)
         {
             if (EqualityComparer<T>.Default.Equals(field, value))
             {
@@ -71,7 +75,7 @@ protected bool TrySet<T>(ref T field, T value, [CallerMemberName] string propert
             return true;
         }
 
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
@@ -145,7 +149,7 @@ public class ViewModel2 : INotifyPropertyChanged
         private int p;
         private readonly WithMutableField withMutableField = new WithMutableField();
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         public int Squared => this.P * this.P;
 
@@ -185,7 +189,7 @@ public int P2
             }
         }
 
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
@@ -202,7 +206,7 @@ public class OldStyleOnPropertyChanged : INotifyPropertyChanged
     {
         private int p;
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         public int P
         {
@@ -220,7 +224,7 @@ public int P
             }
         }
 
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             var handler = this.PropertyChanged;
             if (handler != null)
@@ -243,7 +247,7 @@ public class WrappingPoint : INotifyPropertyChanged
     {
         private Point point;
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         public int X
         {
@@ -279,7 +283,7 @@ public int Y
             }
         }
 
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
@@ -297,7 +301,7 @@ public class WrappingTimeSpan : INotifyPropertyChanged
     {
         private TimeSpan timeSpan;
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         public long Ticks
         {
@@ -314,7 +318,7 @@ public long Ticks
             }
         }
 
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
@@ -332,7 +336,7 @@ public class RadioButtonViewModel : INotifyPropertyChanged
     {
         private double speed;
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         public bool IsSpeed1
         {
@@ -357,7 +361,7 @@ public double Speed
             }
         }
 
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
@@ -372,11 +376,11 @@ namespace N
 
     public abstract class AbstractWithAbstractProperty : INotifyPropertyChanged
     {
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         public abstract int P { get; }
 
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
@@ -408,14 +412,14 @@ namespace N
 
     public class ExceptionHandlingRelayCommand : ConditionRelayCommand
     {
-        private Exception _exception;
+        private Exception? _exception;
 
         public ExceptionHandlingRelayCommand(Action action, ICondition condition)
             : base(action, condition)
         {
         }
 
-        public Exception Exception
+        public Exception? Exception
         {
             get => _exception;
 
@@ -436,17 +440,21 @@ private set
 }";
             RoslynAssert.Valid(
                 analyzer,
-                viewModelBase,
-                withMutableField,
-                viewModel1,
-                viewModel2,
-                oldStyleOnPropertyChanged,
-                wrappingPoint,
-                wrappingTimeSpan,
-                radioButtonViewModel,
-                abstractWithAbstractProperty,
-                subClassingAbstractWithAbstractProperty,
-                exceptionHandlingRelayCommand);
+                new[]
+                {
+                    viewModelBase,
+                    withMutableField,
+                    viewModel1,
+                    viewModel2,
+                    oldStyleOnPropertyChanged,
+                    wrappingPoint,
+                    wrappingTimeSpan,
+                    radioButtonViewModel,
+                    abstractWithAbstractProperty,
+                    subClassingAbstractWithAbstractProperty,
+                    exceptionHandlingRelayCommand,
+                },
+                settings: LibrarySettings.Reactive);
         }
 
         [TestCaseSource(nameof(AllAnalyzers))]
@@ -461,9 +469,9 @@ namespace N.Core
 
     public abstract class ViewModelBase<T> : INotifyPropertyChanged
     {
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
-        protected bool TrySet<U>(ref U field, U value, [CallerMemberName] string propertyName = null)
+        protected bool TrySet<U>(ref U field, U value, [CallerMemberName] string? propertyName = null)
         {
             if (EqualityComparer<U>.Default.Equals(field, value))
             {
@@ -475,7 +483,7 @@ protected bool TrySet<U>(ref U field, U value, [CallerMemberName] string propert
             return true;
         }
 
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
@@ -537,13 +545,13 @@ namespace N
 
     public class GenericViewModel<T> : INotifyPropertyChanged
     {
-        private T p;
+        private T? p;
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         public string Text => $""{this.P}  {this.P}"";
 
-        public T P
+        public T? P
         {
 #pragma warning disable INPC020 // Prefer expression body accessor.
             get
@@ -565,7 +573,7 @@ public T P
             }
         }
 
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,10 @@ public static class LibrarySettings`
`21`	`21`
`22`	`22`	`internal static Settings Prism { get; } = Settings.Default.WithMetadataReferences(MetadataReferences.Transitive(typeof(Microsoft.Practices.Prism.Mvvm.BindableBase)));`
`23`	`23`
	`24`	`+ internal static Settings Reactive { get; } = Settings.Default`
	`25`	`+ .WithCompilationOptions(x => x.WithSuppressedDiagnostics("CS1701"))`
	`26`	`+ .WithMetadataReferences(MetadataReferences.Transitive(typeof(Gu.Wpf.Reactive.AsyncCommand)));`
	`27`	`+`
`24`	`28`	`// Use this if the dll is not signed`
`25`	`29`	`private static Assembly LoadUnsigned(string dllName)`
`26`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,16 @@`
`3`	`3`	`using System;`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`	`using System.Linq;`
	`6`	`+`
`6`	`7`	`using Gu.Roslyn.Asserts;`
	`8`	`+`
`7`	`9`	`using Microsoft.CodeAnalysis;`
`8`	`10`	`using Microsoft.CodeAnalysis.Diagnostics;`
`9`	`11`
`10`	`12`	`using NUnit.Framework;`
`11`	`13`
	`14`	`+ using PropertyChangedAnalyzers.Test.Helpers;`
	`15`	`+`
`12`	`16`	`public static class ValidWithAllAnalyzers`
`13`	`17`	`{`
`14`	`18`	`private static readonly IReadOnlyList<DiagnosticAnalyzer> AllAnalyzers =`
`@@ -57,9 +61,9 @@ namespace N.Core`
`57`	`61`
`58`	`62`	`public abstract class ViewModelBase : INotifyPropertyChanged`
`59`	`63`	`{`
`60`		`- public event PropertyChangedEventHandler PropertyChanged;`
	`64`	`+ public event PropertyChangedEventHandler? PropertyChanged;`
`61`	`65`
`62`		`- protected bool TrySet<T>(ref T field, T value, [CallerMemberName] string propertyName = null)`
	`66`	`+ protected bool TrySet<T>(ref T field, T value, [CallerMemberName] string? propertyName = null)`
`63`	`67`	`{`
`64`	`68`	`if (EqualityComparer<T>.Default.Equals(field, value))`
`65`	`69`	`{`
`@@ -71,7 +75,7 @@ protected bool TrySet<T>(ref T field, T value, [CallerMemberName] string propert`
`71`	`75`	`return true;`
`72`	`76`	`}`
`73`	`77`
`74`		`- protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`
	`78`	`+ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)`
`75`	`79`	`{`
`76`	`80`	`this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`77`	`81`	`}`
`@@ -145,7 +149,7 @@ public class ViewModel2 : INotifyPropertyChanged`
`145`	`149`	`private int p;`
`146`	`150`	`private readonly WithMutableField withMutableField = new WithMutableField();`
`147`	`151`
`148`		`- public event PropertyChangedEventHandler PropertyChanged;`
	`152`	`+ public event PropertyChangedEventHandler? PropertyChanged;`
`149`	`153`
`150`	`154`	`public int Squared => this.P * this.P;`
`151`	`155`
`@@ -185,7 +189,7 @@ public int P2`
`185`	`189`	`}`
`186`	`190`	`}`
`187`	`191`
`188`		`- protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`
	`192`	`+ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)`
`189`	`193`	`{`
`190`	`194`	`this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`191`	`195`	`}`
`@@ -202,7 +206,7 @@ public class OldStyleOnPropertyChanged : INotifyPropertyChanged`
`202`	`206`	`{`
`203`	`207`	`private int p;`
`204`	`208`
`205`		`- public event PropertyChangedEventHandler PropertyChanged;`
	`209`	`+ public event PropertyChangedEventHandler? PropertyChanged;`
`206`	`210`
`207`	`211`	`public int P`
`208`	`212`	`{`
`@@ -220,7 +224,7 @@ public int P`
`220`	`224`	`}`
`221`	`225`	`}`
`222`	`226`
`223`		`- protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`
	`227`	`+ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)`
`224`	`228`	`{`
`225`	`229`	`var handler = this.PropertyChanged;`
`226`	`230`	`if (handler != null)`
`@@ -243,7 +247,7 @@ public class WrappingPoint : INotifyPropertyChanged`
`243`	`247`	`{`
`244`	`248`	`private Point point;`
`245`	`249`
`246`		`- public event PropertyChangedEventHandler PropertyChanged;`
	`250`	`+ public event PropertyChangedEventHandler? PropertyChanged;`
`247`	`251`
`248`	`252`	`public int X`
`249`	`253`	`{`
`@@ -279,7 +283,7 @@ public int Y`
`279`	`283`	`}`
`280`	`284`	`}`
`281`	`285`
`282`		`- protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`
	`286`	`+ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)`
`283`	`287`	`{`
`284`	`288`	`this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`285`	`289`	`}`
`@@ -297,7 +301,7 @@ public class WrappingTimeSpan : INotifyPropertyChanged`
`297`	`301`	`{`
`298`	`302`	`private TimeSpan timeSpan;`
`299`	`303`
`300`		`- public event PropertyChangedEventHandler PropertyChanged;`
	`304`	`+ public event PropertyChangedEventHandler? PropertyChanged;`
`301`	`305`
`302`	`306`	`public long Ticks`
`303`	`307`	`{`
`@@ -314,7 +318,7 @@ public long Ticks`
`314`	`318`	`}`
`315`	`319`	`}`
`316`	`320`
`317`		`- protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`
	`321`	`+ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)`
`318`	`322`	`{`
`319`	`323`	`this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`320`	`324`	`}`
`@@ -332,7 +336,7 @@ public class RadioButtonViewModel : INotifyPropertyChanged`
`332`	`336`	`{`
`333`	`337`	`private double speed;`
`334`	`338`
`335`		`- public event PropertyChangedEventHandler PropertyChanged;`
	`339`	`+ public event PropertyChangedEventHandler? PropertyChanged;`
`336`	`340`
`337`	`341`	`public bool IsSpeed1`
`338`	`342`	`{`
`@@ -357,7 +361,7 @@ public double Speed`
`357`	`361`	`}`
`358`	`362`	`}`
`359`	`363`
`360`		`- protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`
	`364`	`+ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)`
`361`	`365`	`{`
`362`	`366`	`this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`363`	`367`	`}`
`@@ -372,11 +376,11 @@ namespace N`
`372`	`376`
`373`	`377`	`public abstract class AbstractWithAbstractProperty : INotifyPropertyChanged`
`374`	`378`	`{`
`375`		`- public event PropertyChangedEventHandler PropertyChanged;`
	`379`	`+ public event PropertyChangedEventHandler? PropertyChanged;`
`376`	`380`
`377`	`381`	`public abstract int P { get; }`
`378`	`382`
`379`		`- protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`
	`383`	`+ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)`
`380`	`384`	`{`
`381`	`385`	`this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`382`	`386`	`}`
`@@ -408,14 +412,14 @@ namespace N`
`408`	`412`
`409`	`413`	`public class ExceptionHandlingRelayCommand : ConditionRelayCommand`
`410`	`414`	`{`
`411`		`- private Exception _exception;`
	`415`	`+ private Exception? _exception;`
`412`	`416`
`413`	`417`	`public ExceptionHandlingRelayCommand(Action action, ICondition condition)`
`414`	`418`	`: base(action, condition)`
`415`	`419`	`{`
`416`	`420`	`}`
`417`	`421`
`418`		`- public Exception Exception`
	`422`	`+ public Exception? Exception`
`419`	`423`	`{`
`420`	`424`	`get => _exception;`
`421`	`425`
`@@ -436,17 +440,21 @@ private set`
`436`	`440`	`}";`
`437`	`441`	`RoslynAssert.Valid(`
`438`	`442`	`analyzer,`
`439`		`- viewModelBase,`
`440`		`- withMutableField,`
`441`		`- viewModel1,`
`442`		`- viewModel2,`
`443`		`- oldStyleOnPropertyChanged,`
`444`		`- wrappingPoint,`
`445`		`- wrappingTimeSpan,`
`446`		`- radioButtonViewModel,`
`447`		`- abstractWithAbstractProperty,`
`448`		`- subClassingAbstractWithAbstractProperty,`
`449`		`- exceptionHandlingRelayCommand);`
	`443`	`+ new[]`
	`444`	`+ {`
	`445`	`+ viewModelBase,`
	`446`	`+ withMutableField,`
	`447`	`+ viewModel1,`
	`448`	`+ viewModel2,`
	`449`	`+ oldStyleOnPropertyChanged,`
	`450`	`+ wrappingPoint,`
	`451`	`+ wrappingTimeSpan,`
	`452`	`+ radioButtonViewModel,`
	`453`	`+ abstractWithAbstractProperty,`
	`454`	`+ subClassingAbstractWithAbstractProperty,`
	`455`	`+ exceptionHandlingRelayCommand,`
	`456`	`+ },`
	`457`	`+ settings: LibrarySettings.Reactive);`
`450`	`458`	`}`
`451`	`459`
`452`	`460`	`[TestCaseSource(nameof(AllAnalyzers))]`
`@@ -461,9 +469,9 @@ namespace N.Core`
`461`	`469`
`462`	`470`	`public abstract class ViewModelBase<T> : INotifyPropertyChanged`
`463`	`471`	`{`
`464`		`- public event PropertyChangedEventHandler PropertyChanged;`
	`472`	`+ public event PropertyChangedEventHandler? PropertyChanged;`
`465`	`473`
`466`		`- protected bool TrySet<U>(ref U field, U value, [CallerMemberName] string propertyName = null)`
	`474`	`+ protected bool TrySet<U>(ref U field, U value, [CallerMemberName] string? propertyName = null)`
`467`	`475`	`{`
`468`	`476`	`if (EqualityComparer<U>.Default.Equals(field, value))`
`469`	`477`	`{`
`@@ -475,7 +483,7 @@ protected bool TrySet<U>(ref U field, U value, [CallerMemberName] string propert`
`475`	`483`	`return true;`
`476`	`484`	`}`
`477`	`485`
`478`		`- protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`
	`486`	`+ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)`
`479`	`487`	`{`
`480`	`488`	`this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`481`	`489`	`}`
`@@ -537,13 +545,13 @@ namespace N`
`537`	`545`
`538`	`546`	`public class GenericViewModel<T> : INotifyPropertyChanged`
`539`	`547`	`{`
`540`		`- private T p;`
	`548`	`+ private T? p;`
`541`	`549`
`542`		`- public event PropertyChangedEventHandler PropertyChanged;`
	`550`	`+ public event PropertyChangedEventHandler? PropertyChanged;`
`543`	`551`
`544`	`552`	`public string Text => $""{this.P} {this.P}"";`
`545`	`553`
`546`		`- public T P`
	`554`	`+ public T? P`
`547`	`555`	`{`
`548`	`556`	`#pragma warning disable INPC020 // Prefer expression body accessor.`
`549`	`557`	`get`
`@@ -565,7 +573,7 @@ public T P`
`565`	`573`	`}`
`566`	`574`	`}`
`567`	`575`
`568`		`- protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`
	`576`	`+ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)`
`569`	`577`	`{`
`570`	`578`	`this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`571`	`579`	`}`