Fixed remaining warnings

jschick04 · jschick04 · commit 4316ed2c3aaf · 2026-04-10T20:30:29.000-05:00
diff --git a/src/EventLogExpert.Eventing.Tests/Providers/ProviderMetadataTests.cs b/src/EventLogExpert.Eventing.Tests/Providers/ProviderMetadataTests.cs
@@ -32,7 +32,7 @@ public async Task Channels_WhenAccessedConcurrently_ShouldReturnValidData()
         // Assert
         var results = tasks.Select(t => t.Result).ToList();
         Assert.All(results, Assert.NotNull);
-        Assert.All(results, Assert.NotEmpty);
+        Assert.All(results, r => Assert.NotEmpty(r!));
     }
 
     [Fact]
@@ -598,8 +598,8 @@ public async Task Opcodes_WhenAccessedConcurrently_ShouldReturnValidData()
 
         // Assert
         var results = tasks.Select(t => t.Result).ToList();
-        Assert.All(results, r => Assert.NotNull(r));
-        Assert.All(results, r => Assert.NotEmpty(r));
+        Assert.All(results, Assert.NotNull);
+        Assert.All(results, r => Assert.NotEmpty(r!));
     }
 
     [Fact]
@@ -741,8 +741,8 @@ public async Task Tasks_WhenAccessedConcurrently_ShouldReturnValidData()
 
         // Assert
         var results = tasks.Select(t => t.Result).ToList();
-        Assert.All(results, r => Assert.NotNull(r));
-        Assert.All(results, r => Assert.NotEmpty(r));
+        Assert.All(results, Assert.NotNull);
+        Assert.All(results, r => Assert.NotEmpty(r!));
     }
 
     [Fact]
diff --git a/src/EventLogExpert.Eventing.Tests/Readers/EventLogReaderTests.cs b/src/EventLogExpert.Eventing.Tests/Readers/EventLogReaderTests.cs
@@ -2,7 +2,6 @@
 // // Licensed under the MIT License.
 
 using EventLogExpert.Eventing.Helpers;
-using EventLogExpert.Eventing.Models;
 using EventLogExpert.Eventing.Readers;
 using EventLogExpert.Eventing.Tests.TestUtils.Constants;
 
@@ -608,12 +607,12 @@ public void TryGetEvents_WhenRenderXmlTrue_XmlShouldBeValidFormat()
         // Assert
         Assert.True(success);
 
-        if (events.Length > 0 && !string.IsNullOrEmpty(events[0].Xml))
+        if (events.Length > 0 && events[0].Xml is { } xml && !string.IsNullOrEmpty(xml))
         {
             // XML should start with <?xml or <Event
             Assert.True(
-                events[0].Xml.StartsWith("<?xml") || events[0].Xml.StartsWith("<Event"),
-                $"Expected XML to start with '<?xml' or '<Event', but got: {events[0].Xml[..Math.Min(50, events[0].Xml.Length)]}");
+                xml.StartsWith("<?xml") || xml.StartsWith("<Event"),
+                $"Expected XML to start with '<?xml' or '<Event', but got: {xml[..Math.Min(50, xml.Length)]}");
         }
     }
 
diff --git a/src/EventLogExpert.Eventing.Tests/Readers/EventLogWatcherTests.cs b/src/EventLogExpert.Eventing.Tests/Readers/EventLogWatcherTests.cs
@@ -451,7 +451,7 @@ public void EventRecordWritten_ShouldHaveValidTimeCreated()
         // Assert
         Assert.True(received, "Did not receive event within timeout period");
         Assert.NotNull(capturedEvent);
-        Assert.NotNull(capturedEvent.TimeCreated);
+        Assert.NotEqual(default(DateTime), capturedEvent.TimeCreated);
         Assert.True(capturedEvent.TimeCreated >= beforeWrite.AddSeconds(-1));
         Assert.True(capturedEvent.TimeCreated <= afterWrite);
     }
