Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/DynamicData.Tests/Cache/MergeManyChangeSetsCacheFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Reactive.Concurrency;
using System.Reactive.Disposables;
using System.Reactive.Linq;
using System.Reactive.Threading.Tasks;
using System.Threading.Tasks;
using Bogus;
using DynamicData.Kernel;
Expand Down Expand Up @@ -90,10 +91,11 @@ IObservable<MarketPrice> AddRemovePrices(Market market, int priceCount, int para
.Parallelize(priceCount, parallel, obs => obs.StressAddRemove(market.PricesCache, _ => GetRemoveTime(), scheduler))
.Finally(market.PricesCache.Dispose);

var merged = _marketCache.Connect().MergeManyChangeSets(market => market.LatestPrices);
using var priceResults = merged.AsAggregator();

var merged = _marketCache.Connect().MergeManyChangeSets(market => market.LatestPrices).Publish();
var adding = true;
var cacheCompleted = merged.LastOrDefaultAsync().ToTask();
using var priceResults = merged.AsAggregator();
using var connect = merged.Connect();

// Start asynchrononously modifying the parent list and the child lists
using var addingSub = AddRemoveStress(marketCount, priceCount, Environment.ProcessorCount, TaskPoolScheduler.Default)
Expand All @@ -119,6 +121,9 @@ IObservable<MarketPrice> AddRemovePrices(Market market, int priceCount, int para
}
while (adding);

// Wait for the source cache to finish delivering all notifications.
await cacheCompleted;

// Verify the results
CheckResultContents(_marketCacheResults, priceResults);
}
Expand Down
15 changes: 11 additions & 4 deletions src/DynamicData.Tests/Cache/MergeManyChangeSetsListFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Reactive.Concurrency;
using System.Reactive.Disposables;
using System.Reactive.Linq;
using System.Reactive.Threading.Tasks;
using System.Threading.Tasks;
using Bogus;
using DynamicData.Kernel;
Expand Down Expand Up @@ -86,9 +87,11 @@ IObservable<Animal> AddRemoveAnimals(AnimalOwner owner, int animalCount, int par
.Parallelize(animalCount, parallel, obs => obs.StressAddRemove(owner.Animals, _ => GetRemoveTime(), scheduler))
.Finally(owner.Animals.Dispose);

var mergeAnimals = _animalOwners.Connect().MergeManyChangeSets(owner => owner.Animals.Connect());

var mergeAnimals = _animalOwners.Connect().MergeManyChangeSets(owner => owner.Animals.Connect()).Publish();
var addingAnimals = true;
var cacheCompleted = mergeAnimals.LastOrDefaultAsync().ToTask();
using var animalResults = mergeAnimals.AsAggregator();
using var connect = mergeAnimals.Connect();

// Start asynchrononously modifying the parent list and the child lists
using var addAnimals = AddRemoveAnimalsStress(ownerCount, animalCount, Environment.ProcessorCount, TaskPoolScheduler.Default)
Expand All @@ -114,8 +117,12 @@ IObservable<Animal> AddRemoveAnimals(AnimalOwner owner, int animalCount, int par
}
while (addingAnimals);

// Verify the results
CheckResultContents();
// Wait for the source cache to finish delivering all notifications.
await cacheCompleted;

// Verify the results against the aggregator wired into the same Publish chain
// that cacheCompleted observes.
CheckResultContents(_animalOwners.Items, _animalOwnerResults, animalResults);
}

[Fact]
Expand Down
Loading