Fixed nullable warnings

Sidekick-Poe · Jul 25, 2024 · 796149e · 796149e
1 parent d251ec2
commit 796149e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/src/Sidekick.Mock/MockClipboardProvider.cs b/src/Sidekick.Mock/MockClipboardProvider.cs
@@ -6,7 +6,7 @@ namespace Sidekick.Mock
 {
     public class MockClipboardProvider : IClipboardProvider
     {
-        public Task<string> Copy()
+        public Task<string?> Copy()
         {
             throw new NotImplementedException();
         }
@@ -16,12 +16,12 @@ public Task<string> CopyAdvanced()
             throw new NotImplementedException();
         }
 
-        public Task<string> GetText()
+        public Task<string?> GetText()
         {
             throw new NotImplementedException();
         }
 
-        public Task SetText(string text)
+        public Task SetText(string? text)
         {
             return Task.CompletedTask;
         }

diff --git a/src/Sidekick.Mock/MockKeyboardProvider.cs b/src/Sidekick.Mock/MockKeyboardProvider.cs
@@ -11,7 +11,7 @@ public class MockKeyboardProvider : IKeyboardProvider
 
 #pragma warning disable CS0067
 
-        public event Action<string> OnKeyDown;
+        public event Action<string>? OnKeyDown;
 
 #pragma warning restore CS0067
 

diff --git a/src/Sidekick.Mock/MockProcessProvider.cs b/src/Sidekick.Mock/MockProcessProvider.cs
@@ -11,9 +11,9 @@ public class MockProcessProvider : IProcessProvider
     {
         public string ClientLogPath => string.Empty;
 
-        public event Action OnFocus;
+        public event Action? OnFocus;
 
-        public event Action OnBlur;
+        public event Action? OnBlur;
 
         public bool IsPathOfExileInFocus => true;
         public bool IsSidekickInFocus => false;

diff --git a/tests/Sidekick.Apis.Poe.Tests/ItemExtensions.cs b/tests/Sidekick.Apis.Poe.Tests/ItemExtensions.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Sidekick.Common.Game.Items;
 using Xunit;
 
@@ -8,7 +7,7 @@ public static class ItemExtensions
     {
         public static void AssertHasModifier(this Item actual, ModifierCategory expectedCategory, string expectedText, params double[] expectedValues)
         {
-            var modifiers = actual?.ModifierLines
+            var modifiers = actual.ModifierLines
                 .SelectMany(line => line.Modifiers.Select(modifier => new
                 {
                     Line = line,
@@ -19,7 +18,7 @@ public static void AssertHasModifier(this Item actual, ModifierCategory expected
             Assert.Equal(expectedText, actualModifier?.Modifier.Text);
             Assert.Equal(expectedCategory, actualModifier?.Modifier.Category);
 
-            Assert.True(actualModifier.Line.Values.Count == expectedValues.Length);
+            Assert.True(actualModifier?.Line.Values.Count == expectedValues.Length);
 
             for (var i = 0; i < expectedValues.Length; i++)
             {
@@ -29,18 +28,18 @@ public static void AssertHasModifier(this Item actual, ModifierCategory expected
 
         public static void AssertHasAlternateModifier(this Item actual, ModifierCategory expectedCategory, string expectedText, params double[] expectedValues)
         {
-            var modifiers = actual?.ModifierLines
+            var modifiers = actual.ModifierLines
                 .SelectMany(line => line.Modifiers.Select(modifier => new
                 {
                     Line = line,
                     Modifier = modifier,
                 }));
 
-            var actualModifier = modifiers?.FirstOrDefault(x => expectedCategory == x.Modifier.Category && expectedText == x.Modifier.Text);
+            var actualModifier = modifiers.FirstOrDefault(x => expectedCategory == x.Modifier.Category && expectedText == x.Modifier.Text);
             Assert.Equal(expectedText, actualModifier?.Modifier.Text);
             Assert.Equal(expectedCategory, actualModifier?.Modifier.Category);
 
-            Assert.True(actualModifier.Line.Values.Count >= expectedValues.Length);
+            Assert.True(actualModifier?.Line.Values.Count >= expectedValues.Length);
 
             for (var i = 0; i < expectedValues.Length; i++)
             {
@@ -50,12 +49,12 @@ public static void AssertHasAlternateModifier(this Item actual, ModifierCategory
 
         public static void AssertHasPseudoModifier(this Item actual, string expectedText, double? expectedValue = null)
         {
-            var actualModifier = actual?.PseudoModifiers?.FirstOrDefault(x => expectedText == x.Text);
-            Assert.Equal(expectedText, actualModifier.Text);
+            var actualModifier = actual.PseudoModifiers.FirstOrDefault(x => expectedText == x.Text);
+            Assert.Equal(expectedText, actualModifier?.Text);
 
             if (expectedValue != null)
             {
-                Assert.Equal(expectedValue, actualModifier.Value);
+                Assert.Equal(expectedValue, actualModifier?.Value);
             }
         }
     }