Fix tests.

Author: JohanLarsson

ReflectionAnalyzers.Tests/LibrarySettings.cs

@@ -1,7 +1,9 @@
 namespace ReflectionAnalyzers.Tests
 {
     using System.Runtime.CompilerServices;
+
     using Gu.Roslyn.Asserts;
+
     using Microsoft.CodeAnalysis;
 
     internal static class LibrarySettings
@@ -14,14 +16,15 @@ internal static class LibrarySettings
                                                                     .WithCompilationOptions(x => x.WithNullableContextOptions(NullableContextOptions.Enable));
 
         internal static readonly Settings Roslyn = Settings.Default
-                                                           .WithCompilationOptions(x => x.WithNullableContextOptions(NullableContextOptions.Enable).WithSuppressedDiagnostics("CS1701"))
+                                                           .WithCompilationOptions(x => x.WithSuppressedDiagnostics("CS1701"))
                                                            .WithMetadataReferences(MetadataReferences.Transitive(typeof(Microsoft.CodeAnalysis.CodeFixes.CodeFixProvider)));
 
+        internal static readonly Settings SuppressCs8600 = Settings.Default.WithCompilationOptions(x => x.WithSuppressedDiagnostics("CS8600"));
+
         [ModuleInitializer]
         internal static void Initialize()
         {
             Settings.Default = Settings.Default
-                                       .WithCompilationOptions(x => x.WithNullableContextOptions(NullableContextOptions.Disable))
                                        .WithMetadataReferences(MetadataReferences.Transitive(typeof(LibrarySettings), typeof(System.Windows.Controls.Control), typeof(System.Windows.Forms.Control)));
         }
     }

…s/REFL001CastReturnValueTests/CodeFix.cs …Tests/CodeFix.ActivatorCreateInstance.csReflectionAnalyzers.Tests/REFL001CastReturnValueTests/CodeFix.cs renamed to ReflectionAnalyzers.Tests/REFL001CastReturnValueTests/CodeFix.ActivatorCreateInstance.cs ReflectionAnalyzers.Tests/REFL001CastReturnValueTests/CodeFix.cs renamed to ReflectionAnalyzers.Tests/REFL001CastReturnValueTests/CodeFix.ActivatorCreateInstance.cs

@@ -33,6 +33,41 @@ namespace N
 {
     using System;
 
+    public class C
+    {
+        public static void M()
+        {
+            var c = (C)Activator.CreateInstance(typeof(C));
+        }
+    }
+}";
+                RoslynAssert.CodeFix(Analyzer, Fix, ExpectedDiagnostic, before, after, settings: LibrarySettings.SuppressCs8600);
+            }
+
+            [Test]
+            public static void TypeofNullableDisabled()
+            {
+                var before = @"
+#nullable disable
+namespace N
+{
+    using System;
+
+    public class C
+    {
+        public static void M()
+        {
+            var c = ↓Activator.CreateInstance(typeof(C));
+        }
+    }
+}";
+
+                var after = @"
+#nullable disable
+namespace N
+{
+    using System;
+
     public class C
     {
         public static void M()
@@ -76,7 +111,7 @@ public static void M()
         }
     }
 }";
-                RoslynAssert.CodeFix(Analyzer, Fix, ExpectedDiagnostic, before, after);
+                RoslynAssert.CodeFix(Analyzer, Fix, ExpectedDiagnostic, before, after, settings: LibrarySettings.SuppressCs8600);
             }
 
             [TestCase("Activator.CreateInstance(typeof(T))")]

…sts/REFL001CastReturnValueTests/Valid.cs …ueTests/Valid.ActivatorCreateInstance.csReflectionAnalyzers.Tests/REFL001CastReturnValueTests/Valid.cs renamed to ReflectionAnalyzers.Tests/REFL001CastReturnValueTests/Valid.ActivatorCreateInstance.cs ReflectionAnalyzers.Tests/REFL001CastReturnValueTests/Valid.cs renamed to ReflectionAnalyzers.Tests/REFL001CastReturnValueTests/Valid.ActivatorCreateInstance.cs

@@ -1,4 +1,4 @@
-namespace ReflectionAnalyzers.Tests.REFL001CastReturnValueTests
+namespace ReflectionAnalyzers.Tests.REFL001CastReturnValueTests
 {
     using Gu.Roslyn.Asserts;
     using Microsoft.CodeAnalysis;
@@ -22,12 +22,31 @@ namespace N
 
     public class C
     {
-        public static object  M<T>() => Activator.CreateInstance<T>();
+        public static object? M<T>() => Activator.CreateInstance<T>();
     }
 }".AssertReplace("CreateInstance<T>()", call);
 
                 RoslynAssert.Valid(Analyzer, Descriptor, code);
             }
+
+            [TestCase("Activator.CreateInstance(typeof(C))")]
+            [TestCase("Activator.CreateInstance(typeof(C))!")]
+            [TestCase("Activator.CreateInstance(typeof(C)) ?? throw new Exception()")]
+            public static void Typeof(string expression)
+            {
+                var code = @"
+namespace N
+{
+    using System;
+
+    public class C
+    {
+#pragma warning disable CS8600
+        public static object? M() => (C)Activator.CreateInstance(typeof(C));
+    }
+}".AssertReplace("Activator.CreateInstance(typeof(C))", expression);
+                RoslynAssert.Valid(Analyzer, Descriptor, code);
+            }
         }
     }
 }