Enable nullable on ObjectModel tests (#3502)

Evangelink · web-flow · commit 76485276d60f · 2022-03-31T10:19:22.000Z
diff --git a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs
@@ -8,17 +8,18 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.PlatformTests;
 
 [TestClass]
 public class DiaSessionTests : IntegrationTestBase
 {
+#if NETFRAMEWORK
     private const string NET451 = "net451";
+#else
     private const string NETCOREAPP21 = "netcoreapp2.1";
+#endif
 
-    public static string GetAndSetTargetFrameWork(IntegrationTestEnvironment testEnvironment)
+    public static string? GetAndSetTargetFrameWork(IntegrationTestEnvironment testEnvironment)
     {
         var currentTargetFrameWork = testEnvironment.TargetFramework;
         testEnvironment.TargetFramework =
@@ -125,7 +126,7 @@ public void DiaSessionPerfTest()
         _testEnvironment.TargetFramework = currentTargetFrameWork;
     }
 
-    private void ValidateLineNumbers(int min, int max)
+    private static void ValidateLineNumbers(int min, int max)
     {
         // Release builds optimize code, hence min line numbers are different.
         if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))
@@ -149,7 +150,7 @@ private void ValidateLineNumbers(int min, int max)
         }
     }
 
-    private void ValidateMinLineNumber(int expected, int actual)
+    private static void ValidateMinLineNumber(int expected, int actual)
     {
         // Release builds optimize code, hence min line numbers are different.
         if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/BaseTestRunCriteriaTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/BaseTestRunCriteriaTests.cs
@@ -6,8 +6,6 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Client;
 
 [TestClass]
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/DiscoveryCriteriaTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/DiscoveryCriteriaTests.cs
@@ -9,8 +9,6 @@
 
 using Newtonsoft.Json;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Client;
 
 [TestClass]
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/TestRunCriteriaTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/TestRunCriteriaTests.cs
@@ -9,8 +9,6 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
 
 [TestClass]
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomKeyValueConverterTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomKeyValueConverterTests.cs
@@ -8,8 +8,6 @@
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
 
 [TestClass]
@@ -68,6 +66,7 @@ public void CustomKeyValueConverterShouldDeserializeEmptyKeyOrValue()
 
         var data = _customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as KeyValuePair<string, string>[];
 
+        Assert.IsNotNull(data);
         Assert.AreEqual(1, data.Length);
         Assert.AreEqual(string.Empty, data[0].Key);
         Assert.AreEqual(string.Empty, data[0].Value);
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomStringArrayConverterTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomStringArrayConverterTests.cs
@@ -7,8 +7,6 @@
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
 
 [TestClass]
@@ -51,6 +49,7 @@ public void CustomStringArrayConverterShouldDeserializeNullKeyOrValue()
 
         var data = _customStringArrayConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as string[];
 
+        Assert.IsNotNull(data);
         Assert.AreEqual(2, data.Length);
         Assert.IsNull(data[0]);
         Assert.AreEqual("val", data[1]);
@@ -63,6 +62,7 @@ public void CustomStringArrayConverterShouldDeserializeEmptyKeyOrValue()
 
         var data = _customStringArrayConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as string[];
 
+        Assert.IsNotNull(data);
         Assert.AreEqual(2, data.Length);
         Assert.AreEqual(string.Empty, data[0]);
         Assert.AreEqual(string.Empty, data[1]);
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/DataCollector/Events/SessionEventsTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/DataCollector/Events/SessionEventsTests.cs
@@ -6,8 +6,6 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
 
 [TestClass]
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/FrameworkTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/FrameworkTests.cs
@@ -5,8 +5,6 @@
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
 
 [TestClass]
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Hosting/TestRunnerConnectionInfoExtensionsTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Hosting/TestRunnerConnectionInfoExtensionsTests.cs
@@ -6,8 +6,6 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#nullable disable
-
 namespace TestPlatform.TestHostProvider.UnitTests.Hosting;
 
 [TestClass]
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/RunSettings/RunConfigurationTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/RunSettings/RunConfigurationTests.cs
@@ -10,8 +10,6 @@
 
 using MSTest.TestFramework.AssertExtensions;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
 
 [TestClass]
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/RunSettings/RunSettingsTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/RunSettings/RunSettingsTests.cs
@@ -7,8 +7,6 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
 
 [TestClass]
@@ -28,10 +26,10 @@ public ChildRunSettings() : base("SomeName")
         {
         }
 
-        public override XmlElement ToXml()
+        public override XmlElement? ToXml()
         {
             var document = new XmlDocument();
-            using (XmlWriter writer = document.CreateNavigator().AppendChild())
+            using (XmlWriter writer = document.CreateNavigator()!.AppendChild())
             {
                 new XmlSerializer(typeof(ChildRunSettings)).Serialize(writer, this);
             }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestCaseTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestCaseTests.cs
@@ -7,17 +7,14 @@
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
 
 [TestClass]
 public class TestCaseTests
 {
-    private TestCase _testCase;
+    private readonly TestCase _testCase;
 
-    [TestInitialize]
-    public void TestInit()
+    public TestCaseTests()
     {
         _testCase = new TestCase("sampleTestClass.sampleTestCase", new Uri("executor://sampleTestExecutor"), "sampleTest.dll");
     }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestObjectTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestObjectTests.cs
@@ -8,8 +8,6 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
 
 [TestClass]
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestResultTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestResultTests.cs
@@ -8,8 +8,6 @@
 
 using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
 
 [TestClass]
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/AssemblyHelperTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/AssemblyHelperTests.cs
@@ -11,8 +11,6 @@
 
 using Moq;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Utilities;
 
 [TestClass]
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/FilterHelperTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/FilterHelperTests.cs
@@ -9,8 +9,6 @@
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Utilities;
 
 [TestClass]
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/XmlRunSettingsUtilitiesTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/XmlRunSettingsUtilitiesTests.cs
@@ -11,8 +11,6 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#nullable disable
-
 namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Utilities;
 
 [TestClass]
@@ -292,7 +290,7 @@ public void GetInProcDataCollectionRunSettingsThrowsExceptionWhenXmlNotValid()
     [TestMethod]
     public void CreateDefaultRunSettingsShouldReturnABasicRunSettings()
     {
-        var defaultRunSettings = XmlRunSettingsUtilities.CreateDefaultRunSettings().CreateNavigator().OuterXml;
+        var defaultRunSettings = XmlRunSettingsUtilities.CreateDefaultRunSettings().CreateNavigator()!.OuterXml;
         var expectedRunSettings = string.Join(Environment.NewLine,
             "<RunSettings>",
             "  <DataCollectionRunSettings>",
@@ -1195,7 +1193,7 @@ public void GetDataCollectorsFriendlyNameShouldReturnListOfFriendlyName()
         CollectionAssert.AreEqual(friendlyNameList, new List<string> { "DummyDataCollector1", "DummyDataCollector2" });
     }
 
-    private string ConvertOutOfProcDataCollectionSettingsToInProcDataCollectionSettings(string settings)
+    private static string ConvertOutOfProcDataCollectionSettingsToInProcDataCollectionSettings(string settings)
     {
         return
             settings.Replace("DataCollectionRunSettings", "InProcDataCollectionRunSettings")

Original file line number	Diff line number	Diff line change
`@@ -8,17 +8,18 @@`
`8`	`8`	`using Microsoft.VisualStudio.TestPlatform.ObjectModel;`
`9`	`9`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
`10`	`10`
`11`		`-#nullable disable`
`12`		`-`
`13`	`11`	`namespace Microsoft.TestPlatform.ObjectModel.PlatformTests;`
`14`	`12`
`15`	`13`	`[TestClass]`
`16`	`14`	`public class DiaSessionTests : IntegrationTestBase`
`17`	`15`	`{`
	`16`	`+#if NETFRAMEWORK`
`18`	`17`	`private const string NET451 = "net451";`
	`18`	`+#else`
`19`	`19`	`private const string NETCOREAPP21 = "netcoreapp2.1";`
	`20`	`+#endif`
`20`	`21`
`21`		`- public static string GetAndSetTargetFrameWork(IntegrationTestEnvironment testEnvironment)`
	`22`	`+ public static string? GetAndSetTargetFrameWork(IntegrationTestEnvironment testEnvironment)`
`22`	`23`	`{`
`23`	`24`	`var currentTargetFrameWork = testEnvironment.TargetFramework;`
`24`	`25`	`testEnvironment.TargetFramework =`
`@@ -125,7 +126,7 @@ public void DiaSessionPerfTest()`
`125`	`126`	`_testEnvironment.TargetFramework = currentTargetFrameWork;`
`126`	`127`	`}`
`127`	`128`
`128`		`- private void ValidateLineNumbers(int min, int max)`
	`129`	`+ private static void ValidateLineNumbers(int min, int max)`
`129`	`130`	`{`
`130`	`131`	`// Release builds optimize code, hence min line numbers are different.`
`131`	`132`	`if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))`
`@@ -149,7 +150,7 @@ private void ValidateLineNumbers(int min, int max)`
`149`	`150`	`}`
`150`	`151`	`}`
`151`	`152`
`152`		`- private void ValidateMinLineNumber(int expected, int actual)`
	`153`	`+ private static void ValidateMinLineNumber(int expected, int actual)`
`153`	`154`	`{`
`154`	`155`	`// Release builds optimize code, hence min line numbers are different.`
`155`	`156`	`if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`	`using Microsoft.VisualStudio.TestPlatform.ObjectModel;`
`8`	`8`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
`9`	`9`
`10`		`-#nullable disable`
`11`		`-`
`12`	`10`	`namespace Microsoft.TestPlatform.ObjectModel.UnitTests;`
`13`	`11`
`14`	`12`	`[TestClass]`
`@@ -28,10 +26,10 @@ public ChildRunSettings() : base("SomeName")`
`28`	`26`	`{`
`29`	`27`	`}`
`30`	`28`
`31`		`- public override XmlElement ToXml()`
	`29`	`+ public override XmlElement? ToXml()`
`32`	`30`	`{`
`33`	`31`	`var document = new XmlDocument();`
`34`		`- using (XmlWriter writer = document.CreateNavigator().AppendChild())`
	`32`	`+ using (XmlWriter writer = document.CreateNavigator()!.AppendChild())`
`35`	`33`	`{`
`36`	`34`	`new XmlSerializer(typeof(ChildRunSettings)).Serialize(writer, this);`
`37`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,17 +7,14 @@`
`7`	`7`
`8`	`8`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
`9`	`9`
`10`		`-#nullable disable`
`11`		`-`
`12`	`10`	`namespace Microsoft.TestPlatform.ObjectModel.UnitTests;`
`13`	`11`
`14`	`12`	`[TestClass]`
`15`	`13`	`public class TestCaseTests`
`16`	`14`	`{`
`17`		`- private TestCase _testCase;`
	`15`	`+ private readonly TestCase _testCase;`
`18`	`16`
`19`		`- [TestInitialize]`
`20`		`- public void TestInit()`
	`17`	`+ public TestCaseTests()`
`21`	`18`	`{`
`22`	`19`	`_testCase = new TestCase("sampleTestClass.sampleTestCase", new Uri("executor://sampleTestExecutor"), "sampleTest.dll");`
`23`	`20`	`}`