Bump NSubstitute from 5.3.0 to 6.0.0

tests/WatchBack.Core.Tests/SyncServiceTests.cs

@@ -200,7 +200,7 @@ public async Task SyncAsync_FilterThoughtsUsingTimeMachine()
         result.AllThoughts.Should().HaveCount(2);
         result.TimeMachineThoughts.Should().HaveCount(1);
         _timeMachineFilter.Received(1).Apply(
-            Arg.Is<IEnumerable<Thought>>(t => t.Count() == 2),
+            Arg.Is<IEnumerable<Thought>>(t => t!.Count() == 2),
             episode.ReleaseDate,
             14);
     }

tests/WatchBack.Core.Tests/WatchBack.Core.Tests.csproj

@@ -17,7 +17,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="8.10.*"/>
-    <PackageReference Include="NSubstitute" Version="5.3.*"/>
+    <PackageReference Include="NSubstitute" Version="6.0.*"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.*"/>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.*"/>
     <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.*"/>

tests/WatchBack.Infrastructure.Tests/BlueskyThoughtProviderTests.cs

@@ -80,7 +80,7 @@ public async Task GetThoughtsAsync_WithValidSearchResults_ReturnsPosts()
         MockHttpMessageHandler handler = new(() => responses.Dequeue());
         HttpClient client = new(handler) { BaseAddress = new Uri("https://bsky.social") };
         IReplyTreeBuilder? treeBuilder = Substitute.For<IReplyTreeBuilder>();
-        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => ((IEnumerable<Thought>)x[0]).ToList());
+        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => x.ArgAt<IEnumerable<Thought>>(0).ToList());
 
         BlueskyThoughtProvider provider = new(client, new OptionsSnapshotStub<BlueskyOptions>(_options), _cache,
             treeBuilder, NullLogger<BlueskyThoughtProvider>.Instance);
@@ -149,7 +149,7 @@ public async Task GetThoughtsAsync_DeduplicatesSimilarPosts()
         IReplyTreeBuilder? treeBuilder = Substitute.For<IReplyTreeBuilder>();
         List<Thought> capturedThoughts = new();
         treeBuilder.BuildTree(Arg.Do<IEnumerable<Thought>>(x => capturedThoughts.AddRange(x)))
-            .Returns(x => ((IEnumerable<Thought>)x[0]).ToList());
+            .Returns(x => x.ArgAt<IEnumerable<Thought>>(0).ToList());
 
         BlueskyThoughtProvider provider = new(client, new OptionsSnapshotStub<BlueskyOptions>(_options), _cache,
             treeBuilder, NullLogger<BlueskyThoughtProvider>.Instance);
@@ -185,7 +185,7 @@ public async Task GetThoughtsAsync_WithoutCredentials_UsesPublicAPI()
             new HttpResponseMessage(HttpStatusCode.OK) { Content = new StringContent(searchJson) });
         HttpClient client = new(handler) { BaseAddress = new Uri("https://bsky.social") };
         IReplyTreeBuilder? treeBuilder = Substitute.For<IReplyTreeBuilder>();
-        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => ((IEnumerable<Thought>)x[0]).ToList());
+        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => x.ArgAt<IEnumerable<Thought>>(0).ToList());
 
         BlueskyThoughtProvider provider = new(client, new OptionsSnapshotStub<BlueskyOptions>(optionsWithoutCreds),
             _cache, treeBuilder, NullLogger<BlueskyThoughtProvider>.Instance);
@@ -253,7 +253,7 @@ public async Task GetThoughtsAsync_ReportsOneTickWithWeightOne()
         MockHttpMessageHandler handler = new(() => responses.Dequeue());
         HttpClient client = new(handler) { BaseAddress = new Uri("https://bsky.social") };
         IReplyTreeBuilder? treeBuilder = Substitute.For<IReplyTreeBuilder>();
