From 5bded9e9d99c3fe9839b022ef0b8851d646b5567 Mon Sep 17 00:00:00 2001 From: Jake Meiergerd Date: Sat, 14 Nov 2026 23:07:10 -0600 Subject: [PATCH 1/2] Fixed that `SourceList` contained a small potential memory leak, in the form of an un-disposed `Subject`, and fixed several tests that then started failing due to premature disposal of their `SourceList`s. --- .../List/MergeManyChangeSetsCacheFixture.cs | 22 +++++++++++-------- .../List/MergeManyChangeSetsListFixture.cs | 18 +++++++++------ src/DynamicData/List/SourceList.cs | 3 ++- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/DynamicData.Tests/List/MergeManyChangeSetsCacheFixture.cs b/src/DynamicData.Tests/List/MergeManyChangeSetsCacheFixture.cs index 72490c700..5a0b2b3b1 100644 --- a/src/DynamicData.Tests/List/MergeManyChangeSetsCacheFixture.cs +++ b/src/DynamicData.Tests/List/MergeManyChangeSetsCacheFixture.cs @@ -49,28 +49,33 @@ public async Task MultiThreadedStressTest(int marketCount, int priceCount) TimeSpan? GetRemoveTime() => _randomizer.Bool() ? _randomizer.TimeSpan(MaxRemoveTime) : null; IObservable AddRemoveStress(int marketCount, int priceCount, int parallel, IScheduler scheduler) => - Observable.Create(observer => new CompositeDisposable - ( + Observable.Create(observer => + { + var marketsCompleted = new Subject(); + + return new CompositeDisposable( AddRemoveMarkets(marketCount, parallel, scheduler) + .Finally(() => marketsCompleted.OnNext(default)) .Subscribe( onNext: static _ => { }, onError: observer.OnError), - _marketList.Connect() + .TakeUntil(marketsCompleted) .MergeMany(market => AddRemovePrices((Market)market, priceCount, parallel, scheduler)) .Subscribe( onNext: static _ => { }, onError: observer.OnError, - onCompleted: observer.OnCompleted) - )); + onCompleted: observer.OnCompleted), + marketsCompleted); + }); IObservable AddRemoveMarkets(int ownerCount, int parallel, IScheduler scheduler) => _marketFaker.IntervalGenerate(MaxAddTime, scheduler) - .Parallelize(ownerCount, parallel, obs => obs.StressAddRemove(_marketList, _ => GetRemoveTime(), scheduler)) - .Finally(_marketList.Dispose); + .Parallelize(ownerCount, parallel, obs => obs.StressAddRemove(_marketList, _ => GetRemoveTime(), scheduler)); IObservable AddRemovePrices(Market market, int priceCount, int parallel, IScheduler scheduler) => - _randomizer.Interval(MaxAddTime, scheduler).Select(_ => market.CreateUniquePrice(_ => GetRandomPrice())) + _randomizer.Interval(MaxAddTime, scheduler) + .Select(_ => market.CreateUniquePrice(_ => GetRandomPrice())) .Parallelize(priceCount, parallel, obs => obs.StressAddRemove(market.PricesCache, _ => GetRemoveTime(), scheduler)) .Finally(market.PricesCache.Dispose); @@ -826,7 +831,6 @@ private void DisposeMarkets() { _marketList.Items.ForEach(m => (m as IDisposable)?.Dispose()); _marketList.Dispose(); - _marketList.Clear(); } private decimal GetRandomPrice() => MarketPrice.RandomPrice(_randomizer, BasePrice, PriceOffset); diff --git a/src/DynamicData.Tests/List/MergeManyChangeSetsListFixture.cs b/src/DynamicData.Tests/List/MergeManyChangeSetsListFixture.cs index 8521d48ee..1d7bfd576 100644 --- a/src/DynamicData.Tests/List/MergeManyChangeSetsListFixture.cs +++ b/src/DynamicData.Tests/List/MergeManyChangeSetsListFixture.cs @@ -46,25 +46,29 @@ public async Task MultiThreadedStressTest(int ownerCount, int animalCount) TimeSpan? GetRemoveTime() => _randomizer.Bool() ? _randomizer.TimeSpan(MaxRemoveTime) : null; IObservable AddRemoveAnimalsStress(int ownerCount, int animalCount, int parallel, IScheduler scheduler) => - Observable.Create(observer => new CompositeDisposable - ( + Observable.Create(observer => + { + var animalsCompleted = new Subject(); + + return new CompositeDisposable( AddRemoveOwners(ownerCount, parallel, scheduler) + .Finally(() => animalsCompleted.OnNext(default)) .Subscribe( onNext: static _ => { }, onError: observer.OnError), - _animalOwners.Connect() + .TakeUntil(animalsCompleted) .MergeMany(owner => AddRemoveAnimals(owner, animalCount, parallel, scheduler)) .Subscribe( onNext: static _ => { }, onError: observer.OnError, - onCompleted: observer.OnCompleted) - )); + onCompleted: observer.OnCompleted), + animalsCompleted); + }); IObservable AddRemoveOwners(int ownerCount, int parallel, IScheduler scheduler) => _animalOwnerFaker.IntervalGenerate(_randomizer, MaxAddTime, scheduler) - .Parallelize(ownerCount, parallel, obs => obs.StressAddRemove(_animalOwners, _ => GetRemoveTime(), scheduler)) - .Finally(_animalOwners.Dispose); + .Parallelize(ownerCount, parallel, obs => obs.StressAddRemove(_animalOwners, _ => GetRemoveTime(), scheduler)); IObservable AddRemoveAnimals(AnimalOwner owner, int animalCount, int parallel, IScheduler scheduler) => _animalFaker.IntervalGenerate(_randomizer, MaxAddTime, scheduler) diff --git a/src/DynamicData/List/SourceList.cs b/src/DynamicData/List/SourceList.cs index 0c3b8fc19..183fdc9da 100644 --- a/src/DynamicData/List/SourceList.cs +++ b/src/DynamicData/List/SourceList.cs @@ -13,7 +13,7 @@ namespace DynamicData; public sealed class SourceList : ISourceList where T : notnull { - private readonly ISubject> _changes = new Subject>(); + private readonly Subject> _changes = new Subject>(); private readonly Subject> _changesPreview = new(); @@ -95,6 +95,7 @@ public IObservable> Connect(Func? predicate = null) public void Dispose() { _cleanUp.Dispose(); + _changes.Dispose(); _changesPreview.Dispose(); // Intentionally skipping disposal for _isEditInProgress, as it's technically redundant after _cleanUp.Dispose() // calls .OnCompleted(), and doing disposal anyway causes a whole bunch of test failures. That really suggests From 3b467fefd5c9ce91611cfa576918e635bf6b7b2c Mon Sep 17 00:00:00 2001 From: Jake Meiergerd Date: Wed, 18 Nov 2026 23:10:45 -0600 Subject: [PATCH 2/2] Added additional fixes for the same scenario occurring within various test fixtures. --- src/DynamicData.Tests/Cache/BatchIfFixture.cs | 3 ++- .../Cache/BatchIfWithTimeOutFixture.cs | 3 ++- src/DynamicData.Tests/Cache/GroupControllerFixture.cs | 3 ++- .../Cache/GroupControllerForFilteredItemsFixture.cs | 3 ++- src/DynamicData.Tests/Cache/MergeManyFixture.cs | 8 ++++++-- src/DynamicData.Tests/Cache/MergeManyItemsFixture.cs | 8 ++++++-- .../Cache/MergeManyWithKeyOverloadFixture.cs | 10 +++++++--- src/DynamicData.Tests/Cache/PageFixture.cs | 6 ++++-- .../Cache/SortAndPageAndBindFixture.cs | 3 ++- src/DynamicData.Tests/Cache/SortAndPageFixture.cs | 3 ++- .../Cache/SortAndVirtualizeAndBindFixture.cs | 3 ++- .../Cache/SortAndVirtualizeFixture.cs | 3 ++- src/DynamicData.Tests/Cache/TrueForAllFixture.cs | 8 ++++++-- src/DynamicData.Tests/Cache/TrueForAnyFixture.cs | 8 ++++++-- src/DynamicData.Tests/List/BatchIfFixture.cs | 3 ++- .../List/BatchIfWithTimeOutFixture.cs | 3 ++- .../List/FilterControllerFixtureWithClearAndReplace.cs | 3 ++- .../List/FilterControllerFixtureWithDiffSet.cs | 3 ++- src/DynamicData.Tests/List/GroupImmutableFixture.cs | 3 ++- src/DynamicData.Tests/List/MergeManyFixture.cs | 8 ++++++-- src/DynamicData.Tests/List/PageFixture.cs | 3 ++- src/DynamicData.Tests/List/SortMutableFixture.cs | 6 ++++-- src/DynamicData.Tests/List/SwitchFixture.cs | 3 ++- src/DynamicData.Tests/List/VirtualisationFixture.cs | 3 ++- 24 files changed, 77 insertions(+), 33 deletions(-) diff --git a/src/DynamicData.Tests/Cache/BatchIfFixture.cs b/src/DynamicData.Tests/Cache/BatchIfFixture.cs index 19304be72..74d2ff085 100644 --- a/src/DynamicData.Tests/Cache/BatchIfFixture.cs +++ b/src/DynamicData.Tests/Cache/BatchIfFixture.cs @@ -2,7 +2,7 @@ namespace DynamicData.Tests.Cache; public partial class BatchIfFixture : IDisposable { - private readonly ISubject _pausingSubject = new Subject(); + private readonly Subject _pausingSubject = new(); private readonly ChangeSetAggregator _results; @@ -104,6 +104,7 @@ public void Dispose() { _results.Dispose(); _source.Dispose(); + _pausingSubject.Dispose(); } [Fact] diff --git a/src/DynamicData.Tests/Cache/BatchIfWithTimeOutFixture.cs b/src/DynamicData.Tests/Cache/BatchIfWithTimeOutFixture.cs index 29aa9c775..3380de6b5 100644 --- a/src/DynamicData.Tests/Cache/BatchIfWithTimeOutFixture.cs +++ b/src/DynamicData.Tests/Cache/BatchIfWithTimeOutFixture.cs @@ -75,7 +75,7 @@ public void Timeout() public class BatchIfWithTimeOutFixture : IDisposable { - private readonly ISubject _pausingSubject = new Subject(); + private readonly Subject _pausingSubject = new(); private readonly ChangeSetAggregator _results; @@ -115,6 +115,7 @@ public void Dispose() _results.Dispose(); _source.Dispose(); _pausingSubject.OnCompleted(); + _pausingSubject.Dispose(); } [Fact] diff --git a/src/DynamicData.Tests/Cache/GroupControllerFixture.cs b/src/DynamicData.Tests/Cache/GroupControllerFixture.cs index d8b8e709d..feab7856d 100644 --- a/src/DynamicData.Tests/Cache/GroupControllerFixture.cs +++ b/src/DynamicData.Tests/Cache/GroupControllerFixture.cs @@ -14,7 +14,7 @@ public class GroupControllerFixture : IDisposable return p.Age <= 60 ? AgeBracket.Adult : AgeBracket.Pensioner; }; - private readonly ISubject _refresher; + private readonly Subject _refresher; private readonly ISourceCache _source; @@ -38,6 +38,7 @@ public void Dispose() { _source?.Dispose(); _grouped?.Dispose(); + _refresher.Dispose(); } [Fact] diff --git a/src/DynamicData.Tests/Cache/GroupControllerForFilteredItemsFixture.cs b/src/DynamicData.Tests/Cache/GroupControllerForFilteredItemsFixture.cs index 45f1a77dc..59fa1d267 100644 --- a/src/DynamicData.Tests/Cache/GroupControllerForFilteredItemsFixture.cs +++ b/src/DynamicData.Tests/Cache/GroupControllerForFilteredItemsFixture.cs @@ -14,7 +14,7 @@ public class GroupControllerForFilteredItemsFixture : IDisposable return p.Age <= 60 ? AgeBracket.Adult : AgeBracket.Pensioner; }; - private readonly ISubject _refreshSubject = new Subject(); + private readonly Subject _refreshSubject = new(); private readonly ISourceCache _source; @@ -38,6 +38,7 @@ public void Dispose() { _source.Dispose(); _grouped.Dispose(); + _refreshSubject.Dispose(); } [Fact] diff --git a/src/DynamicData.Tests/Cache/MergeManyFixture.cs b/src/DynamicData.Tests/Cache/MergeManyFixture.cs index a46854f19..b17a1ec19 100644 --- a/src/DynamicData.Tests/Cache/MergeManyFixture.cs +++ b/src/DynamicData.Tests/Cache/MergeManyFixture.cs @@ -59,9 +59,10 @@ public void RemovedItemWillNotCauseInvocation() stream.Dispose(); } - private class ObjectWithObservable(int id) + private sealed class ObjectWithObservable(int id) + : IDisposable { - private readonly ISubject _changed = new Subject(); + private readonly Subject _changed = new(); private bool _value; @@ -69,6 +70,9 @@ private class ObjectWithObservable(int id) public IObservable Observable => _changed.AsObservable(); + public void Dispose() + => _changed.Dispose(); + public void InvokeObservable(bool value) { _value = value; diff --git a/src/DynamicData.Tests/Cache/MergeManyItemsFixture.cs b/src/DynamicData.Tests/Cache/MergeManyItemsFixture.cs index ee513a24e..18fa5224e 100644 --- a/src/DynamicData.Tests/Cache/MergeManyItemsFixture.cs +++ b/src/DynamicData.Tests/Cache/MergeManyItemsFixture.cs @@ -71,9 +71,10 @@ public void RemovedItemWillNotCauseInvocation() stream.Dispose(); } - private class ObjectWithObservable(int id) + private sealed class ObjectWithObservable(int id) + : IDisposable { - private readonly ISubject _changed = new Subject(); + private readonly Subject _changed = new(); private bool _value; @@ -81,6 +82,9 @@ private class ObjectWithObservable(int id) public IObservable Observable => _changed.AsObservable(); + public void Dispose() + => _changed.Dispose(); + public void InvokeObservable(bool value) { _value = value; diff --git a/src/DynamicData.Tests/Cache/MergeManyWithKeyOverloadFixture.cs b/src/DynamicData.Tests/Cache/MergeManyWithKeyOverloadFixture.cs index d9269e4c9..ae5d5746e 100644 --- a/src/DynamicData.Tests/Cache/MergeManyWithKeyOverloadFixture.cs +++ b/src/DynamicData.Tests/Cache/MergeManyWithKeyOverloadFixture.cs @@ -176,9 +176,10 @@ public void MergedStreamFailsWhenSourceFails() receivedError.Should().Be(expectedError); } - private class ObjectWithObservable(int id) + private sealed class ObjectWithObservable(int id) + : IDisposable { - private readonly ISubject _changed = new Subject(); + private readonly Subject _changed = new(); private bool _value; @@ -188,8 +189,11 @@ private class ObjectWithObservable(int id) public void CompleteObservable() => _changed.OnCompleted(); - public void FailObservable(Exception ex) => _changed.OnError(ex); + public void Dispose() + => _changed.Dispose(); + public void FailObservable(Exception ex) => _changed.OnError(ex); + public void InvokeObservable(bool value) { _value = value; diff --git a/src/DynamicData.Tests/Cache/PageFixture.cs b/src/DynamicData.Tests/Cache/PageFixture.cs index fc9b739af..00dc688fb 100644 --- a/src/DynamicData.Tests/Cache/PageFixture.cs +++ b/src/DynamicData.Tests/Cache/PageFixture.cs @@ -8,9 +8,9 @@ public class PageFixture : IDisposable private readonly RandomPersonGenerator _generator = new(); - private readonly ISubject _pager; + private readonly BehaviorSubject _pager; - private readonly ISubject> _sort; + private readonly BehaviorSubject> _sort; private readonly ISourceCache _source; @@ -56,6 +56,8 @@ public void Dispose() { _source.Dispose(); _aggregators.Dispose(); + _pager.Dispose(); + _sort.Dispose(); } [Fact] diff --git a/src/DynamicData.Tests/Cache/SortAndPageAndBindFixture.cs b/src/DynamicData.Tests/Cache/SortAndPageAndBindFixture.cs index 6d89ba26f..e93357b29 100644 --- a/src/DynamicData.Tests/Cache/SortAndPageAndBindFixture.cs +++ b/src/DynamicData.Tests/Cache/SortAndPageAndBindFixture.cs @@ -65,7 +65,7 @@ public abstract class SortAndPageAndBindFixtureBase : IDisposable protected readonly SourceCache Source = new(p => p.Name); protected readonly IComparer Comparer = SortExpressionComparer.Ascending(p => p.Age).ThenByAscending(p => p.Name); - protected readonly ISubject PageRequests = new BehaviorSubject(new PageRequest(0, 25)); + protected readonly BehaviorSubject PageRequests = new(new PageRequest(0, 25)); protected readonly ChangeSetAggregator Aggregator; protected readonly IList List; @@ -375,5 +375,6 @@ public void Dispose() Source.Dispose(); Aggregator.Dispose(); PageRequests.OnCompleted(); + PageRequests.Dispose(); } } diff --git a/src/DynamicData.Tests/Cache/SortAndPageFixture.cs b/src/DynamicData.Tests/Cache/SortAndPageFixture.cs index 52846a600..449c486b8 100644 --- a/src/DynamicData.Tests/Cache/SortAndPageFixture.cs +++ b/src/DynamicData.Tests/Cache/SortAndPageFixture.cs @@ -72,7 +72,7 @@ public abstract class SortAndPageFixtureBase : IDisposable protected readonly SourceCache Source = new(p => p.Name); protected readonly IComparer Comparer = SortExpressionComparer.Ascending(p => p.Age).ThenByAscending(p => p.Name); - protected readonly ISubject PageRequests = new BehaviorSubject(new PageRequest(1, 25)); + protected readonly BehaviorSubject PageRequests = new(new PageRequest(1, 25)); protected readonly ChangeSetAggregator> Aggregator; @@ -410,5 +410,6 @@ public void Dispose() Source.Dispose(); Aggregator.Dispose(); PageRequests.OnCompleted(); + PageRequests.Dispose(); } } diff --git a/src/DynamicData.Tests/Cache/SortAndVirtualizeAndBindFixture.cs b/src/DynamicData.Tests/Cache/SortAndVirtualizeAndBindFixture.cs index 15445d153..670c9e17f 100644 --- a/src/DynamicData.Tests/Cache/SortAndVirtualizeAndBindFixture.cs +++ b/src/DynamicData.Tests/Cache/SortAndVirtualizeAndBindFixture.cs @@ -65,7 +65,7 @@ public abstract class SortAndVirtualizeAndBindFixtureBase : IDisposable protected readonly SourceCache Source = new(p => p.Name); protected readonly IComparer Comparer = SortExpressionComparer.Ascending(p => p.Age).ThenByAscending(p => p.Name); - protected readonly ISubject VirtualRequests = new BehaviorSubject(new VirtualRequest(0, 25)); + protected readonly BehaviorSubject VirtualRequests = new(new VirtualRequest(0, 25)); protected readonly ChangeSetAggregator Aggregator; protected readonly IList List; @@ -381,5 +381,6 @@ public void Dispose() Source.Dispose(); Aggregator.Dispose(); VirtualRequests.OnCompleted(); + VirtualRequests.Dispose(); } } diff --git a/src/DynamicData.Tests/Cache/SortAndVirtualizeFixture.cs b/src/DynamicData.Tests/Cache/SortAndVirtualizeFixture.cs index cde724952..3f335bb2b 100644 --- a/src/DynamicData.Tests/Cache/SortAndVirtualizeFixture.cs +++ b/src/DynamicData.Tests/Cache/SortAndVirtualizeFixture.cs @@ -71,7 +71,7 @@ public abstract class SortAndVirtualizeFixtureBase : IDisposable protected readonly SourceCache Source = new(p => p.Name); protected readonly IComparer Comparer = SortExpressionComparer.Ascending(p => p.Age).ThenByAscending(p => p.Name); - protected readonly ISubject VirtualRequests = new BehaviorSubject(new VirtualRequest(0, 25)); + protected readonly BehaviorSubject VirtualRequests = new(new VirtualRequest(0, 25)); protected readonly ChangeSetAggregator> Aggregator; @@ -388,5 +388,6 @@ public void Dispose() Source.Dispose(); Aggregator.Dispose(); VirtualRequests.OnCompleted(); + VirtualRequests.Dispose(); } } diff --git a/src/DynamicData.Tests/Cache/TrueForAllFixture.cs b/src/DynamicData.Tests/Cache/TrueForAllFixture.cs index b38c98e22..6ecbecb44 100644 --- a/src/DynamicData.Tests/Cache/TrueForAllFixture.cs +++ b/src/DynamicData.Tests/Cache/TrueForAllFixture.cs @@ -82,9 +82,10 @@ public void MultipleValuesReturnTrue() subscribed.Dispose(); } - private class ObjectWithObservable(int id) + private sealed class ObjectWithObservable(int id) + : IDisposable { - private readonly ISubject _changed = new Subject(); + private readonly Subject _changed = new(); public int Id { get; } = id; @@ -92,6 +93,9 @@ private class ObjectWithObservable(int id) public bool Value { get; private set; } + public void Dispose() + => _changed.Dispose(); + public void InvokeObservable(bool value) { Value = value; diff --git a/src/DynamicData.Tests/Cache/TrueForAnyFixture.cs b/src/DynamicData.Tests/Cache/TrueForAnyFixture.cs index d51d2ffe6..e5f69a9da 100644 --- a/src/DynamicData.Tests/Cache/TrueForAnyFixture.cs +++ b/src/DynamicData.Tests/Cache/TrueForAnyFixture.cs @@ -89,9 +89,10 @@ public void ValuesPublishedOnSubscriptionDoNotTriggerPrematureOutput() results.RecordedValues[0].Should().Be(true, because: "One of the two items in the source has a true value"); } - private class ObjectWithObservable(int id) + private sealed class ObjectWithObservable(int id) + : IDisposable { - private readonly ISubject _changed = new Subject(); + private readonly Subject _changed = new(); public int Id { get; } = id; @@ -99,6 +100,9 @@ private class ObjectWithObservable(int id) public bool Value { get; private set; } + public void Dispose() + => _changed.Dispose(); + public void InvokeObservable(bool value) { Value = value; diff --git a/src/DynamicData.Tests/List/BatchIfFixture.cs b/src/DynamicData.Tests/List/BatchIfFixture.cs index 7e9cca03c..91013c141 100644 --- a/src/DynamicData.Tests/List/BatchIfFixture.cs +++ b/src/DynamicData.Tests/List/BatchIfFixture.cs @@ -2,7 +2,7 @@ namespace DynamicData.Tests.List; public class BatchIfFixture : IDisposable { - private readonly ISubject _pausingSubject = new Subject(); + private readonly Subject _pausingSubject = new(); private readonly ChangeSetAggregator _results; @@ -86,6 +86,7 @@ public void Dispose() { _results.Dispose(); _source.Dispose(); + _pausingSubject.Dispose(); } [Fact] diff --git a/src/DynamicData.Tests/List/BatchIfWithTimeOutFixture.cs b/src/DynamicData.Tests/List/BatchIfWithTimeOutFixture.cs index cccaa04c6..3365ee84b 100644 --- a/src/DynamicData.Tests/List/BatchIfWithTimeOutFixture.cs +++ b/src/DynamicData.Tests/List/BatchIfWithTimeOutFixture.cs @@ -2,7 +2,7 @@ namespace DynamicData.Tests.List; public class BatchIfWithTimeOutFixture : IDisposable { - private readonly ISubject _pausingSubject = new Subject(); + private readonly Subject _pausingSubject = new(); private readonly ChangeSetAggregator _results; @@ -43,6 +43,7 @@ public void Dispose() _results.Dispose(); _source.Dispose(); _pausingSubject.OnCompleted(); + _pausingSubject.Dispose(); } [Fact] diff --git a/src/DynamicData.Tests/List/FilterControllerFixtureWithClearAndReplace.cs b/src/DynamicData.Tests/List/FilterControllerFixtureWithClearAndReplace.cs index 18f8f5a41..47e36be6f 100644 --- a/src/DynamicData.Tests/List/FilterControllerFixtureWithClearAndReplace.cs +++ b/src/DynamicData.Tests/List/FilterControllerFixtureWithClearAndReplace.cs @@ -2,7 +2,7 @@ namespace DynamicData.Tests.List; public class FilterControllerFixtureWithClearAndReplace : IDisposable { - private readonly ISubject> _filter; + private readonly BehaviorSubject> _filter; private readonly ChangeSetAggregator _results; @@ -139,6 +139,7 @@ public void Dispose() { _source.Dispose(); _results.Dispose(); + _filter.Dispose(); } [Fact] diff --git a/src/DynamicData.Tests/List/FilterControllerFixtureWithDiffSet.cs b/src/DynamicData.Tests/List/FilterControllerFixtureWithDiffSet.cs index d1881fb5c..44a8c4ab9 100644 --- a/src/DynamicData.Tests/List/FilterControllerFixtureWithDiffSet.cs +++ b/src/DynamicData.Tests/List/FilterControllerFixtureWithDiffSet.cs @@ -2,7 +2,7 @@ namespace DynamicData.Tests.List; public class FilterControllerFixtureWithDiffSet : IDisposable { - private readonly ISubject> _filter; + private readonly BehaviorSubject> _filter; private readonly ChangeSetAggregator _results; @@ -139,6 +139,7 @@ public void Dispose() { _source.Dispose(); _results.Dispose(); + _filter.Dispose(); } [Fact] diff --git a/src/DynamicData.Tests/List/GroupImmutableFixture.cs b/src/DynamicData.Tests/List/GroupImmutableFixture.cs index 4416994c4..5676f28f6 100644 --- a/src/DynamicData.Tests/List/GroupImmutableFixture.cs +++ b/src/DynamicData.Tests/List/GroupImmutableFixture.cs @@ -2,7 +2,7 @@ public class GroupImmutableFixture : IDisposable { - private readonly ISubject _regrouper; + private readonly Subject _regrouper; private readonly ChangeSetAggregator> _results; @@ -55,6 +55,7 @@ public void Dispose() { _source.Dispose(); _results.Dispose(); + _regrouper.Dispose(); } [Fact] diff --git a/src/DynamicData.Tests/List/MergeManyFixture.cs b/src/DynamicData.Tests/List/MergeManyFixture.cs index 05e120fef..8994ef551 100644 --- a/src/DynamicData.Tests/List/MergeManyFixture.cs +++ b/src/DynamicData.Tests/List/MergeManyFixture.cs @@ -146,9 +146,10 @@ public void MergedStreamFailsWhenSourceFails() receivedError.Should().Be(expectedError); } - private class ObjectWithObservable(int id) + private sealed class ObjectWithObservable(int id) + : IDisposable { - private readonly ISubject _changed = new Subject(); + private readonly Subject _changed = new(); private bool _value; @@ -158,6 +159,9 @@ private class ObjectWithObservable(int id) public void CompleteObservable() => _changed.OnCompleted(); + public void Dispose() + => _changed.Dispose(); + public void FailObservable(Exception ex) => _changed.OnError(ex); public void InvokeObservable(bool value) diff --git a/src/DynamicData.Tests/List/PageFixture.cs b/src/DynamicData.Tests/List/PageFixture.cs index 4e4c2ae61..0f9f2ca15 100644 --- a/src/DynamicData.Tests/List/PageFixture.cs +++ b/src/DynamicData.Tests/List/PageFixture.cs @@ -4,7 +4,7 @@ public class PageFixture : IDisposable { private readonly RandomPersonGenerator _generator = new(); - private readonly ISubject _requestSubject = new BehaviorSubject(new PageRequest(1, 25)); + private readonly BehaviorSubject _requestSubject = new(new PageRequest(1, 25)); private readonly ChangeSetAggregator _results; @@ -21,6 +21,7 @@ public void Dispose() _requestSubject.OnCompleted(); _source.Dispose(); _results.Dispose(); + _requestSubject.Dispose(); } [Fact] diff --git a/src/DynamicData.Tests/List/SortMutableFixture.cs b/src/DynamicData.Tests/List/SortMutableFixture.cs index f506b23d8..6425a924c 100644 --- a/src/DynamicData.Tests/List/SortMutableFixture.cs +++ b/src/DynamicData.Tests/List/SortMutableFixture.cs @@ -2,13 +2,13 @@ namespace DynamicData.Tests.List; public class SortMutableFixture : IDisposable { - private readonly ISubject> _changeComparer; + private readonly BehaviorSubject> _changeComparer; private readonly IComparer _comparer = SortExpressionComparer.Ascending(p => p.Age).ThenByAscending(p => p.Name); private readonly RandomPersonGenerator _generator = new(); - private readonly ISubject _resort; + private readonly Subject _resort; private readonly ChangeSetAggregator _results; @@ -45,6 +45,8 @@ public void Dispose() { _results.Dispose(); _source.Dispose(); + _resort.Dispose(); + _changeComparer.Dispose(); } [Fact] diff --git a/src/DynamicData.Tests/List/SwitchFixture.cs b/src/DynamicData.Tests/List/SwitchFixture.cs index 96650e46a..b65127230 100644 --- a/src/DynamicData.Tests/List/SwitchFixture.cs +++ b/src/DynamicData.Tests/List/SwitchFixture.cs @@ -6,7 +6,7 @@ public class SwitchFixture : IDisposable private readonly ISourceList _source; - private readonly ISubject> _switchable; + private readonly BehaviorSubject> _switchable; public SwitchFixture() { @@ -40,6 +40,7 @@ public void Dispose() { _source.Dispose(); _results.Dispose(); + _switchable.Dispose(); } [Fact] diff --git a/src/DynamicData.Tests/List/VirtualisationFixture.cs b/src/DynamicData.Tests/List/VirtualisationFixture.cs index cca213591..1528d899d 100644 --- a/src/DynamicData.Tests/List/VirtualisationFixture.cs +++ b/src/DynamicData.Tests/List/VirtualisationFixture.cs @@ -4,7 +4,7 @@ public class VirtualisationFixture : IDisposable { private readonly RandomPersonGenerator _generator = new(); - private readonly ISubject _requestSubject = new BehaviorSubject(new VirtualRequest(0, 25)); + private readonly BehaviorSubject _requestSubject = new(new VirtualRequest(0, 25)); private readonly ChangeSetAggregator _results; @@ -20,6 +20,7 @@ public void Dispose() { _source.Dispose(); _results.Dispose(); + _requestSubject.Dispose(); } [Fact]