Enable nullable in tests

Author: xPaw

ValveKeyValue/ValveKeyValue.Test/ApiSurfaceTestCase.cs

@@ -75,7 +75,7 @@ static void GenerateTypeApiSurface(StringBuilder sb, Type type)
                 var members = Enum.GetNames(type);
                 foreach (var member in members)
                 {
-                    var rawValue = type.GetField(member, BindingFlags.Public | BindingFlags.Static).GetValue(null);
+                    var rawValue = type.GetField(member, BindingFlags.Public | BindingFlags.Static)!.GetValue(null);
                     var convertedValue = Convert.ChangeType(rawValue, Enum.GetUnderlyingType(type), CultureInfo.InvariantCulture);
 
                     sb.Append("    ");
@@ -172,7 +172,7 @@ static void GenerateTypeApiSurface(StringBuilder sb, Type type)
 
         static bool IsHidingMember(MethodInfo method)
         {
-            var baseType = method.DeclaringType.GetTypeInfo().BaseType;
+            var baseType = method.DeclaringType!.GetTypeInfo().BaseType;
             if (baseType == null)
             {
                 return false;
@@ -233,7 +233,7 @@ static string GetTypeAsString(Type type)
         {
             if (type.IsArray)
             {
-                var elementType = type.GetElementType();
+                var elementType = type.GetElementType()!;
                 var elementTypeAsString = GetTypeAsString(elementType);
                 return string.Format(CultureInfo.InvariantCulture, "{0}[]", elementTypeAsString);
             }

ValveKeyValue/ValveKeyValue.Test/Binary/BinaryObjectConsecutiveDeserializationTestCase.cs

@@ -47,13 +47,13 @@ public void SetUp()
         class FirstObject
         {
             [KVProperty("firstkey")]
-            public string StringValue { get; set; }
+            public required string StringValue { get; set; }
         }
 
         class SecondObject
         {
             [KVProperty("secondkey")]
-            public string StringValue { get; set; }
+            public required string StringValue { get; set; }
         }
     }
 }

ValveKeyValue/ValveKeyValue.Test/Binary/BinaryObjectConsecutiveSerializationTestCase.cs

@@ -7,11 +7,11 @@ public void SerializesToBinaryStructure()
         {
             var firstObj = KVObject.ListCollection();
             firstObj.Add("firstkey", "firstvalue");
-            var first = new KVDocument(null, "FirstObject", firstObj);
+            var first = new KVDocument(null!, "FirstObject", firstObj);
 
             var secondObj = KVObject.ListCollection();
             secondObj.Add("secondkey", "secondvalue");
-            var second = new KVDocument(null, "SecondObject", secondObj);
+            var second = new KVDocument(null!, "SecondObject", secondObj);
 
             var expectedData = new byte[]
             {

ValveKeyValue/ValveKeyValue.Test/Binary/BinaryObjectDeserializationTestCase.cs

@@ -81,10 +81,10 @@ public void SetUp()
         class TestObject
         {
             [KVProperty("key")]
-            public string StringValue { get; set; }
+            public required string StringValue { get; set; }
 
             [KVProperty("key_utf8")]
-            public string StringUtf8Value { get; set; }
+            public required string StringUtf8Value { get; set; }
 
             [KVProperty("int")]
             public int TheIntegerValue { get; set; }

ValveKeyValue/ValveKeyValue.Test/Binary/BinaryObjectSerializationTestCase.cs

@@ -13,7 +13,7 @@ public void SerializesToBinaryStructure()
             kvo.Add("ptr", new IntPtr(0x12345678));
             kvo.Add("lng", 0x8877665544332211u);
             kvo.Add("i64", 0x0102030405060708);
-            var doc = new KVDocument(null, "TestObject", kvo);
+            var doc = new KVDocument(null!, "TestObject", kvo);
 
             var expectedData = new byte[]
             {
@@ -71,7 +71,7 @@ public void NewValueTypesAreWidenedInBinarySerialization()
             kvo.Add("f64", 3.14);
             kvo.Add("blob", KVObject.Blob([0xAB, 0xCD]));
             kvo.Add("null", KVObject.Null());
-            var doc = new KVDocument(null, "Test", kvo);
+            var doc = new KVDocument(null!, "Test", kvo);
 
             using var ms = new MemoryStream();
             KVSerializer.Create(KVSerializationFormat.KeyValues1Binary).Serialize(ms, doc);

ValveKeyValue/ValveKeyValue.Test/Binary/StringTableFromScratchTestCase.cs

@@ -12,7 +12,7 @@ public void PopulatesStringTableDuringSerialization()
             var kv = KVObject.ListCollection();
             kv.Add("key", "value");
             kv.Add("child", child);
-            var doc = new KVDocument(null, "root", kv);
+            var doc = new KVDocument(null!, "root", kv);
 
             var stringTable = new StringTable();
 

ValveKeyValue/ValveKeyValue.Test/ConversionCoverageTestCase.cs

@@ -345,7 +345,7 @@ public void DictBackedCollectionSetNullStoresNullValue()
 
             Assert.That(data.Count, Is.EqualTo(2));
 
-            data["key1"] = null;
+            data["key1"] = null!;
 
             Assert.That(data.Count, Is.EqualTo(2));
             Assert.That(data["key1"].IsNull, Is.True);

ValveKeyValue/ValveKeyValue.Test/EdgeCaseTestCase.cs

@@ -86,7 +86,7 @@ public void IndexerSetNullStoresNullValue()
             obj.Add("a", "1");
             obj.Add("b", "2");
 
-            obj["a"] = null;
+            obj["a"] = null!;
 
             Assert.That(obj.Count, Is.EqualTo(2));
             Assert.That(obj["a"].IsNull, Is.True);
@@ -99,7 +99,7 @@ public void IndexerSetNullOnMissingKeyStoresNullValue()
             var obj = KVObject.ListCollection();
             obj.Add("a", "1");
 
-            obj["nonexistent"] = null;
+            obj["nonexistent"] = null!;
 
             Assert.That(obj.Count, Is.EqualTo(2));
             Assert.That((string)obj["a"], Is.EqualTo("1"));
@@ -429,7 +429,7 @@ public void TryGetValueReturnsTrueForExisting()
 
             Assert.That(result, Is.True);
             Assert.That(child, Is.Not.Null);
-            Assert.That((string)child, Is.EqualTo("value"));
+            Assert.That((string)child!, Is.EqualTo("value"));
         }
 
         [Test]
@@ -440,7 +440,7 @@ public void TryGetValueOnDictBackedCollection()
             var obj = KVSerializer.Create(KVSerializationFormat.KeyValues3Text).Deserialize(stream);
 
             Assert.That(obj.TryGetValue("key1", out var found), Is.True);
-            Assert.That((string)found, Is.EqualTo("value1"));
+            Assert.That((string)found!, Is.EqualTo("value1"));
 
             Assert.That(obj.TryGetValue("missing", out var notFound), Is.False);
             Assert.That(notFound, Is.Null);
@@ -700,7 +700,7 @@ public void IndexerSetNullOnMissingKeyInDictCollectionStoresNullValue()
             var obj = KVObject.Collection();
             obj.Add("a", 1);
 
-            obj["nonexistent"] = null;
+            obj["nonexistent"] = null!;
 
             Assert.That(obj.Count, Is.EqualTo(2));
             Assert.That((int)obj["a"], Is.EqualTo(1));
@@ -738,9 +738,9 @@ public void DictAndListCollectionsHaveConsistentBehavior()
             {
                 // TryGetValue
                 Assert.That(dict.TryGetValue("a", out var dictA), Is.True);
-                Assert.That((int)dictA, Is.EqualTo(1));
+                Assert.That((int)dictA!, Is.EqualTo(1));
                 Assert.That(list.TryGetValue("a", out var listA), Is.True);
-                Assert.That((int)listA, Is.EqualTo(1));
+                Assert.That((int)listA!, Is.EqualTo(1));
                 Assert.That(dict.TryGetValue("missing", out _), Is.False);
                 Assert.That(list.TryGetValue("missing", out _), Is.False);
 

ValveKeyValue/ValveKeyValue.Test/Helpers/KVSerializerExtensions.cs

@@ -2,19 +2,19 @@ namespace ValveKeyValue.Test
 {
     static class KVSerializerExtensions
     {
-        public static KVDocument Deserialize(this KVSerializer serializer, byte[] data, KVSerializerOptions options = null)
+        public static KVDocument Deserialize(this KVSerializer serializer, byte[] data, KVSerializerOptions? options = null)
         {
             using var ms = new MemoryStream(data);
             return serializer.Deserialize(ms, options);
         }
 
-        public static TObject Deserialize<TObject>(this KVSerializer serializer, byte[] data, KVSerializerOptions options = null)
+        public static TObject Deserialize<TObject>(this KVSerializer serializer, byte[] data, KVSerializerOptions? options = null)
         {
             using var ms = new MemoryStream(data);
             return serializer.Deserialize<TObject>(ms, options);
         }
 
-        public static KVDocument Deserialize(this KVSerializer serializer, string text, KVSerializerOptions options = null)
+        public static KVDocument Deserialize(this KVSerializer serializer, string text, KVSerializerOptions? options = null)
         {
             using var ms = new MemoryStream();
             using var writer = new StreamWriter(ms);
@@ -26,7 +26,7 @@ public static KVDocument Deserialize(this KVSerializer serializer, string text,
             return serializer.Deserialize(ms, options);
         }
 
-        public static TObject Deserialize<TObject>(this KVSerializer serializer, string text, KVSerializerOptions options = null)
+        public static TObject Deserialize<TObject>(this KVSerializer serializer, string text, KVSerializerOptions? options = null)
         {
             using var ms = new MemoryStream();
             using var writer = new StreamWriter(ms);

ValveKeyValue/ValveKeyValue.Test/IKVTextReader.cs

@@ -2,8 +2,8 @@ namespace ValveKeyValue.Test
 {
     interface IKVTextReader
     {
-        KVObject Read(string resourceName, KVSerializerOptions options = null);
+        KVObject Read(string resourceName, KVSerializerOptions? options = null);
 
-        T Read<T>(string resourceName, KVSerializerOptions options = null);
+        T Read<T>(string resourceName, KVSerializerOptions? options = null);
     }
 }