-        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => ((IEnumerable<Thought>)x[0]).ToList());
+        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => x.ArgAt<IEnumerable<Thought>>(0).ToList());
 
         BlueskyThoughtProvider provider = new(client, new OptionsSnapshotStub<BlueskyOptions>(_options), _cache,
             treeBuilder, NullLogger<BlueskyThoughtProvider>.Instance);
@@ -301,7 +301,7 @@ public async Task GetThoughtsAsync_OnCacheHit_ReportsNoTicks()
         MockHttpMessageHandler handler = new(() => responses.Dequeue());
         HttpClient client = new(handler) { BaseAddress = new Uri("https://bsky.social") };
         IReplyTreeBuilder? treeBuilder = Substitute.For<IReplyTreeBuilder>();
-        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => ((IEnumerable<Thought>)x[0]).ToList());
+        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => x.ArgAt<IEnumerable<Thought>>(0).ToList());
 
         BlueskyThoughtProvider provider = new(client, new OptionsSnapshotStub<BlueskyOptions>(_options), _cache,
             treeBuilder, NullLogger<BlueskyThoughtProvider>.Instance);
@@ -467,7 +467,7 @@ public async Task GetThoughtsAsync_WithMovieContext_UsesMovieQuery()
 
         HttpClient client = new(handler) { BaseAddress = new Uri("https://bsky.social") };
         IReplyTreeBuilder? treeBuilder = Substitute.For<IReplyTreeBuilder>();
-        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => ((IEnumerable<Thought>)x[0]).ToList());
+        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => x.ArgAt<IEnumerable<Thought>>(0).ToList());
 
         BlueskyThoughtProvider provider = new(client, new OptionsSnapshotStub<BlueskyOptions>(_options), _cache,
             treeBuilder, NullLogger<BlueskyThoughtProvider>.Instance);
@@ -501,7 +501,7 @@ public async Task GetThoughtsAsync_ForSeasonTwoEpisode_SearchUrlContainsSeason2E
 
         HttpClient client = new(handler) { BaseAddress = new Uri("https://bsky.social") };
         IReplyTreeBuilder treeBuilder = Substitute.For<IReplyTreeBuilder>();
-        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => ((IEnumerable<Thought>)x[0]).ToList());
+        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => x.ArgAt<IEnumerable<Thought>>(0).ToList());
 
         BlueskyThoughtProvider provider = new(client, new OptionsSnapshotStub<BlueskyOptions>(_options), _cache,
             treeBuilder, NullLogger<BlueskyThoughtProvider>.Instance);
@@ -548,7 +548,7 @@ public async Task GetThoughtsAsync_WithSeasonZeroEpisode_WithDate_UsesDateQuery(
 
         HttpClient client = new(handler) { BaseAddress = new Uri("https://bsky.social") };
         IReplyTreeBuilder? treeBuilder = Substitute.For<IReplyTreeBuilder>();
-        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => ((IEnumerable<Thought>)x[0]).ToList());
+        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => x.ArgAt<IEnumerable<Thought>>(0).ToList());
 
         BlueskyThoughtProvider provider = new(client, new OptionsSnapshotStub<BlueskyOptions>(_options), _cache,
             treeBuilder, NullLogger<BlueskyThoughtProvider>.Instance);
@@ -630,7 +630,7 @@ public async Task GetThoughtsAsync_When401OnSearch_EvictsTokenAndRetriesOnce()
         });
         HttpClient client = new(handler) { BaseAddress = new Uri("https://bsky.social") };
         IReplyTreeBuilder treeBuilder = Substitute.For<IReplyTreeBuilder>();
-        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => ((IEnumerable<Thought>)x[0]).ToList());
+        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => x.ArgAt<IEnumerable<Thought>>(0).ToList());
         BlueskyThoughtProvider provider = new(client, new OptionsSnapshotStub<BlueskyOptions>(_options), _cache,
             treeBuilder, NullLogger<BlueskyThoughtProvider>.Instance);
 

tests/WatchBack.Infrastructure.Tests/LemmyThoughtProviderTests.cs