diff --git a/src/EventLogExpert.UI.Tests/Store/EventLog/EventLogEffectsTests.cs b/src/EventLogExpert.UI.Tests/Store/EventLog/EventLogEffectsTests.cs
@@ -17,7 +17,7 @@
 using NSubstitute;
 using System.Collections.Immutable;
 
-namespace EventLogExpert.UI.Tests.Store;
+namespace EventLogExpert.UI.Tests.Store.EventLog;
 
 public sealed class EventLogEffectsTests
 {
diff --git a/src/EventLogExpert.UI.Tests/Store/EventLog/EventLogStoreTests.cs b/src/EventLogExpert.UI.Tests/Store/EventLog/EventLogStoreTests.cs
@@ -9,7 +9,7 @@
 using EventLogExpert.UI.Tests.TestUtils.Constants;
 using System.Collections.Immutable;
 
-namespace EventLogExpert.UI.Tests.Store;
+namespace EventLogExpert.UI.Tests.Store.EventLog;
 
 public sealed class EventLogStoreTests
 {
diff --git a/src/EventLogExpert.UI.Tests/Store/EventTable/EventTableEffectsTests.cs b/src/EventLogExpert.UI.Tests/Store/EventTable/EventTableEffectsTests.cs
@@ -6,7 +6,7 @@
 using Fluxor;
 using NSubstitute;
 
-namespace EventLogExpert.UI.Tests.Store;
+namespace EventLogExpert.UI.Tests.Store.EventTable;
 
 public sealed class EventTableEffectsTests
 {
diff --git a/src/EventLogExpert.UI.Tests/Store/EventTable/EventTableStoreTests.cs b/src/EventLogExpert.UI.Tests/Store/EventTable/EventTableStoreTests.cs
@@ -8,7 +8,7 @@
 using EventLogExpert.UI.Tests.TestUtils;
 using EventLogExpert.UI.Tests.TestUtils.Constants;
 
-namespace EventLogExpert.UI.Tests.Store;
+namespace EventLogExpert.UI.Tests.Store.EventTable;
 
 public sealed class EventTableStoreTests
 {
diff --git a/src/EventLogExpert.UI.Tests/Store/FilterCache/FilterCacheEffectsTests.cs b/src/EventLogExpert.UI.Tests/Store/FilterCache/FilterCacheEffectsTests.cs
@@ -8,7 +8,7 @@
 using NSubstitute;
 using System.Collections.Immutable;
 
-namespace EventLogExpert.UI.Tests.Store;
+namespace EventLogExpert.UI.Tests.Store.FilterCache;
 
 public sealed class FilterCacheEffectsTests
 {
diff --git a/src/EventLogExpert.UI.Tests/Store/FilterCache/FilterCacheStoreTests.cs b/src/EventLogExpert.UI.Tests/Store/FilterCache/FilterCacheStoreTests.cs
@@ -5,7 +5,7 @@
 using EventLogExpert.UI.Tests.TestUtils.Constants;
 using System.Collections.Immutable;
 
-namespace EventLogExpert.UI.Tests.Store;
+namespace EventLogExpert.UI.Tests.Store.FilterCache;
 
 public sealed class FilterCacheStoreTests
 {
diff --git a/src/EventLogExpert.UI.Tests/Store/FilterGroup/FilterGroupEffectsTests.cs b/src/EventLogExpert.UI.Tests/Store/FilterGroup/FilterGroupEffectsTests.cs
@@ -9,7 +9,7 @@
 using NSubstitute;
 using System.Collections.Immutable;
 
-namespace EventLogExpert.UI.Tests.Store;
+namespace EventLogExpert.UI.Tests.Store.FilterGroup;
 
 public sealed class FilterGroupEffectsTests
 {
diff --git a/src/EventLogExpert.UI.Tests/Store/FilterGroup/FilterGroupStoreTests.cs b/src/EventLogExpert.UI.Tests/Store/FilterGroup/FilterGroupStoreTests.cs
@@ -5,7 +5,7 @@
 using EventLogExpert.UI.Store.FilterGroup;
 using EventLogExpert.UI.Tests.TestUtils.Constants;
 
-namespace EventLogExpert.UI.Tests.Store;
+namespace EventLogExpert.UI.Tests.Store.FilterGroup;
 
 public sealed class FilterGroupStoreTests
 {
diff --git a/src/EventLogExpert.UI.Tests/Store/FilterPane/FilterPaneEffectsTests.cs b/src/EventLogExpert.UI.Tests/Store/FilterPane/FilterPaneEffectsTests.cs
@@ -14,7 +14,7 @@
 using NSubstitute;
 using System.Collections.Immutable;
 
-namespace EventLogExpert.UI.Tests.Store;
+namespace EventLogExpert.UI.Tests.Store.FilterPane;
 
 public sealed class FilterPaneEffectsTests
 {
diff --git a/src/EventLogExpert.UI.Tests/Store/FilterPane/FilterPaneStoreTests.cs b/src/EventLogExpert.UI.Tests/Store/FilterPane/FilterPaneStoreTests.cs
@@ -6,7 +6,7 @@
 using EventLogExpert.UI.Tests.TestUtils.Constants;
 using System.Collections.Immutable;
 
-namespace EventLogExpert.UI.Tests.Store;
+namespace EventLogExpert.UI.Tests.Store.FilterPane;
 
 public sealed class FilterPaneStateTests
 {
diff --git a/src/EventLogExpert.UI.Tests/Store/StatusBar/StatusBarStoreTests.cs b/src/EventLogExpert.UI.Tests/Store/StatusBar/StatusBarStoreTests.cs
@@ -4,7 +4,7 @@
 using EventLogExpert.UI.Store.StatusBar;
 using System.Collections.Immutable;
 
-namespace EventLogExpert.UI.Tests.Store;
+namespace EventLogExpert.UI.Tests.Store.StatusBar;
 
 public sealed class StatusBarStateTests
 {
diff --git a/src/EventLogExpert/MainPage.xaml.cs b/src/EventLogExpert/MainPage.xaml.cs
@@ -340,6 +340,8 @@ private async void OpenFile_Clicked(object sender, EventArgs e)
 
         foreach (var file in files)
         {
+            if (file?.FullPath is null) { continue; }
+
             await OpenLog(file.FullPath, PathType.FilePath, shouldAddLog: true);
         }
     }
@@ -362,6 +364,8 @@ private async void OpenFolder_Clicked(object sender, EventArgs e)
 
         foreach (var file in files)
         {
+            if (file?.FullPath is null) { continue; }
+
             await OpenLog(file.FullPath, PathType.FilePath, shouldAddLog: true);
         }
     }
diff --git a/src/EventLogExpert/Shared/Components/SettingsModal.razor.cs b/src/EventLogExpert/Shared/Components/SettingsModal.razor.cs
@@ -84,19 +84,20 @@ private async Task ImportDatabase()
 
             foreach (var item in result)
             {
+                if (item?.FileName is null) { continue; }
+
                 var destination = Path.Join(FileLocationOptions.DatabasePath, item.FileName);
                 File.Copy(item.FullPath, destination, true);
 
-                if (Path.GetExtension(destination) == ".zip")
-                {
-                    ZipFile.ExtractToDirectory(destination, FileLocationOptions.DatabasePath, overwriteFiles: true);
-                    File.Delete(destination);
-                }
+                if (Path.GetExtension(destination) != ".zip") { continue; }
+
+                await ZipFile.ExtractToDirectoryAsync(destination, FileLocationOptions.DatabasePath, overwriteFiles: true);
+                File.Delete(destination);
             }
 
             var message = result.Length > 1 ?
                 $"{result.Length} databases have successfully been imported" :
-                $"{result[0].FileName} has successfully been imported";
+                $"{result[0]?.FileName ?? "Database"} has successfully been imported";
 
             await AlertDialogService.ShowAlert("Import Successful", message, "OK");
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// // Licensed under the MIT License.`
`3`	`3`
`4`	`4`	`using EventLogExpert.Eventing.Helpers;`
`5`		`-using EventLogExpert.Eventing.Models;`
`6`	`5`	`using EventLogExpert.Eventing.Readers;`
`7`	`6`	`using EventLogExpert.Eventing.Tests.TestUtils.Constants;`
`8`	`7`
`@@ -608,12 +607,12 @@ public void TryGetEvents_WhenRenderXmlTrue_XmlShouldBeValidFormat()`
`608`	`607`	`// Assert`
`609`	`608`	`Assert.True(success);`
`610`	`609`
`611`		`- if (events.Length > 0 && !string.IsNullOrEmpty(events[0].Xml))`
	`610`	`+ if (events.Length > 0 && events[0].Xml is { } xml && !string.IsNullOrEmpty(xml))`
`612`	`611`	`{`
`613`	`612`	`// XML should start with <?xml or <Event`
`614`	`613`	`Assert.True(`
`615`		`- events[0].Xml.StartsWith("<?xml") \|\| events[0].Xml.StartsWith("<Event"),`
`616`		`- $"Expected XML to start with '<?xml' or '<Event', but got: {events[0].Xml[..Math.Min(50, events[0].Xml.Length)]}");`
	`614`	`+ xml.StartsWith("<?xml") \|\| xml.StartsWith("<Event"),`
	`615`	`+ $"Expected XML to start with '<?xml' or '<Event', but got: {xml[..Math.Min(50, xml.Length)]}");`
`617`	`616`	`}`
`618`	`617`	`}`
`619`	`618`
Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ public void EventRecordWritten_ShouldHaveValidTimeCreated()`
`451`	`451`	`// Assert`
`452`	`452`	`Assert.True(received, "Did not receive event within timeout period");`
`453`	`453`	`Assert.NotNull(capturedEvent);`
`454`		`- Assert.NotNull(capturedEvent.TimeCreated);`
	`454`	`+ Assert.NotEqual(default(DateTime), capturedEvent.TimeCreated);`
`455`	`455`	`Assert.True(capturedEvent.TimeCreated >= beforeWrite.AddSeconds(-1));`
`456`	`456`	`Assert.True(capturedEvent.TimeCreated <= afterWrite);`
`457`	`457`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`using NSubstitute;`
`18`	`18`	`using System.Collections.Immutable;`
`19`	`19`
`20`		`-namespace EventLogExpert.UI.Tests.Store;`
	`20`	`+namespace EventLogExpert.UI.Tests.Store.EventLog;`
`21`	`21`
`22`	`22`	`public sealed class EventLogEffectsTests`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`using EventLogExpert.UI.Tests.TestUtils.Constants;`
`10`	`10`	`using System.Collections.Immutable;`
`11`	`11`
`12`		`-namespace EventLogExpert.UI.Tests.Store;`
	`12`	`+namespace EventLogExpert.UI.Tests.Store.EventLog;`
`13`	`13`
`14`	`14`	`public sealed class EventLogStoreTests`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using Fluxor;`
`7`	`7`	`using NSubstitute;`
`8`	`8`
`9`		`-namespace EventLogExpert.UI.Tests.Store;`
	`9`	`+namespace EventLogExpert.UI.Tests.Store.EventTable;`
`10`	`10`
`11`	`11`	`public sealed class EventTableEffectsTests`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`using EventLogExpert.UI.Tests.TestUtils;`
`9`	`9`	`using EventLogExpert.UI.Tests.TestUtils.Constants;`
`10`	`10`
`11`		`-namespace EventLogExpert.UI.Tests.Store;`
	`11`	`+namespace EventLogExpert.UI.Tests.Store.EventTable;`
`12`	`12`
`13`	`13`	`public sealed class EventTableStoreTests`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using EventLogExpert.UI.Tests.TestUtils.Constants;`
`6`	`6`	`using System.Collections.Immutable;`
`7`	`7`
`8`		`-namespace EventLogExpert.UI.Tests.Store;`
	`8`	`+namespace EventLogExpert.UI.Tests.Store.FilterCache;`
`9`	`9`
`10`	`10`	`public sealed class FilterCacheStoreTests`
`11`	`11`	`{`