[Tests] Nullable (#5882)

Co-authored-by: Piotr Kiełkowicz <[email protected]> Co-authored-by: Mikel Blanchard <[email protected]>
open-telemetry · Oct 11, 2024 · f3cd0e7 · f3cd0e7
1 parent 36d5900
commit f3cd0e7
Show file tree

Hide file tree

Showing 38 changed files with 211 additions and 173 deletions.
diff --git a/src/Shared/PooledList.cs b/src/Shared/PooledList.cs
@@ -11,7 +11,7 @@ namespace OpenTelemetry.Internal;
 
 internal readonly struct PooledList<T> : IEnumerable<T>, ICollection
 {
-    private static int lastAllocatedSize = 64;
+    public static int LastAllocatedSize = 64;
 
     private readonly T[] buffer;
 
@@ -36,7 +36,7 @@ public ref T this[int index]
 
     public static PooledList<T> Create()
     {
-        return new PooledList<T>(ArrayPool<T>.Shared.Rent(lastAllocatedSize), 0);
+        return new PooledList<T>(ArrayPool<T>.Shared.Rent(LastAllocatedSize), 0);
     }
 
     public static void Add(ref PooledList<T> list, T item)
@@ -47,10 +47,10 @@ public static void Add(ref PooledList<T> list, T item)
 
         if (list.Count >= buffer.Length)
         {
-            lastAllocatedSize = buffer.Length * 2;
+            LastAllocatedSize = buffer.Length * 2;
             var previousBuffer = buffer;
 
-            buffer = ArrayPool<T>.Shared.Rent(lastAllocatedSize);
+            buffer = ArrayPool<T>.Shared.Rent(LastAllocatedSize);
 
             var span = previousBuffer.AsSpan();
             span.CopyTo(buffer);

diff --git a/test/OpenTelemetry.Tests/Internal/PooledListTest.cs b/test/OpenTelemetry.Tests/Internal/PooledListTest.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Collections;
-using System.Reflection;
 
 using Xunit;
 
@@ -44,17 +43,9 @@ public void Verify_CreateAddClear()
     [Fact]
     public void Verify_AllocatedSize()
     {
-        int GetLastAllocatedSize(PooledList<int> pooledList)
-        {
-            var value = typeof(PooledList<int>)
-                .GetField("lastAllocatedSize", BindingFlags.NonPublic | BindingFlags.Static)
-                .GetValue(pooledList);
-            return (int)value;
-        }
-
         var pooledList = PooledList<int>.Create();
 
-        var size = GetLastAllocatedSize(pooledList);
+        var size = PooledList<int>.LastAllocatedSize;
         Assert.Equal(64, size);
 
         // The Add() method has a condition to double the size of the buffer
@@ -65,7 +56,7 @@ int GetLastAllocatedSize(PooledList<int> pooledList)
             PooledList<int>.Add(ref pooledList, i);
         }
 
-        size = GetLastAllocatedSize(pooledList);
+        size = PooledList<int>.LastAllocatedSize;
         Assert.Equal(128, size);
     }
 

diff --git a/test/OpenTelemetry.Tests/Internal/SelfDiagnosticsConfigParserTest.cs b/test/OpenTelemetry.Tests/Internal/SelfDiagnosticsConfigParserTest.cs
@@ -69,7 +69,7 @@ public void SelfDiagnosticsConfigParser_TryParseLogLevel()
                     ""FileSize"": 1024,
                     ""LogLevel"": ""Error""
                     }";
-        Assert.True(SelfDiagnosticsConfigParser.TryParseLogLevel(configJson, out string logLevelString));
+        Assert.True(SelfDiagnosticsConfigParser.TryParseLogLevel(configJson, out string? logLevelString));
         Assert.Equal("Error", logLevelString);
     }
 }
diff --git a/test/OpenTelemetry.Tests/Internal/SelfDiagnosticsEventListenerTest.cs b/test/OpenTelemetry.Tests/Internal/SelfDiagnosticsEventListenerTest.cs
@@ -21,7 +21,7 @@ public void SelfDiagnosticsEventListener_constructor_Invalid_Input()
         // no configRefresher object
         Assert.Throws<ArgumentNullException>(() =>
         {
-            _ = new SelfDiagnosticsEventListener(EventLevel.Error, null);
+            _ = new SelfDiagnosticsEventListener(EventLevel.Error, null!);
         });
     }
 

diff --git a/test/OpenTelemetry.Tests/Internal/WildcardHelperTests.cs b/test/OpenTelemetry.Tests/Internal/WildcardHelperTests.cs
@@ -30,7 +30,7 @@ public void WildcardRegex_ShouldMatch(string[] patterns, string matchWith, bool
     [InlineData("a", false)]
     [InlineData("a.*", true)]
     [InlineData("a.?", true)]
-    public void Verify_ContainsWildcard(string pattern, bool expected)
+    public void Verify_ContainsWildcard(string? pattern, bool expected)
     {
         Assert.Equal(expected, WildcardHelper.ContainsWildcard(pattern));
     }

diff --git a/test/OpenTelemetry.Tests/Logs/BatchLogRecordExportProcessorTests.cs b/test/OpenTelemetry.Tests/Logs/BatchLogRecordExportProcessorTests.cs
@@ -43,20 +43,23 @@ public void StateValuesAndScopeBufferingTest()
         Assert.NotNull(logRecord.AttributeStorage);
         Assert.NotNull(logRecord.ILoggerData.BufferedScopes);
 
-        KeyValuePair<string, object> actualState = logRecord.StateValues[0];
+        KeyValuePair<string, object?> actualState = logRecord.StateValues[0];
 
         Assert.Same("Value", actualState.Key);
         Assert.Same("Hello world", actualState.Value);
 
+        int scopeCount = 0;
         bool foundScope = false;
 
-        logRecord.ForEachScope<object>(
+        logRecord.ForEachScope<object?>(
             (s, o) =>
             {
                 foundScope = ReferenceEquals(s.Scope, exportedItems);
+                scopeCount++;
             },
             null);
 
+        Assert.Equal(1, scopeCount);
         Assert.True(foundScope);
 
         processor.Shutdown();