@@ -39,7 +39,7 @@ public void Dispose()
     private LemmyThoughtProvider CreateProvider(HttpClient client, LemmyOptions? options = null)
     {
         IReplyTreeBuilder treeBuilder = Substitute.For<IReplyTreeBuilder>();
-        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => ((IEnumerable<Thought>)x[0]).ToList());
+        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => x.ArgAt<IEnumerable<Thought>>(0).ToList());
         return new LemmyThoughtProvider(client, new OptionsSnapshotStub<LemmyOptions>(options ?? _options),
             _cache, treeBuilder, NullLogger<LemmyThoughtProvider>.Instance);
     }
@@ -48,7 +48,7 @@ private LemmyThoughtProvider CreateProvider(HttpClient client, out IReplyTreeBui
         LemmyOptions? options = null)
     {
         treeBuilder = Substitute.For<IReplyTreeBuilder>();
-        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => ((IEnumerable<Thought>)x[0]).ToList());
+        treeBuilder.BuildTree(Arg.Any<IEnumerable<Thought>>()).Returns(x => x.ArgAt<IEnumerable<Thought>>(0).ToList());
         return new LemmyThoughtProvider(client, new OptionsSnapshotStub<LemmyOptions>(options ?? _options),
             _cache, treeBuilder, NullLogger<LemmyThoughtProvider>.Instance);
     }
@@ -306,7 +306,7 @@ public async Task GetThoughtsAsync_TopLevelComment_HasNullParentId()
         List<Thought> capturedThoughts = [];
         IReplyTreeBuilder treeBuilder = Substitute.For<IReplyTreeBuilder>();
         treeBuilder.BuildTree(Arg.Do<IEnumerable<Thought>>(x => capturedThoughts.AddRange(x)))
-            .Returns(x => ((IEnumerable<Thought>)x[0]).ToList());
+            .Returns(x => x.ArgAt<IEnumerable<Thought>>(0).ToList());
 
         LemmyThoughtProvider provider = new(client, new OptionsSnapshotStub<LemmyOptions>(_options),
             _cache, treeBuilder, NullLogger<LemmyThoughtProvider>.Instance);
@@ -354,7 +354,7 @@ public async Task GetThoughtsAsync_NestedComment_HasCorrectParentId()
         List<Thought> capturedThoughts = [];
         IReplyTreeBuilder treeBuilder = Substitute.For<IReplyTreeBuilder>();
         treeBuilder.BuildTree(Arg.Do<IEnumerable<Thought>>(x => capturedThoughts.AddRange(x)))
-            .Returns(x => ((IEnumerable<Thought>)x[0]).ToList());
+            .Returns(x => x.ArgAt<IEnumerable<Thought>>(0).ToList());
 
         LemmyThoughtProvider provider = new(client, new OptionsSnapshotStub<LemmyOptions>(_options),
             _cache, treeBuilder, NullLogger<LemmyThoughtProvider>.Instance);

tests/WatchBack.Infrastructure.Tests/PrefetchServiceTests.cs

@@ -30,7 +30,7 @@ public PrefetchServiceTests()
         {
             // Use season + episode in the key so different episodes don't collide,
             // matching what a real provider would produce.
-            MediaContext m = (MediaContext)ci[0];
+            MediaContext m = ci.ArgAt<MediaContext>(0);
             return m is EpisodeContext ep
                 ? $"key:{ep.Title}:S{ep.SeasonNumber}E{ep.EpisodeNumber}"
                 : $"key:{m.Title}";
@@ -89,7 +89,7 @@ public async Task SchedulePrefetch_DifferentShow_EvictsAllPreviousTargets()
         // Manually verify the predicted next episode is NOT yet in cache (prefetch populates it)
         // by checking GetThoughtsAsync was called for the predicted episodes
         await _provider.Received().GetThoughtsAsync(
-            Arg.Is<MediaContext>(c => c.Title == "Show A"),
+            Arg.Is<MediaContext>(c => c!.Title == "Show A"),
             null,
             Arg.Any<CancellationToken>());